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.153 by root, Tue Apr 24 01:13:54 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
11 while (my ($filename, $zip) = each %PAR::LibCache) { 34 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 35 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 36 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 38 unless -e "$ENV{PAR_TEMP}/$1";
16 } 39 }
17 } 40 }
18 41
… …
35use Compress::LZF; 58use Compress::LZF;
36 59
37use CFPlus; 60use CFPlus;
38use CFPlus::OpenGL (); 61use CFPlus::OpenGL ();
39use CFPlus::Protocol; 62use CFPlus::Protocol;
63use CFPlus::DB;
40use CFPlus::UI; 64use CFPlus::UI;
65use CFPlus::UI::Inventory;
66use CFPlus::UI::SpellList;
41use CFPlus::Pod; 67use CFPlus::Pod;
42use CFPlus::BindingEditor;
43use CFPlus::MapWidget; 68use CFPlus::MapWidget;
69use CFPlus::Macro;
44 70
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 71$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 72$SIG{PIPE} = 'IGNORE';
47 73
48$Event::Eval = 0; 74$Event::Eval = 1;
49$Event::DIED = sub { 75$Event::DIED = sub {
50 # TODO: display dialog box or so 76 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 return;#d#
53 CFPlus::fatal ($_[1]);
54}; 77};
55 78
56my $MAX_FPS = 60; 79my $MAX_FPS = 60;
57my $MIN_FPS = 5; # unused as of yet 80my $MIN_FPS = 5; # unused as of yet
58 81
59our $META_SERVER = "crossfire.real-time.com:13326"; 82our $META_SERVER = "http://metaserver.schmorp.de/current.json";
60 83
61our $LAST_REFRESH; 84our $LAST_REFRESH;
62our $NOW; 85our $NOW;
63 86
64our $CFG; 87our $CFG;
… …
102 125
103our $INVENTORY_PAGE; 126our $INVENTORY_PAGE;
104our $STATS_PAGE; 127our $STATS_PAGE;
105our $SKILL_PAGE; 128our $SKILL_PAGE;
106our $SPELL_PAGE; 129our $SPELL_PAGE;
130our $SPELL_LIST;
107 131
108our $HELP_WINDOW; 132our $HELP_WINDOW;
109our $MESSAGE_WINDOW; 133our $MESSAGE_WINDOW;
110our $FLOORBOX; 134our $FLOORBOX;
111our $GAUGES; 135our $GAUGES;
… …
124 148
125our $INV; 149our $INV;
126our $INVR; 150our $INVR;
127our $INV_RIGHT_HB; 151our $INV_RIGHT_HB;
128 152
129our $BIND_EDITOR;
130our $BIND_UPD_CB;
131
132our $PICKUP_CFG; 153our $PICKUP_CFG;
154
155our $IN_BUILD_MODE;
156our $BUILD_BUTTON;
133 157
134sub status { 158sub status {
135 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 159 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
136} 160}
137 161
138sub debug { 162sub debug {
139 $DEBUG_STATUS->set_text ($_[0]); 163 $DEBUG_STATUS->set_text ($_[0]);
164}
165
166sub message {
167 my ($para) = @_;
168
169 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
170
171 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
172
173 $LOGVIEW->add_paragraph ($para);
174 $LOGVIEW->scroll_to_bottom;
140} 175}
141 176
142sub destroy_query_dialog { 177sub destroy_query_dialog {
143 (delete $_[0]{query_dialog})->destroy 178 (delete $_[0]{query_dialog})->destroy
144 if $_[0]{query_dialog}; 179 if $_[0]{query_dialog};
145} 180}
146 181
182# FIXME: a very ugly hack to wait for stat update look below! #d#
183our $QUERY_TIMER; #d#
184
147# server query dialog 185# server query dialog
148sub server_query { 186sub server_query {
149 my ($conn, $flags, $prompt) = @_; 187 my ($conn, $flags, $prompt) = @_;
188
189 # FIXME: a very ugly hack to wait for stat update #d#
190 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
191 unless ($QUERY_TIMER) {
192 $QUERY_TIMER =
193 Event->timer (
194 after => 1,
195 cb => sub {
196 server_query ($conn, $flags, $prompt, 1);
197 $QUERY_TIMER = undef
198 }
199 );
200 return;
201 }
202 }
150 203
151 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 204 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
152 x => "center", 205 x => "center",
153 y => "center", 206 y => "center",
154 title => "Server Query", 207 title => "Server Query",
155 child => my $vbox = new CFPlus::UI::VBox, 208 child => my $vbox = new CFPlus::UI::VBox,
156 ; 209 ;
157 210
158 my @dialog = my $label = new CFPlus::UI::Label 211 my @dialog = my $label = new CFPlus::UI::Label
159 max_w => $::WIDTH * 0.4, 212 max_w => $::WIDTH * 0.8,
160 ellipsise => 0, 213 ellipsise => 0,
161 text => $prompt; 214 text => $prompt;
162 215
163 if ($flags & CS_QUERY_YESNO) { 216 if ($flags & CS_QUERY_YESNO) {
164 push @dialog, my $hbox = new CFPlus::UI::HBox; 217 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
181 ); 234 );
182 235
183 $dialog->grab_focus; 236 $dialog->grab_focus;
184 237
185 } elsif ($flags & CS_QUERY_SINGLECHAR) { 238 } 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) { 239 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
189 $MESSAGE_WINDOW->show; 240 $dialog->{tooltip} = "#charcreation_focus";
190 241
191 unshift @dialog, new CFPlus::UI::Label 242 unshift @dialog, new CFPlus::UI::Label
192 max_w => $::WIDTH * 0.4, 243 max_w => $::WIDTH * 0.8,
193 ellipsise => 0, 244 ellipsise => 0,
194 markup => "\nOr use your keyboard and the text entry below:\n"; 245 markup => "\nOr use your keyboard and the text entry below:\n";
195 246
196 unshift @dialog, my $table = new CFPlus::UI::Table; 247 unshift @dialog, my $table = new CFPlus::UI::Table;
197 248
… …
209 $conn->send ("reply d"); 260 $conn->send ("reply d");
210 destroy_query_dialog $conn; 261 destroy_query_dialog $conn;
211 0 262 0
212 }, 263 },
213 ); 264 );
265
266 if ($conn->{chargen_race_description}) {
267 unshift @dialog, new CFPlus::UI::Label
268 max_w => $::WIDTH * 0.8,
269 ellipsise => 0,
270 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
271 ;
272 }
273
274 unshift @dialog, new CFPlus::UI::Face
275 face => $conn->{player}{face},
276 bg => [.2, .2, .2, 1],
277 min_w => 64,
278 min_h => 64,
279 ;
280
281 if ($conn->{chargen_race_title}) {
282 unshift @dialog, new CFPlus::UI::Label
283 allign => 1,
284 ellipsise => 0,
285 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
286 ;
287 }
214 288
215 unshift @dialog, new CFPlus::UI::Label 289 unshift @dialog, new CFPlus::UI::Label
216 max_w => $::WIDTH * 0.4, 290 max_w => $::WIDTH * 0.4,
217 ellipsise => 0, 291 ellipsise => 0,
218 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 292 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
… …
343 status "logging in..."; 417 status "logging in...";
344 418
345 $LOGIN_BUTTON->set_text ("Logout"); 419 $LOGIN_BUTTON->set_text ("Logout");
346 $SETUP_DIALOG->hide; 420 $SETUP_DIALOG->hide;
347 421
348 $PROFILE = $CFG->{profile}{default};
349
350 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 422 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
351 423
352 my ($host, $port) = split /:/, $PROFILE->{host}; 424 my ($host, $port) = split /:/, $PROFILE->{host};
353 425
354 $MAP = new CFPlus::Map $mapsize, $mapsize; 426 $MAP = new CFPlus::Map;
355 427
356 $CONN = eval { 428 $CONN = eval {
357 new CFPlus::Protocol 429 new CFPlus::Protocol
358 host => $host, 430 host => $host,
359 port => $port || 13327, 431 port => $port || 13327,
… …
369 statusbox => $STATUSBOX, 441 statusbox => $STATUSBOX,
370 map => $MAP, 442 map => $MAP,
371 mapmap => $MAPMAP, 443 mapmap => $MAPMAP,
372 query => \&server_query, 444 query => \&server_query,
373 445
446 setup_req => {
447 smoothing => $CFG->{map_smoothing}*1,
448 },
449
374 sound_play => sub { 450 sound_play => sub {
375 my ($x, $y, $soundnum, $type) = @_; 451 my ($x, $y, $soundnum, $type) = @_;
376 452
377 $SDL_MIXER 453 $SDL_MIXER
378 or return; 454 or return;
… …
397sub stop_game { 473sub stop_game {
398 $LOGIN_BUTTON->set_text ("Login"); 474 $LOGIN_BUTTON->set_text ("Login");
399 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 475 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
400 $SETUP_DIALOG->show; 476 $SETUP_DIALOG->show;
401 $PL_WINDOW->hide; 477 $PL_WINDOW->hide;
402 $SPELL_PAGE->clear_spells; 478 $SPELL_LIST->clear_spells;
403 479
404 return unless $CONN; 480 return unless $CONN;
405 481
406 status "connection closed"; 482 status "connection closed";
407 483
… …
415sub graphics_setup { 491sub graphics_setup {
416 my $vbox = new CFPlus::UI::VBox; 492 my $vbox = new CFPlus::UI::VBox;
417 493
418 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 494 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
419 495
496 my $row = 0;
497
498 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
499 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
500 can_events => 1,
501 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
502
420 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 503 $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); 504 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
422 505
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]); 506 $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"); 507 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
425 508
426 $mode_slider->connect (changed => sub { 509 $mode_slider->connect (changed => sub {
… …
428 511
429 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 512 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
430 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 513 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
431 }); 514 });
432 $mode_slider->emit (changed => $mode_slider->{range}[0]); 515 $mode_slider->emit (changed => $mode_slider->{range}[0]);
433
434 my $row = 1;
435 516
436 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 517 $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 518 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
438 state => $CFG->{fullscreen}, 519 state => $CFG->{fullscreen},
439 tooltip => "Bring the client into fullscreen mode.", 520 tooltip => "Bring the client into fullscreen mode.",
… …
445 state => $CFG->{fast}, 526 state => $CFG->{fast},
446 tooltip => "Lower the visual quality considerably to speed up rendering.", 527 tooltip => "Lower the visual quality considerably to speed up rendering.",
447 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 528 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
448 ); 529 );
449 530
531 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
532 $table->add (1, $row++, new CFPlus::UI::Slider
533 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
534 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
535 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
536 );
537
538 $table->add (1, $row++, new CFPlus::UI::Button
539 expand => 1, align => 0, text => "Apply",
540 tooltip => "Apply the video settings above.",
541 on_activate => sub {
542 video_shutdown ();
543 video_init ();
544 0
545 }
546 );
547
450 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 548 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
451 $table->add (1, $row++, new CFPlus::UI::Slider 549 $table->add (1, $row++, new CFPlus::UI::Slider
452 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 550 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
453 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 551 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
454 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 552 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
553 );
554
555 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
556 $table->add (1, $row++, new CFPlus::UI::CheckBox
557 state => $CFG->{map_smoothing},
558 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
559 . "This increases load on the graphics subsystem and works only with 2.x servers. "
560 . "Changes take effect at next connection only.",
561 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
455 ); 562 );
456 563
457 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 564 $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 565 $table->add (1, $row++, new CFPlus::UI::CheckBox
459 state => $CFG->{fow_enable}, 566 state => $CFG->{fow_enable},
… …
478 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; 585 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
479 0 586 0
480 } 587 }
481 ); 588 );
482 589
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"); 590 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
491 $table->add (1, $row++, new CFPlus::UI::Slider 591 $table->add (1, $row++, new CFPlus::UI::Slider
492 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 592 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.", 593 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 }, 594 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
… …
510 range => [$CFG->{gauge_size}, 0.2, 0.8], 610 range => [$CFG->{gauge_size}, 0.2, 0.8],
511 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 611 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
512 on_changed => sub { 612 on_changed => sub {
513 $CFG->{gauge_size} = $_[1]; 613 $CFG->{gauge_size} = $_[1];
514 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 614 $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 615 0
526 } 616 }
527 ); 617 );
528 618
529 $vbox 619 $vbox
… …
634 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 724 $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"); 725 $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 }); 726 $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"); 727 $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 }); 728 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
729 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
639 730
640 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 731 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
641 732
642 for my $x (0..2) { 733 for my $x (0..2) {
643 for my $y (0 .. 2) { 734 for my $y (0 .. 2) {
… …
647 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 738 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
648 ); 739 );
649 } 740 }
650 } 741 }
651 742
743 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
652 744
653 $table 745 $table
654} 746}
655 747
656sub stats_window { 748sub stats_window {
… …
825 917
826 my $table = $METASERVER->{table}; 918 my $table = $METASERVER->{table};
827 $table->clear; 919 $table->clear;
828 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 920 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
829 921
830 my $buf; 922 my $ok = 0;
831 923
832 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 924 CFPlus::background {
925 my $ua = CFPlus::lwp_useragent;
833 926
834 unless ($fh) { 927 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
835 $label->set_text ("unable to contact metaserver: $!"); 928 } sub {
836 return; 929 my ($msg) = @_;
837 } 930 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; 931 $table->clear;
852 932
853 my @tip = ( 933 my @tip = (
854 "The current number of users logged in on the server.", 934 "The current number of users logged in on the server.",
855 "The hostname of the server.", 935 "The hostname of the server.",
… …
865 for 0 .. $#col; 945 for 0 .. $#col;
866 946
867 my @align = qw(1 0 1 1 -1); 947 my @align = qw(1 0 1 1 -1);
868 948
869 my $y = 0; 949 my $y = 0;
870 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 950 for my $m (@{ $msg->{servers} }) {
871 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 951 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
952 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
872 953
873 for ($desc) { 954 for ($desc) {
874 s/<br>/\n/gi; 955 s/<br>/\n/gi;
875 s/<li>/\n· /gi; 956 s/<li>/\n· /gi;
876 s/<.*?>//sgi; 957 s/<.*?>//sgi;
877 s/&/&amp;/g; 958 s/&amp;/&/g;
878 s/</&lt;/g; 959 s/&lt;/</g;
879 s/>/&gt;/g; 960 s/&gt;/>/g;
880 } 961 }
881 962
882 $uptime = sprintf "%dd %02d:%02d:%02d", 963 $uptime = sprintf "%dd %02d:%02d:%02d",
883 (int $m->[8] / 86400), 964 (int $uptime / 86400),
884 (int $m->[8] / 3600) % 24, 965 (int $uptime / 3600) % 24,
885 (int $m->[8] / 60) % 60, 966 (int $uptime / 60) % 60,
886 $m->[8] % 60; 967 $uptime % 60;
887 968
888 $m = [$users, $host, $uptime, $version, $desc]; 969 $m = [$users, $host, $uptime, $version, $desc];
889 970
890 $y++; 971 $y++;
891 972
… …
901 ), 982 ),
902 (new CFPlus::UI::Empty expand => 1), 983 (new CFPlus::UI::Empty expand => 1),
903 ]); 984 ]);
904 985
905 $table->add ($_, $y, new CFPlus::UI::Label 986 $table->add ($_, $y, new CFPlus::UI::Label
987 max_w => $::WIDTH * 0.4,
906 ellipsise => 0, 988 ellipsise => 0,
907 align => $align[$_], 989 align => $align[$_],
908 text => $m->[$_], 990 text => $m->[$_],
909 tooltip => $tip[$_], 991 tooltip => $tip[$_],
992 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
910 can_hover => 1, 993 can_hover => 1,
911 can_events => 1, 994 can_events => 1,
912 fontsize => 0.8) 995 fontsize => 0.8)
913 for 0 .. $#$m; 996 for 0 .. $#$m;
914 } 997 }
998 } else {
999 $ok or $label->set_text ("error while contacting metaserver");
915 } 1000 }
916 }); 1001 };
1002
917} 1003}
918 1004
919sub metaserver_dialog { 1005sub metaserver_dialog {
920 my $vbox = new CFPlus::UI::VBox; 1006 my $vbox = new CFPlus::UI::VBox;
921 my $table = new CFPlus::UI::Table; 1007 my $table = new CFPlus::UI::Table;
… …
925 title => "Server List", 1011 title => "Server List",
926 name => 'metaserver_dialog', 1012 name => 'metaserver_dialog',
927 x => 'center', 1013 x => 'center',
928 y => 'center', 1014 y => 'center',
929 z => 3, 1015 z => 3,
1016 force_w => $::WIDTH * 0.9,
930 force_h => $::HEIGHT * 0.4, 1017 force_h => $::HEIGHT * 0.7,
931 child => $vbox, 1018 child => $vbox,
932 has_close_button => 1, 1019 has_close_button => 1,
933 table => $table, 1020 table => $table,
934 on_visibility_change => sub { 1021 on_visibility_change => sub {
935 update_metaserver ($_[0]) if $_[1]; 1022 update_metaserver ($_[0]) if $_[1];
… …
1011 . "so only set it if you really need to prefetch images. " 1098 . "so only set it if you really need to prefetch images. "
1012 . "This option can be set and unset any time.", 1099 . "This option can be set and unset any time.",
1013 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1100 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1014 ); 1101 );
1015 1102
1016 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1103 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1017 $table->add (1, 9, new CFPlus::UI::Entry 1104 $table->add (1, 9, new CFPlus::UI::Entry
1105 text => $CFG->{output_rate},
1106 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1107 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1108 . "default will be used, which is usually around 100kb/s.",
1109 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1110 );
1111
1112 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1113 $table->add (1, 10, new CFPlus::UI::Entry
1018 text => $CFG->{output_count}, 1114 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.", 1115 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 }, 1116 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1021 ); 1117 );
1022 1118
1023 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1119 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1024 $table->add (1, 10, new CFPlus::UI::Entry 1120 $table->add (1, 11, new CFPlus::UI::Entry
1025 text => $CFG->{output_sync}, 1121 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.", 1122 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 }, 1123 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1028 ); 1124 );
1029 1125
1030 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1126 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1031 expand => 1, 1127 expand => 1,
1032 align => 0, 1128 align => 0,
1033 text => "Login", 1129 text => "Login",
1034 on_activate => sub { 1130 on_activate => sub {
1035 $CONN ? stop_game 1131 $CONN ? stop_game
1036 : start_game; 1132 : start_game;
1037 0 1133 0
1038 }, 1134 },
1039 ); 1135 );
1040 1136
1137 $vbox->add (new CFPlus::UI::FancyFrame
1138 label => "Server Info",
1139 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1140 );
1141
1142 $vbox
1143}
1144
1145sub client_setup {
1146 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1147
1148 my $row = 0;
1149
1041 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1150 $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 1151 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1043 text => $CFG->{say_command}, 1152 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. " 1153 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. " 1154 . "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.", 1155 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1047 on_changed => sub { 1156 on_changed => sub {
1048 my ($self, $value) = @_; 1157 my ($self, $value) = @_;
1049 $CFG->{say_command} = $value; 1158 $CFG->{say_command} = $value;
1050 0 1159 0
1051 } 1160 }
1052 ); 1161 );
1053 1162
1054 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1163 $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 1164 $table->add (1, $row++, new CFPlus::UI::CheckBox
1056 state => $CFG->{show_tips}, 1165 state => $CFG->{show_tips},
1057 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1166 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1058 on_changed => sub { 1167 on_changed => sub {
1059 my ($self, $value) = @_; 1168 my ($self, $value) = @_;
1060 $CFG->{show_tips} = $value; 1169 $CFG->{show_tips} = $value;
1061 0 1170 0
1062 } 1171 }
1063 ); 1172 );
1064 1173
1065 $vbox->add (new CFPlus::UI::FancyFrame 1174 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1066 label => "Server Info", 1175 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1067 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1176 text => $CFG->{logview_max_par},
1177 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1178 . "sends more messages than this number, older messages get removed to save memory and "
1179 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1180 on_changed => sub {
1181 my ($self, $value) = @_;
1182 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1183 0
1184 },
1068 ); 1185 );
1069 1186
1070 $vbox 1187 $table
1071} 1188}
1072 1189
1073sub message_window { 1190sub message_window {
1074 my $window = new CFPlus::UI::Toplevel 1191 my $window = new CFPlus::UI::Toplevel
1075 name => "message_window", 1192 name => "message_window",
… …
1156 ["Boots" => PICKUP_BOOTS], 1273 ["Boots" => PICKUP_BOOTS],
1157 ["Gloves" => PICKUP_GLOVES], 1274 ["Gloves" => PICKUP_GLOVES],
1158 ["Cloaks" => PICKUP_CLOAK], 1275 ["Cloaks" => PICKUP_CLOAK],
1159 ], 1276 ],
1160 1277
1161 ["Readables", 2, 2, 1278 ["Readables", 2, 0,
1162 ["Spellbooks" => PICKUP_SPELLBOOK], 1279 ["Spellbooks" => PICKUP_SPELLBOOK],
1163 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1280 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1164 ["Normal Books/Scrolls" => PICKUP_READABLES], 1281 ["Normal Books/Scrolls" => PICKUP_READABLES],
1165 ], 1282 ],
1166 ["Misc", 2, 7, 1283 ["Misc", 2, 5,
1167 ["Food" => PICKUP_FOOD], 1284 ["Food" => PICKUP_FOOD],
1168 ["Drinks" => PICKUP_DRINK], 1285 ["Drinks" => PICKUP_DRINK],
1169 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1286 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1170 ["Keys" => PICKUP_KEY], 1287 ["Keys" => PICKUP_KEY],
1171 ["Magical Items" => PICKUP_MAGICAL], 1288 ["Magical Items" => PICKUP_MAGICAL],
1172 ["Potions" => PICKUP_POTION], 1289 ["Potions" => PICKUP_POTION],
1173 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1290 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1174 ["Ignore cursed" => PICKUP_NOT_CURSED], 1291 ["Ignore cursed" => PICKUP_NOT_CURSED],
1175 ["Jewelery" => PICKUP_JEWELS], 1292 ["Jewelery" => PICKUP_JEWELS],
1293 ["Flesh" => PICKUP_FLESH],
1176 ], 1294 ],
1177 ["Weight/Value ratio", 2, 17] 1295 ["Weight/Value ratio", 2, 17]
1178 ) 1296 )
1179 { 1297 {
1180 my ($title, $x, $y, @bits) = @$_; 1298 my ($title, $x, $y, @bits) = @$_;
… …
1230 $table 1348 $table
1231} 1349}
1232 1350
1233my %SORT_ORDER = ( 1351my %SORT_ORDER = (
1234 type => undef, 1352 type => undef,
1235 mtime => sub { sort { 1353 mtime => sub {
1354 my $NOW = time;
1355 sort {
1356 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1357 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1358
1236 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1359 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1237 or $b->{mtime} <=> $a->{mtime} 1360 or $btime <=> $atime
1238 or $a->{type} <=> $b->{type} 1361 or $a->{type} <=> $b->{type}
1362 } @_
1239 } @_ }, 1363 },
1240 weight => sub { sort { 1364 weight => sub { sort {
1241 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1365 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1242 or $a->{type} <=> $b->{type} 1366 or $a->{type} <=> $b->{type}
1243 } @_ }, 1367 } @_ },
1244); 1368);
… …
1269 #TODO# update to weigh/maxweight 1393 #TODO# update to weigh/maxweight
1270 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1394 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1271 1395
1272 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1396 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1273 $sw1->add ($INV = new CFPlus::UI::Inventory); 1397 $sw1->add ($INV = new CFPlus::UI::Inventory);
1398 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1274 1399
1275 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1400 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1276 1401
1277 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1402 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1278 1403
… …
1318 $ntb->add ( 1443 $ntb->add (
1319 "Skills (F3)" => $SKILL_PAGE = skill_window, 1444 "Skills (F3)" => $SKILL_PAGE = skill_window,
1320 "Shows all your Skills." 1445 "Shows all your Skills."
1321 ); 1446 );
1322 1447
1323 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1448 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1324 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1449 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1325 $ntb->add ( 1450 $ntb->add (
1326 "Spellbook (F4)" => $spellsw, 1451 "Spellbook (F4)" => $spellsw,
1327 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1452 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1328 ); 1453 );
1329 $ntb->add ( 1454 $ntb->add (
… …
1336 1461
1337 $plwin->add ($ntb); 1462 $plwin->add ($ntb);
1338 $plwin 1463 $plwin
1339} 1464}
1340 1465
1341sub update_bindings {
1342 $BIND_UPD_CB->() if $BIND_UPD_CB;
1343}
1344
1345sub keyboard_setup { 1466sub keyboard_setup {
1346 my $binding_list = new CFPlus::UI::VBox; 1467 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} 1468}
1459 1469
1460sub help_window { 1470sub help_window {
1461 my $win = new CFPlus::UI::Toplevel 1471 my $win = new CFPlus::UI::Toplevel
1462 x => 'center', 1472 x => 'center',
… …
1619 1629
1620sub show_tip_of_the_day { 1630sub show_tip_of_the_day {
1621 # find all tips 1631 # find all tips
1622 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1632 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1623 1633
1624 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1634 CFPlus::DB::get state => "tip_of_the_day", sub {
1635 my ($todindex) = @_;
1625 $todindex = 0 if $todindex >= @tod; 1636 $todindex = 0 if $todindex >= @tod;
1626 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1637 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1627 1638
1628 # create dialog 1639 # create dialog
1629 my $dialog; 1640 my $dialog;
1630 1641
1631 my $close = sub { 1642 my $close = sub {
1632 $dialog->destroy; 1643 $dialog->destroy;
1644 };
1645
1646 $dialog = new CFPlus::UI::Toplevel
1647 x => "center",
1648 y => "center",
1649 z => 3,
1650 name => 'tip_of_the_day',
1651 force_w => int $WIDTH * 4/9,
1652 force_h => int $WIDTH * 2/9,
1653 title => "Tip of the day #" . (1 + $todindex),
1654 child => my $vbox = new CFPlus::UI::VBox,
1655 has_close_button => 1,
1656 on_delete => $close,
1657 ;
1658
1659 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1660 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1661 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1662
1663 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1664
1665 $table->add (0, 0, new CFPlus::UI::Button
1666 text => "Close",
1667 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>.",
1668 on_activate => $close,
1669 );
1670
1671 $table->add (2, 0, new CFPlus::UI::Button
1672 text => "Next",
1673 tooltip => "Show the next <b>Tip of the day</b>.",
1674 on_activate => sub {
1675 $close->();
1676 &show_tip_of_the_day;
1677 },
1678 );
1679
1680 $dialog->show;
1633 }; 1681 };
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} 1682}
1671 1683
1672sub sdl_init { 1684sub sdl_init {
1673 CFPlus::SDL_Init 1685 CFPlus::SDL_Init
1674 and die "SDL::Init failed!\n"; 1686 and die "SDL::Init failed!\n";
… …
1708 padding => 0, 1720 padding => 0,
1709 z => 100, 1721 z => 100,
1710 force_x => "max", 1722 force_x => "max",
1711 force_y => 0; 1723 force_y => 0;
1712 $DEBUG_STATUS->show; 1724 $DEBUG_STATUS->show;
1713
1714 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1715 1725
1716 $STATUSBOX = new CFPlus::UI::Statusbox; 1726 $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]); 1727 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1718 1728
1719 (new CFPlus::UI::Frame 1729 (new CFPlus::UI::Frame
… …
1756 font => $FONT_FIXED, 1766 font => $FONT_FIXED,
1757 fontsize => $::CFG->{log_fontsize}, 1767 fontsize => $::CFG->{log_fontsize},
1758 indent => -4, 1768 indent => -4,
1759 can_hover => 1, 1769 can_hover => 1,
1760 can_events => 1, 1770 can_events => 1,
1771 max_par => $CFG->{logview_max_par},
1761 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1772 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1762 ; 1773 ;
1763 1774
1764 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1775 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1765 title => "Setup", 1776 title => "Setup",
1766 name => "setup_dialog", 1777 name => "setup_dialog",
… …
1777 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1788 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1778 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1789 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1779 1790
1780 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1791 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1781 "Configure the server to play on, your username, password and other server-related options."); 1792 "Configure the server to play on, your username, password and other server-related options.");
1793 $SETUP_NOTEBOOK->add (Client => client_setup,
1794 "Configure various client-specific settings.");
1782 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1795 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1783 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1796 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1784 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1797 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1785 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1798 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1786 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1799 $SETUP_NOTEBOOK->add (Audio => audio_setup,
… …
1820 ); 1833 );
1821 1834
1822 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1835 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1823 tooltip => "View Documentation"); 1836 tooltip => "View Documentation");
1824 1837
1838
1825 $BUTTONBAR->add (new CFPlus::UI::Button 1839 $BUTTONBAR->add (new CFPlus::UI::Button
1826 text => "Quit", 1840 text => "Quit",
1827 tooltip => "Terminates the program", 1841 tooltip => "Terminates the program",
1828 on_activate => sub { 1842 on_activate => sub {
1829 if ($CONN) { 1843 if ($CONN) {
… …
1840 } 1854 }
1841 1855
1842 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1856 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1843} 1857}
1844 1858
1859sub setup_build_button {
1860 my ($enabled) = @_;
1861 if ($enabled) {
1862 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1863 $BUILD_BUTTON ||= new CFPlus::UI::Button
1864 text => "Build",
1865 tooltip => "Opens the ingame builder",
1866 on_activate => sub {
1867 if ($CONN) {
1868 $CONN->send_ext_req (builder_player_items => sub {
1869 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1870 });
1871 }
1872 0
1873 };
1874 $BUTTONBAR->add ($BUILD_BUTTON);
1875 } else {
1876 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1877 }
1878}
1879
1880sub open_ingame_editor {
1881 my ($msg) = @_;
1882
1883 my $win = new CFPlus::UI::Toplevel
1884 x => 0,
1885 y => 'center',
1886 z => 4,
1887 name => 'builder_window',
1888 force_w => int $WIDTH * 1/4,
1889 force_h => int $HEIGHT * 3/4,
1890 title => "In game builder",
1891 has_close_button => 1;
1892
1893 my $r = new CFPlus::UI::ScrolledWindow (
1894 expand => 1,
1895 scroll_y => 1
1896 );
1897 $r->add (my $vb = new CFPlus::UI::VBox);
1898 $win->add ($r);
1899
1900
1901 $vb->add (
1902 new CFPlus::UI::Button
1903 text => "Disable build mode",
1904 on_activate => sub { $::IN_BUILD_MODE = undef }
1905 );
1906 $vb->add (
1907 new CFPlus::UI::Button
1908 text => "ERASE",
1909 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1910 );
1911
1912 for my $itemarchname (
1913 sort {
1914 $msg->{items}->{$a}->{build_arch_name}
1915 cmp $msg->{items}->{$b}->{build_arch_name}
1916 } keys %{$msg->{items}}
1917 ) {
1918 my $info = $msg->{items}->{$itemarchname};
1919 $vb->add (
1920 new CFPlus::UI::Button text => $info->{build_arch_name},
1921 on_activate => sub {
1922 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1923
1924 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1925 build_mode_query_arch_info ();
1926 }
1927 }
1928 );
1929 }
1930
1931 $win->show;
1932}
1933
1934sub build_mode_query_arch_info {
1935 my ($iteminfo) = $::IN_BUILD_MODE;
1936 my $itemarchname = $iteminfo->{item};
1937 my $info = $iteminfo->{info};
1938
1939 my $dialog = new CFPlus::UI::Toplevel
1940 x => "center",
1941 y => "center",
1942 z => 50,
1943 force_w => int $WIDTH * 1/2,
1944 title => "Enter information for placement of '$itemarchname'",
1945 has_close_button => 1;
1946
1947 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1948
1949 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1950 my $row = 0;
1951 if ($info->{has_name}) {
1952 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1953 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1954 }
1955 if ($info->{has_text}) {
1956 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1957 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1958 }
1959 if ($info->{has_connection}) {
1960 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1961 $table->add (1, $row++,
1962 new CFPlus::UI::Entry
1963 expand => 1,
1964 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1965 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1966 );
1967 }
1968
1969 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1970 $hb->add (new CFPlus::UI::Button
1971 text => "Close",
1972 expand => 1,
1973 on_activate => sub { $dialog->hide; 0 },
1974 );
1975 $dialog->show;
1976}
1977
1845sub video_shutdown { 1978sub video_shutdown {
1846 CFPlus::OpenGL::shutdown; 1979 CFPlus::OpenGL::shutdown;
1847 1980
1848 undef $SDL_ACTIVE; 1981 undef $SDL_ACTIVE;
1849} 1982}
… …
1880 CFPlus::Mix_AllocateChannels 8; 2013 CFPlus::Mix_AllocateChannels 8;
1881 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 2014 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1882 2015
1883 audio_music_finished; 2016 audio_music_finished;
1884 2017
2018 local $_;
1885 while (<$fh>) { 2019 while (<$fh>) {
1886 next if /^\s*#/; 2020 next if /^\s*#/;
1887 next if /^\s*$/; 2021 next if /^\s*$/;
1888 2022
1889 my ($file, $volume, $event) = split /\s+/, $_, 3; 2023 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1966 if $CONN; 2100 if $CONN;
1967}); 2101});
1968 2102
1969%SDL_CB = ( 2103%SDL_CB = (
1970 CFPlus::SDL_QUIT => sub { 2104 CFPlus::SDL_QUIT => sub {
1971 Event::unloop -1; 2105 exit;
1972 }, 2106 },
1973 CFPlus::SDL_VIDEORESIZE => sub { 2107 CFPlus::SDL_VIDEORESIZE => sub {
1974 }, 2108 },
1975 CFPlus::SDL_VIDEOEXPOSE => sub { 2109 CFPlus::SDL_VIDEOEXPOSE => sub {
1976 CFPlus::UI::full_refresh; 2110 CFPlus::UI::full_refresh;
1977 }, 2111 },
1978 CFPlus::SDL_ACTIVEEVENT => sub { 2112 CFPlus::SDL_ACTIVEEVENT => sub {
1979# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2113# not useful, as APPACTIVE include sonly iconified state, not unmapped
2114# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2115# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2116# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2117# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1980 }, 2118 },
1981 CFPlus::SDL_KEYDOWN => sub { 2119 CFPlus::SDL_KEYDOWN => sub {
1982 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2120 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1983 # alt-enter 2121 # alt-enter
1984 $FULLSCREEN_ENABLE->toggle; 2122 $FULLSCREEN_ENABLE->toggle;
… …
2005 2143
2006$SIG{INT} = $SIG{TERM} = sub { exit }; 2144$SIG{INT} = $SIG{TERM} = sub { exit };
2007 2145
2008{ 2146{
2009 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2147 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2148 CFPlus::DB::Server::run;
2149
2010 CFPlus::UI::set_layout ($::CFG->{layout}); 2150 CFPlus::UI::set_layout ($::CFG->{layout});
2011 2151
2012 my %DEF_CFG = ( 2152 my %DEF_CFG = (
2013 sdl_mode => 0, 2153 sdl_mode => 0,
2014 width => 640, 2154 width => 640,
2015 height => 480, 2155 height => 480,
2016 fullscreen => 0, 2156 fullscreen => 0,
2017 fast => 0, 2157 fast => 0,
2018 map_scale => 1, 2158 map_scale => 1,
2019 fow_enable => 1, 2159 fow_enable => 1,
2020 fow_intensity => 0.45, 2160 fow_intensity => 0.45,
2021 fow_smooth => 0, 2161 fow_smooth => 0,
2162 map_smoothing => 1,
2022 gui_fontsize => 1, 2163 gui_fontsize => 1,
2023 log_fontsize => 0.7, 2164 log_fontsize => 0.7,
2024 gauge_fontsize => 1, 2165 gauge_fontsize => 1,
2025 gauge_size => 0.35, 2166 gauge_size => 0.35,
2026 stat_fontsize => 0.7, 2167 stat_fontsize => 0.7,
2027 mapsize => 100, 2168 mapsize => 100,
2028 say_command => 'say', 2169 say_command => 'chat',
2029 audio_enable => 1, 2170 audio_enable => 1,
2030 bgm_enable => 1, 2171 bgm_enable => 1,
2031 bgm_volume => 0.25, 2172 bgm_volume => 0.25,
2032 face_prefetch => 0, 2173 face_prefetch => 0,
2033 output_sync => 1, 2174 output_sync => 1,
2034 output_count => 1, 2175 output_count => 1,
2176 output_rate => "",
2035 pickup => 0, 2177 pickup => 0,
2036 inv_sort => "mtime", 2178 inv_sort => "mtime",
2037 default => "profile", # default profile 2179 default => "profile", # default profile
2038 show_tips => 1, 2180 show_tips => 1,
2181 logview_max_par => 1000,
2039 ); 2182 );
2040 2183
2041 while (my ($k, $v) = each %DEF_CFG) { 2184 while (my ($k, $v) = each %DEF_CFG) {
2042 $CFG->{$k} = $v unless exists $CFG->{$k}; 2185 $CFG->{$k} = $v unless exists $CFG->{$k};
2043 } 2186 }
2044 2187
2045 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2188 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2189 $PROFILE = $CFG->{profile}{default};
2190
2191 # convert old bindings (only default profile matters)
2192 if (my $bindings = delete $PROFILE->{bindings}) {
2193 while (my ($mod, $syms) = each %$bindings) {
2194 while (my ($sym, $cmds) = each %$syms) {
2195 push @{ $PROFILE->{macro} }, {
2196 accelkey => [$mod*1, $sym*1],
2197 action => $cmds,
2198 };
2199 }
2200 }
2201 }
2046 2202
2047 sdl_init; 2203 sdl_init;
2048 2204
2049 @SDL_MODES = reverse 2205 @SDL_MODES = reverse
2050 grep $_->[0] >= 640 && $_->[1] >= 480, 2206 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2087# } 2243# }
2088# my $t2 = Time::HiRes::time; 2244# my $t2 = Time::HiRes::time;
2089# warn $t2-$t1; 2245# warn $t2-$t1;
2090# } 2246# }
2091 2247
2248 $startup_done->();
2249
2092 video_init; 2250 video_init;
2093 audio_init; 2251 audio_init;
2094} 2252}
2095 2253
2096show_tip_of_the_day if $CFG->{show_tips}; 2254show_tip_of_the_day if $CFG->{show_tips};
2097 2255
2098Event::loop; 2256Event::loop;
2099#CFPlus::SDL_Quit; 2257#CFPlus::SDL_Quit;
2100#CFPlus::_exit 0; 2258#CFPlus::_exit 0;
2101 2259
2260END {
2102END { CFPlus::SDL_Quit } 2261 CFPlus::SDL_Quit;
2262 CFPlus::DB::Server::stop;
2263}
2103 2264
2104=head1 NAME 2265=head1 NAME
2105 2266
2106cfplus - A Crossfire+ and Crossfire game client 2267cfplus - A Crossfire+ and Crossfire game client
2107 2268

Diff Legend

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