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

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

Diff Legend

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