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.107 by root, Sun Aug 13 03:20:56 2006 UTC vs.
Revision 1.154 by root, Wed May 9 11:46:49 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4
5# do splash-screen thingy on win32
6BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) {
9 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
10 }
11
12 require Win32::GUI::SplashScreen;
13
14 Win32::GUI::SplashScreen::Show (
15 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
16 );
17
18 $startup_done = sub {
19 Win32::GUI::SplashScreen::Done (1);
20 };
21 }
22}
2 23
3use strict; 24use strict;
4use utf8; 25use utf8;
26
27use Carp 'verbose';
5 28
6# do things only needed for single-binary version (par) 29# do things only needed for single-binary version (par)
7BEGIN { 30BEGIN {
8 if (%PAR::LibCache) { 31 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 32 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 33
34 my $tmp = $ENV{PAR_TEMP};
35
11 while (my ($filename, $zip) = each %PAR::LibCache) { 36 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 37 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 38 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 39 $zip->extractMember ($_, "$tmp/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 40 unless -e "$tmp/$1";
16 } 41 }
17 } 42 }
18 43
19 # TODO: pango-rc file, anybody? 44 if ($^O eq "MSWin32") {
45 # relocatable
46 } else {
47 # unix, need to patch pango rc file
48 open my $fh, "<:perlio", "$tmp/usr/lib/pango/1.5.0/module-files.d/libpango1.0-0.modules"
49 or die "$tmp/usr/lib/1.5.0/module-files.d/libpango1.0-0.modules: $!";
50 local $/;
51 my $rc = <$fh>;
52 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
20 53
21 unshift @INC, $ENV{PAR_TEMP}; 54 mkdir "$tmp/pango-modules";
55 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
56 or die "$tmp/pango-modules/pango.modules: $!";
57 print $fh $rc;
58
59 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
60 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
61 or die "$ENV{PANGO_RC_FILE}: $!";
62 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
63 }
64
65 unshift @INC, $tmp;
22 } 66 }
23} 67}
24 68
25# need to do it again because that pile of garbage called PAR nukes it before main 69# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 70unshift @INC, $ENV{PAR_TEMP}
… …
35use Compress::LZF; 79use Compress::LZF;
36 80
37use CFPlus; 81use CFPlus;
38use CFPlus::OpenGL (); 82use CFPlus::OpenGL ();
39use CFPlus::Protocol; 83use CFPlus::Protocol;
84use CFPlus::DB;
40use CFPlus::UI; 85use CFPlus::UI;
86use CFPlus::UI::Inventory;
87use CFPlus::UI::SpellList;
41use CFPlus::Pod; 88use CFPlus::Pod;
42use CFPlus::BindingEditor;
43use CFPlus::MapWidget; 89use CFPlus::MapWidget;
90use CFPlus::Macro;
44 91
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 92$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 93$SIG{PIPE} = 'IGNORE';
47 94
48$Event::Eval = 0; 95$Event::Eval = 1;
49$Event::DIED = sub { 96$Event::DIED = sub {
50 # TODO: display dialog box or so 97 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFPlus::error $_[1];
53}; 98};
54
55$SIG{__DIE__} = sub {
56 return if CFPlus::in_destruct;
57 Carp::cluck $_[0];
58 CFPlus::error $_[0];
59 return;#d#
60 #return unless defined $^S && !$^S;
61 $Event::DIED->(undef, $_[0]);
62};
63
64our $VERSION = '0.1';
65 99
66my $MAX_FPS = 60; 100my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 101my $MIN_FPS = 5; # unused as of yet
68 102
69our $META_SERVER = "crossfire.real-time.com:13326"; 103our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 104
71our $LAST_REFRESH; 105our $LAST_REFRESH;
72our $NOW; 106our $NOW;
73 107
74our $CFG; 108our $CFG;
75our $CONN; 109our $CONN;
110our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 111our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 112
78our $WANT_REFRESH; 113our $WANT_REFRESH;
79our $CAN_REFRESH; 114our $CAN_REFRESH;
80 115
… …
111 146
112our $INVENTORY_PAGE; 147our $INVENTORY_PAGE;
113our $STATS_PAGE; 148our $STATS_PAGE;
114our $SKILL_PAGE; 149our $SKILL_PAGE;
115our $SPELL_PAGE; 150our $SPELL_PAGE;
151our $SPELL_LIST;
116 152
117our $HELP_WINDOW; 153our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 154our $MESSAGE_WINDOW;
119our $FLOORBOX; 155our $FLOORBOX;
120our $GAUGES; 156our $GAUGES;
… …
133 169
134our $INV; 170our $INV;
135our $INVR; 171our $INVR;
136our $INV_RIGHT_HB; 172our $INV_RIGHT_HB;
137 173
138our $BIND_EDITOR;
139our $BIND_UPD_CB;
140
141our $PICKUP_CFG; 174our $PICKUP_CFG;
175
176our $IN_BUILD_MODE;
177our $BUILD_BUTTON;
142 178
143sub status { 179sub status {
144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 180 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 181}
146 182
147sub debug { 183sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 184 $DEBUG_STATUS->set_text ($_[0]);
185}
186
187sub message {
188 my ($para) = @_;
189
190 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
191
192 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
193
194 $LOGVIEW->add_paragraph ($para);
195 $LOGVIEW->scroll_to_bottom;
149} 196}
150 197
151sub destroy_query_dialog { 198sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 199 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 200 if $_[0]{query_dialog};
154} 201}
155 202
203# FIXME: a very ugly hack to wait for stat update look below! #d#
204our $QUERY_TIMER; #d#
205
156# server query dialog 206# server query dialog
157sub server_query { 207sub server_query {
158 my ($conn, $flags, $prompt) = @_; 208 my ($conn, $flags, $prompt) = @_;
159 209
210 # FIXME: a very ugly hack to wait for stat update #d#
211 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
212 unless ($QUERY_TIMER) {
213 $QUERY_TIMER =
214 Event->timer (
215 after => 1,
216 cb => sub {
217 server_query ($conn, $flags, $prompt, 1);
218 $QUERY_TIMER = undef
219 }
220 );
221 return;
222 }
223 }
224
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame 225 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 226 x => "center",
162 y => "center", 227 y => "center",
163 title => "Server Query", 228 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 229 child => my $vbox = new CFPlus::UI::VBox,
165 ; 230 ;
166 231
167 my @dialog = my $label = new CFPlus::UI::Label 232 my @dialog = my $label = new CFPlus::UI::Label
168 max_w => $::WIDTH * 0.4, 233 max_w => $::WIDTH * 0.8,
169 ellipsise => 0, 234 ellipsise => 0,
170 text => $prompt; 235 text => $prompt;
171 236
172 if ($flags & CS_QUERY_YESNO) { 237 if ($flags & CS_QUERY_YESNO) {
173 push @dialog, my $hbox = new CFPlus::UI::HBox; 238 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
190 ); 255 );
191 256
192 $dialog->grab_focus; 257 $dialog->grab_focus;
193 258
194 } elsif ($flags & CS_QUERY_SINGLECHAR) { 259 } elsif ($flags & CS_QUERY_SINGLECHAR) {
195 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
196
197 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 260 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
198 $MESSAGE_WINDOW->show; 261 $dialog->{tooltip} = "#charcreation_focus";
199 262
200 unshift @dialog, new CFPlus::UI::Label 263 unshift @dialog, new CFPlus::UI::Label
201 max_w => $::WIDTH * 0.4, 264 max_w => $::WIDTH * 0.8,
202 ellipsise => 0, 265 ellipsise => 0,
203 markup => "\nOr use your keyboard and the text entry below:\n"; 266 markup => "\nOr use your keyboard and the text entry below:\n";
204 267
205 unshift @dialog, my $table = new CFPlus::UI::Table; 268 unshift @dialog, my $table = new CFPlus::UI::Table;
206 269
… …
219 destroy_query_dialog $conn; 282 destroy_query_dialog $conn;
220 0 283 0
221 }, 284 },
222 ); 285 );
223 286
287 if ($conn->{chargen_race_description}) {
288 unshift @dialog, new CFPlus::UI::Label
289 max_w => $::WIDTH * 0.8,
290 ellipsise => 0,
291 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
292 ;
293 }
294
295 unshift @dialog, new CFPlus::UI::Face
296 face => $conn->{player}{face},
297 bg => [.2, .2, .2, 1],
298 min_w => 64,
299 min_h => 64,
300 ;
301
302 if ($conn->{chargen_race_title}) {
303 unshift @dialog, new CFPlus::UI::Label
304 allign => 1,
305 ellipsise => 0,
306 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
307 ;
308 }
309
224 unshift @dialog, new CFPlus::UI::Label 310 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4, 311 max_w => $::WIDTH * 0.4,
226 ellipsise => 0, 312 ellipsise => 0,
227 markup => 313 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
228 "<big><b>Character Creation: Race</b></big>\n\n"
229 . "Look at the <b>Messages</b> window to see a description of this race "
230 . "and the center of the screen to see how this race looks like "
231 . "(<small>below this dialog window: you may need to move the dialog away and "
232 . "click into the display area to make it visible</small>).\n\n"
233 . "You can look at another race, or accept this race (you will cycle back to "
234 . "this race eventually, so you can take your time making this important choice."
235 ; 314 ;
236 315
237 } elsif ($prompt =~ /roll new stats/) { 316 } elsif ($prompt =~ /roll new stats/) {
238 if (my $stat = delete $conn->{stat_change_with}) { 317 if (my $stat = delete $conn->{stat_change_with}) {
239 $conn->send ("reply $stat"); 318 $conn->send ("reply $stat");
… …
320 } 399 }
321 400
322 unshift @dialog, new CFPlus::UI::Label 401 unshift @dialog, new CFPlus::UI::Label
323 max_w => $::WIDTH * 0.4, 402 max_w => $::WIDTH * 0.4,
324 ellipsise => 0, 403 ellipsise => 0,
325 markup => 404 markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
326 "<big><b>Character Creation: Stats</b></big>\n\n"
327 . "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
328 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
329 . "They will be modified later by both the race and the class you choose.\n\n"
330 . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
331 ; 405 ;
332 } 406 }
333 407
334 push @dialog, my $entry = new CFPlus::UI::Entry 408 push @dialog, my $entry = new CFPlus::UI::Entry
335 on_changed => sub { 409 on_changed => sub {
… …
366 $LOGIN_BUTTON->set_text ("Logout"); 440 $LOGIN_BUTTON->set_text ("Logout");
367 $SETUP_DIALOG->hide; 441 $SETUP_DIALOG->hide;
368 442
369 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 443 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
370 444
371 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 445 my ($host, $port) = split /:/, $PROFILE->{host};
372 446
373 $MAP = new CFPlus::Map $mapsize, $mapsize; 447 $MAP = new CFPlus::Map;
374 448
375 $CONN = eval { 449 $CONN = eval {
376 new CFPlus::Protocol 450 new CFPlus::Protocol
377 host => $host, 451 host => $host,
378 port => $port || 13327, 452 port => $port || 13327,
379 user => $CFG->{profile}{default}{user}, 453 user => $PROFILE->{user},
380 pass => $CFG->{profile}{default}{password}, 454 pass => $PROFILE->{password},
381 mapw => $mapsize, 455 mapw => $mapsize,
382 maph => $mapsize, 456 maph => $mapsize,
457
458 client => "cfplus $CFPlus::VERSION $] $^O",
383 459
384 map_widget => $MAPWIDGET, 460 map_widget => $MAPWIDGET,
385 logview => $LOGVIEW, 461 logview => $LOGVIEW,
386 statusbox => $STATUSBOX, 462 statusbox => $STATUSBOX,
387 map => $MAP, 463 map => $MAP,
388 mapmap => $MAPMAP, 464 mapmap => $MAPMAP,
389 query => \&server_query, 465 query => \&server_query,
390 466
467 setup_req => {
468 smoothing => $CFG->{map_smoothing}*1,
469 },
470
391 sound_play => sub { 471 sound_play => sub {
392 my ($x, $y, $soundnum, $type) = @_; 472 my ($x, $y, $soundnum, $type) = @_;
393 473
394 $SDL_MIXER 474 $SDL_MIXER
395 or return; 475 or return;
… …
414sub stop_game { 494sub stop_game {
415 $LOGIN_BUTTON->set_text ("Login"); 495 $LOGIN_BUTTON->set_text ("Login");
416 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 496 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
417 $SETUP_DIALOG->show; 497 $SETUP_DIALOG->show;
418 $PL_WINDOW->hide; 498 $PL_WINDOW->hide;
419 $SPELL_PAGE->clear_spells; 499 $SPELL_LIST->clear_spells;
420 500
421 return unless $CONN; 501 return unless $CONN;
422 502
423 status "connection closed"; 503 status "connection closed";
424 504
… …
432sub graphics_setup { 512sub graphics_setup {
433 my $vbox = new CFPlus::UI::VBox; 513 my $vbox = new CFPlus::UI::VBox;
434 514
435 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 515 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
436 516
517 my $row = 0;
518
519 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
520 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
521 can_events => 1,
522 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
523
437 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 524 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
438 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 525 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
439 526
440 $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]); 527 $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]);
441 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 528 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
442 529
443 $mode_slider->connect (changed => sub { 530 $mode_slider->connect (changed => sub {
… …
445 532
446 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 533 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
447 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 534 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
448 }); 535 });
449 $mode_slider->emit (changed => $mode_slider->{range}[0]); 536 $mode_slider->emit (changed => $mode_slider->{range}[0]);
450
451 my $row = 1;
452 537
453 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 538 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
454 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 539 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
455 state => $CFG->{fullscreen}, 540 state => $CFG->{fullscreen},
456 tooltip => "Bring the client into fullscreen mode.", 541 tooltip => "Bring the client into fullscreen mode.",
… …
462 state => $CFG->{fast}, 547 state => $CFG->{fast},
463 tooltip => "Lower the visual quality considerably to speed up rendering.", 548 tooltip => "Lower the visual quality considerably to speed up rendering.",
464 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 549 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
465 ); 550 );
466 551
552 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
553 $table->add (1, $row++, new CFPlus::UI::Slider
554 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
555 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
556 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
557 );
558
559 $table->add (1, $row++, new CFPlus::UI::Button
560 expand => 1, align => 0, text => "Apply",
561 tooltip => "Apply the video settings above.",
562 on_activate => sub {
563 video_shutdown ();
564 video_init ();
565 0
566 }
567 );
568
467 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 569 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
468 $table->add (1, $row++, new CFPlus::UI::Slider 570 $table->add (1, $row++, new CFPlus::UI::Slider
469 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 571 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
470 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 572 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
471 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 573 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
574 );
575
576 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
577 $table->add (1, $row++, new CFPlus::UI::CheckBox
578 state => $CFG->{map_smoothing},
579 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
580 . "This increases load on the graphics subsystem and works only with 2.x servers. "
581 . "Changes take effect at next connection only.",
582 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
472 ); 583 );
473 584
474 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 585 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
475 $table->add (1, $row++, new CFPlus::UI::CheckBox 586 $table->add (1, $row++, new CFPlus::UI::CheckBox
476 state => $CFG->{fow_enable}, 587 state => $CFG->{fow_enable},
… …
495 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; 606 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
496 0 607 0
497 } 608 }
498 ); 609 );
499 610
500 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
501 $table->add (1, $row++, new CFPlus::UI::Slider
502 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
503 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
504 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
505 );
506
507 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 611 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
508 $table->add (1, $row++, new CFPlus::UI::Slider 612 $table->add (1, $row++, new CFPlus::UI::Slider
509 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 613 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
510 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 614 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
511 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 615 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
… …
527 range => [$CFG->{gauge_size}, 0.2, 0.8], 631 range => [$CFG->{gauge_size}, 0.2, 0.8],
528 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 632 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
529 on_changed => sub { 633 on_changed => sub {
530 $CFG->{gauge_size} = $_[1]; 634 $CFG->{gauge_size} = $_[1];
531 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 635 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
532 0
533 }
534 );
535
536 $table->add (1, $row++, new CFPlus::UI::Button
537 expand => 1, align => 0, text => "Apply",
538 tooltip => "Apply the video settings",
539 on_activate => sub {
540 video_shutdown ();
541 video_init ();
542 0 636 0
543 } 637 }
544 ); 638 );
545 639
546 $vbox 640 $vbox
… …
622 (new CFPlus::UI::Empty expand => 1), 716 (new CFPlus::UI::Empty expand => 1),
623 (my $hb = new CFPlus::UI::HBox), 717 (my $hb = new CFPlus::UI::HBox),
624 ], 718 ],
625 ); 719 );
626 720
627 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', 721 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
628 tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
629 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', 722 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
630 tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
631 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', 723 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
632 tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
633 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', 724 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
634 tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
635 725
636 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 726 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
637 tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
638 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 727 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
639 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
640 728
641 $GAUGES = { 729 $GAUGES = {
642 exp => $exp, win => $win, range => $rng, 730 exp => $exp, win => $win, range => $rng,
643 food => $fg, mana => $mg, hp => $hg, grace => $gg 731 food => $fg, mana => $mg, hp => $hg, grace => $gg
644 }; 732 };
… …
657 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 745 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
658 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 746 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
659 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 747 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
660 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 748 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
661 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 749 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
750 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
662 751
663 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 752 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
664 753
665 for my $x (0..2) { 754 for my $x (0..2) {
666 for my $y (0 .. 2) { 755 for my $y (0 .. 2) {
… …
670 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 759 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
671 ); 760 );
672 } 761 }
673 } 762 }
674 763
764 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
675 765
676 $table 766 $table
677} 767}
678 768
679sub stats_window { 769sub stats_window {
… …
681 expand => 1, 771 expand => 1,
682 scroll_y => 1 772 scroll_y => 1
683 ); 773 );
684 $r->add (my $vb = new CFPlus::UI::VBox); 774 $r->add (my $vb = new CFPlus::UI::VBox);
685 775
776 $vb->add (new CFPlus::UI::FancyFrame
777 label => "Player",
778 child => (my $pi = new CFPlus::UI::VBox),
779 );
780
686 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 781 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
687 can_hover => 1, can_events => 1, 782 can_hover => 1, can_events => 1,
688 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 783 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
689 $vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 784 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
690 can_hover => 1, can_events => 1, 785 can_hover => 1, can_events => 1,
691 tooltip => "The map you are currently on (if supported by the server)."); 786 tooltip => "The map you are currently on (if supported by the server).");
692 787
693 $vb->add (my $hb0 = new CFPlus::UI::HBox); 788 $pi->add (my $hb0 = new CFPlus::UI::HBox);
694 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 789 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
695 can_hover => 1, can_events => 1, 790 can_hover => 1, can_events => 1,
696 tooltip => "The weight of the player including all inventory items."); 791 tooltip => "The weight of the player including all inventory items.");
697 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 792 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
698 can_hover => 1, can_events => 1, 793 can_hover => 1, can_events => 1,
699 tooltip => "The weight limit: you cannot carry more than this."); 794 tooltip => "The weight limit: you cannot carry more than this.");
700 795
796 $vb->add (new CFPlus::UI::FancyFrame
797 label => "Primary/Secondary Statistics",
701 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 798 child => (my $hb = new CFPlus::UI::HBox expand => 1),
799 );
702 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 800 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
703 801
704 my $color2 = [1, 1, 0]; 802 my $color2 = [1, 1, 0];
705 803
706 for ( 804 for (
… …
727 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 825 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
728 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 826 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
729 align => -1, text => $label, tooltip => "#stat_$label"); 827 align => -1, text => $label, tooltip => "#stat_$label");
730 } 828 }
731 829
830 $vb->add (new CFPlus::UI::FancyFrame
831 label => "Resistancies",
732 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 832 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
833 );
733 834
734 my $row = 0; 835 my $row = 0;
735 my $col = 0; 836 my $col = 0;
736 837
737 my %resist_names = ( 838 my %resist_names = (
… …
837 938
838 my $table = $METASERVER->{table}; 939 my $table = $METASERVER->{table};
839 $table->clear; 940 $table->clear;
840 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 941 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
841 942
842 my $buf; 943 my $ok = 0;
843 944
844 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 945 CFPlus::background {
946 my $ua = CFPlus::lwp_useragent;
845 947
846 unless ($fh) { 948 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
847 $label->set_text ("unable to contact metaserver: $!"); 949 } sub {
848 return; 950 my ($msg) = @_;
849 } 951 if ($msg) {
850
851 Event->io (fd => $fh, poll => 'r', cb => sub {
852 my $res = sysread $fh, $buf, 8192, length $buf;
853
854 if (!defined $res) {
855 $_[0]->w->cancel;
856 $label->set_text ("error while retrieving server list: $!");
857 } elsif ($res == 0) {
858 $_[0]->w->cancel;
859 status "server list retrieved";
860
861 utf8::decode $buf if utf8::valid $buf;
862
863 $table->clear; 952 $table->clear;
864 953
865 my @tip = ( 954 my @tip = (
866 "The current number of users logged in on the server.", 955 "The current number of users logged in on the server.",
867 "The hostname of the server.", 956 "The hostname of the server.",
… …
877 for 0 .. $#col; 966 for 0 .. $#col;
878 967
879 my @align = qw(1 0 1 1 -1); 968 my @align = qw(1 0 1 1 -1);
880 969
881 my $y = 0; 970 my $y = 0;
882 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 971 for my $m (@{ $msg->{servers} }) {
883 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 972 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
973 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
884 974
885 for ($desc) { 975 for ($desc) {
886 s/<br>/\n/gi; 976 s/<br>/\n/gi;
887 s/<li>/\n· /gi; 977 s/<li>/\n· /gi;
888 s/<.*?>//sgi; 978 s/<.*?>//sgi;
889 s/&/&amp;/g; 979 s/&amp;/&/g;
890 s/</&lt;/g; 980 s/&lt;/</g;
891 s/>/&gt;/g; 981 s/&gt;/>/g;
892 } 982 }
893 983
894 $uptime = sprintf "%dd %02d:%02d:%02d", 984 $uptime = sprintf "%dd %02d:%02d:%02d",
895 (int $m->[8] / 86400), 985 (int $uptime / 86400),
896 (int $m->[8] / 3600) % 24, 986 (int $uptime / 3600) % 24,
897 (int $m->[8] / 60) % 60, 987 (int $uptime / 60) % 60,
898 $m->[8] % 60; 988 $uptime % 60;
899 989
900 $m = [$users, $host, $uptime, $version, $desc]; 990 $m = [$users, $host, $uptime, $version, $desc];
901 991
902 $y++; 992 $y++;
903 993
… …
913 ), 1003 ),
914 (new CFPlus::UI::Empty expand => 1), 1004 (new CFPlus::UI::Empty expand => 1),
915 ]); 1005 ]);
916 1006
917 $table->add ($_, $y, new CFPlus::UI::Label 1007 $table->add ($_, $y, new CFPlus::UI::Label
1008 max_w => $::WIDTH * 0.4,
918 ellipsise => 0, 1009 ellipsise => 0,
919 align => $align[$_], 1010 align => $align[$_],
920 text => $m->[$_], 1011 text => $m->[$_],
921 tooltip => $tip[$_], 1012 tooltip => $tip[$_],
1013 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
922 can_hover => 1, 1014 can_hover => 1,
923 can_events => 1, 1015 can_events => 1,
924 fontsize => 0.8) 1016 fontsize => 0.8)
925 for 0 .. $#$m; 1017 for 0 .. $#$m;
926 } 1018 }
1019 } else {
1020 $ok or $label->set_text ("error while contacting metaserver");
927 } 1021 }
928 }); 1022 };
1023
929} 1024}
930 1025
931sub metaserver_dialog { 1026sub metaserver_dialog {
932 my $vbox = new CFPlus::UI::VBox; 1027 my $vbox = new CFPlus::UI::VBox;
933 my $table = new CFPlus::UI::Table; 1028 my $table = new CFPlus::UI::Table;
934 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 1029 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
935 1030
936 my $dialog = new CFPlus::UI::FancyFrame 1031 my $dialog = new CFPlus::UI::Toplevel
937 title => "Server List", 1032 title => "Server List",
938 name => 'metaserver_dialog', 1033 name => 'metaserver_dialog',
939 x => 'center', 1034 x => 'center',
940 y => 'center', 1035 y => 'center',
941 z => 3, 1036 z => 3,
1037 force_w => $::WIDTH * 0.9,
942 force_h => $::HEIGHT * 0.4, 1038 force_h => $::HEIGHT * 0.7,
943 child => $vbox, 1039 child => $vbox,
944 has_close_button => 1, 1040 has_close_button => 1,
945 table => $table, 1041 table => $table,
946 on_visibility_change => sub { 1042 on_visibility_change => sub {
947 update_metaserver ($_[0]) if $_[1]; 1043 update_metaserver ($_[0]) if $_[1];
… …
953} 1049}
954 1050
955sub server_setup { 1051sub server_setup {
956 my $vbox = new CFPlus::UI::VBox; 1052 my $vbox = new CFPlus::UI::VBox;
957 1053
1054 $vbox->add (new CFPlus::UI::FancyFrame
1055 label => "Connection Settings",
958 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 1056 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1057 );
959 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1058 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
960 1059
961 { 1060 {
962 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1061 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
963 1062
… …
1020 . "so only set it if you really need to prefetch images. " 1119 . "so only set it if you really need to prefetch images. "
1021 . "This option can be set and unset any time.", 1120 . "This option can be set and unset any time.",
1022 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1121 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1023 ); 1122 );
1024 1123
1025 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1124 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1026 $table->add (1, 9, new CFPlus::UI::Entry 1125 $table->add (1, 9, new CFPlus::UI::Entry
1126 text => $CFG->{output_rate},
1127 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1128 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1129 . "default will be used, which is usually around 100kb/s.",
1130 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1131 );
1132
1133 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1134 $table->add (1, 10, new CFPlus::UI::Entry
1027 text => $CFG->{output_count}, 1135 text => $CFG->{output_count},
1028 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1136 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1029 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1137 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1030 ); 1138 );
1031 1139
1032 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1140 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1033 $table->add (1, 10, new CFPlus::UI::Entry 1141 $table->add (1, 11, new CFPlus::UI::Entry
1034 text => $CFG->{output_sync}, 1142 text => $CFG->{output_sync},
1035 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1143 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1036 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1144 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1037 ); 1145 );
1038 1146
1039 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1147 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1040 expand => 1, 1148 expand => 1,
1041 align => 0, 1149 align => 0,
1042 text => "Login", 1150 text => "Login",
1043 on_activate => sub { 1151 on_activate => sub {
1044 $CONN ? stop_game 1152 $CONN ? stop_game
1045 : start_game; 1153 : start_game;
1046 0 1154 0
1047 }, 1155 },
1048 ); 1156 );
1049 1157
1158 $vbox->add (new CFPlus::UI::FancyFrame
1159 label => "Server Info",
1160 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1161 );
1162
1163 $vbox
1164}
1165
1166sub client_setup {
1167 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1168
1169 my $row = 0;
1170
1050 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1171 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1051 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1172 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1052 text => $CFG->{say_command}, 1173 text => $CFG->{say_command},
1053 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. " 1174 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. "
1054 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1175 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1055 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1176 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1056 on_changed => sub { 1177 on_changed => sub {
1057 my ($self, $value) = @_; 1178 my ($self, $value) = @_;
1058 $CFG->{say_command} = $value; 1179 $CFG->{say_command} = $value;
1059 0 1180 0
1060 } 1181 }
1061 ); 1182 );
1062 1183
1063 $vbox->add (new CFPlus::UI::Label 1184 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1064 text => "Server Info", 1185 $table->add (1, $row++, new CFPlus::UI::CheckBox
1065 fontsize => 1.2, 1186 state => $CFG->{show_tips},
1066 padding_y => 8, 1187 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1067 fg => [1, 1, 0, 1], 1188 on_changed => sub {
1189 my ($self, $value) = @_;
1190 $CFG->{show_tips} = $value;
1191 0
1192 }
1068 ); 1193 );
1069 1194
1070 $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0); 1195 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1196 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1197 text => $CFG->{logview_max_par},
1198 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1199 . "sends more messages than this number, older messages get removed to save memory and "
1200 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1201 on_changed => sub {
1202 my ($self, $value) = @_;
1203 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1204 0
1205 },
1206 );
1071 1207
1072 $vbox 1208 $table
1073} 1209}
1074 1210
1075sub message_window { 1211sub message_window {
1076 my $window = new CFPlus::UI::FancyFrame 1212 my $window = new CFPlus::UI::Toplevel
1077 name => "message_window", 1213 name => "message_window",
1078 title => "Messages", 1214 title => "Messages",
1079 border_bg => [1, 1, 1, 1], 1215 border_bg => [1, 1, 1, 1],
1080 x => "max", 1216 x => "max",
1081 y => 0, 1217 y => 0,
… …
1131 window => $window, 1267 window => $window,
1132 input => $input, 1268 input => $input,
1133 }; 1269 };
1134 1270
1135 $window 1271 $window
1136}
1137
1138sub open_string_query {
1139 my $cb = $_[1];
1140 my $dialog = new CFPlus::UI::FancyFrame
1141 x => "center",
1142 y => "center",
1143 z => 50,
1144 force_w => $WIDTH * 4/5,
1145 title => $_[0];
1146
1147 $dialog->add (
1148 my $e = new CFPlus::UI::Entry
1149 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1150 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1151 );
1152
1153 $e->grab_focus;
1154 $dialog->show;
1155}
1156
1157sub open_quit_dialog {
1158 unless ($QUIT_DIALOG) {
1159 $QUIT_DIALOG = new CFPlus::UI::FancyFrame
1160 x => "center",
1161 y => "center",
1162 z => 50,
1163 title => "Really Quit?",
1164 on_key_down => sub {
1165 my ($dialog, $ev) = @_;
1166 $ev->{sym} == 27 and $dialog->hide;
1167 }
1168 ;
1169
1170 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1171
1172 $vb->add (new CFPlus::UI::Label
1173 text => "You should find a savebed and apply it first!",
1174 max_w => $WIDTH * 0.25,
1175 ellipsize => 0,
1176 );
1177 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1178 $hb->add (new CFPlus::UI::Button
1179 text => "Ok",
1180 expand => 1,
1181 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1182 );
1183 $hb->add (new CFPlus::UI::Button
1184 text => "Quit anyway",
1185 expand => 1,
1186 on_activate => sub { exit },
1187 );
1188 }
1189
1190 $QUIT_DIALOG->show;
1191 $QUIT_DIALOG->grab_focus;
1192} 1272}
1193 1273
1194sub autopickup_setup { 1274sub autopickup_setup {
1195 my $table = new CFPlus::UI::Table; 1275 my $table = new CFPlus::UI::Table;
1196 1276
… …
1214 ["Boots" => PICKUP_BOOTS], 1294 ["Boots" => PICKUP_BOOTS],
1215 ["Gloves" => PICKUP_GLOVES], 1295 ["Gloves" => PICKUP_GLOVES],
1216 ["Cloaks" => PICKUP_CLOAK], 1296 ["Cloaks" => PICKUP_CLOAK],
1217 ], 1297 ],
1218 1298
1219 ["Readables", 2, 2, 1299 ["Readables", 2, 0,
1220 ["Spellbooks" => PICKUP_SPELLBOOK], 1300 ["Spellbooks" => PICKUP_SPELLBOOK],
1221 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1301 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1222 ["Normal Books/Scrolls" => PICKUP_READABLES], 1302 ["Normal Books/Scrolls" => PICKUP_READABLES],
1223 ], 1303 ],
1224 ["Misc", 2, 7, 1304 ["Misc", 2, 5,
1225 ["Food" => PICKUP_FOOD], 1305 ["Food" => PICKUP_FOOD],
1226 ["Drinks" => PICKUP_DRINK], 1306 ["Drinks" => PICKUP_DRINK],
1227 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1307 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1228 ["Keys" => PICKUP_KEY], 1308 ["Keys" => PICKUP_KEY],
1229 ["Magical Items" => PICKUP_MAGICAL], 1309 ["Magical Items" => PICKUP_MAGICAL],
1230 ["Potions" => PICKUP_POTION], 1310 ["Potions" => PICKUP_POTION],
1231 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1311 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1232 ["Ignore cursed" => PICKUP_NOT_CURSED], 1312 ["Ignore cursed" => PICKUP_NOT_CURSED],
1233 ["Jewelery" => PICKUP_JEWELS], 1313 ["Jewelery" => PICKUP_JEWELS],
1314 ["Flesh" => PICKUP_FLESH],
1234 ], 1315 ],
1235 ["Weight/Value ratio", 2, 17] 1316 ["Weight/Value ratio", 2, 17]
1236 ) 1317 )
1237 { 1318 {
1238 my ($title, $x, $y, @bits) = @$_; 1319 my ($title, $x, $y, @bits) = @$_;
… …
1288 $table 1369 $table
1289} 1370}
1290 1371
1291my %SORT_ORDER = ( 1372my %SORT_ORDER = (
1292 type => undef, 1373 type => undef,
1293 mtime => sub { sort { 1374 mtime => sub {
1375 my $NOW = time;
1376 sort {
1377 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1378 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1379
1294 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1380 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1295 or $b->{mtime} <=> $a->{mtime} 1381 or $btime <=> $atime
1296 or $a->{type} <=> $b->{type} 1382 or $a->{type} <=> $b->{type}
1383 } @_
1297 } @_ }, 1384 },
1298 weight => sub { sort { 1385 weight => sub { sort {
1299 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1386 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1300 or $a->{type} <=> $b->{type} 1387 or $a->{type} <=> $b->{type}
1301 } @_ }, 1388 } @_ },
1302); 1389);
… …
1327 #TODO# update to weigh/maxweight 1414 #TODO# update to weigh/maxweight
1328 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1415 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1329 1416
1330 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1417 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1331 $sw1->add ($INV = new CFPlus::UI::Inventory); 1418 $sw1->add ($INV = new CFPlus::UI::Inventory);
1419 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1332 1420
1333 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1421 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1334 1422
1335 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1423 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1336 1424
… …
1353 $PL_WINDOW->show; 1441 $PL_WINDOW->show;
1354 } 1442 }
1355} 1443}
1356 1444
1357sub player_window { 1445sub player_window {
1358 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1446 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1359 x => "center", 1447 x => "center",
1360 y => "center", 1448 y => "center",
1361 force_w => $WIDTH * 9/10, 1449 force_w => $WIDTH * 9/10,
1362 force_h => $HEIGHT * 9/10, 1450 force_h => $HEIGHT * 9/10,
1363 title => "Player", 1451 title => "Player",
… …
1376 $ntb->add ( 1464 $ntb->add (
1377 "Skills (F3)" => $SKILL_PAGE = skill_window, 1465 "Skills (F3)" => $SKILL_PAGE = skill_window,
1378 "Shows all your Skills." 1466 "Shows all your Skills."
1379 ); 1467 );
1380 1468
1381 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1469 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1382 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1470 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1383 $ntb->add ( 1471 $ntb->add (
1384 "Spellbook (F4)" => $spellsw, 1472 "Spellbook (F4)" => $spellsw,
1385 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1473 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1386 ); 1474 );
1387 $ntb->add ( 1475 $ntb->add (
… …
1394 1482
1395 $plwin->add ($ntb); 1483 $plwin->add ($ntb);
1396 $plwin 1484 $plwin
1397} 1485}
1398 1486
1399sub update_bindings {
1400 $BIND_UPD_CB->() if $BIND_UPD_CB;
1401}
1402
1403sub keyboard_setup { 1487sub keyboard_setup {
1404 my $binding_list = new CFPlus::UI::VBox; 1488 CFPlus::Macro::keyboard_setup
1405
1406 my $refresh;
1407 $refresh = $BIND_UPD_CB = sub {
1408 $binding_list->clear ();
1409
1410 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1411 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1412 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1413 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1414
1415 my $lbl = join "; ", @$cmds;
1416 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1417 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1418 $hb->add (new CFPlus::UI::Button
1419 text => "delete",
1420 tooltip => "Deletes the binding",
1421 on_activate => sub {
1422 $binding_list->remove ($hb);
1423 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1424 0
1425 });
1426
1427 $hb->add (new CFPlus::UI::Button
1428 text => "edit",
1429 tooltip => "Edits the binding",
1430 on_activate => sub {
1431 $::BIND_EDITOR->set_binding (
1432 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1433 sub {
1434 my ($nmod, $nsym, $ncmds) = @_;
1435 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1436 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1437 $refresh->();
1438 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1439 $SETUP_DIALOG->show;
1440 },
1441 sub {
1442 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1443 $SETUP_DIALOG->show;
1444 });
1445 $::BIND_EDITOR->show;
1446 $SETUP_DIALOG->hide;
1447 0
1448 });
1449
1450 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1451 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1452 }
1453 }
1454 };
1455
1456 my $vb = new CFPlus::UI::VBox;
1457 $vb->add (my $hb = new CFPlus::UI::HBox);
1458 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1459 $hb->add (new CFPlus::UI::CheckBox
1460 expand => 1,
1461 state => $CFG->{shift_fire_stop},
1462 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1463 on_changed => sub {
1464 my ($cbox, $value) = @_;
1465 $CFG->{shift_fire_stop} = $value;
1466 0
1467 });
1468
1469 $vb->add ($binding_list);
1470 $vb->add (my $hb = new CFPlus::UI::HBox);
1471
1472 $hb->add (new CFPlus::UI::Button
1473 text => "record new",
1474 expand => 1,
1475 tooltip => "This button opens the binding editor with an empty binding.",
1476 on_activate => sub {
1477 $::BIND_EDITOR->set_binding (undef, undef, [],
1478 sub {
1479 my ($mod, $sym, $cmds) = @_;
1480 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1481 $refresh->();
1482 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1483 $SETUP_DIALOG->show;
1484 },
1485 sub {
1486 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1487 $SETUP_DIALOG->show;
1488 },
1489 );
1490 $SETUP_DIALOG->hide;
1491 $::BIND_EDITOR->show;
1492 0
1493 },
1494 );
1495
1496 $hb->add (new CFPlus::UI::Button
1497 text => "close",
1498 tooltip => "Closes the binding window",
1499 expand => 1,
1500 on_activate => sub {
1501 $SETUP_DIALOG->hide;
1502 0
1503 }
1504 );
1505
1506 $refresh->();
1507
1508 $vb
1509} 1489}
1510 1490
1511sub help_window { 1491sub help_window {
1512 my $win = new CFPlus::UI::FancyFrame 1492 my $win = new CFPlus::UI::Toplevel
1513 x => 'center', 1493 x => 'center',
1514 y => 'center', 1494 y => 'center',
1515 z => 2, 1495 z => 4,
1516 name => 'doc_browser', 1496 name => 'doc_browser',
1517 force_w => int $WIDTH * 7/8, 1497 force_w => int $WIDTH * 7/8,
1518 force_h => int $HEIGHT * 7/8, 1498 force_h => int $HEIGHT * 7/8,
1519 title => "Help Browser", 1499 title => "Help Browser",
1520 has_close_button => 1; 1500 has_close_button => 1;
1521 1501
1522 $win->add (my $vbox = new CFPlus::UI::VBox); 1502 $win->add (my $vbox = new CFPlus::UI::VBox);
1523 1503
1504 $vbox->add (new CFPlus::UI::FancyFrame
1505 label => "Navigation",
1524 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1506 child => (my $buttons = new CFPlus::UI::HBox),
1507 );
1525 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1508 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1526 expand => 1, fontsize => 0.8, padding_x => 4); 1509 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1527 1510
1528 $buttons->add (new CFPlus::UI::Label text => "Choose a document to display: "); 1511 my @history;
1529 $buttons->add (my $combo = new CFPlus::UI::Selector 1512 my @future;
1530 value => undef, 1513 my $curnode;
1531 options => [ 1514
1532 [intro => "Introduction"], 1515 my $load_node; $load_node = sub {
1533 [manual => "Main Manual"], 1516 my ($node, $para) = @_;
1534 [skill_help => "Skill Reference"], 1517
1535 [command_help => "Command Reference"], 1518 $buttons->clear;
1536 [dmcommand_help => "DM Commands"], 1519
1537 [COPYING => "License Terms"], 1520 $buttons->add (new CFPlus::UI::Button
1538 ], 1521 text => "⇤",
1522 tooltip => "back to the starting page",
1539 on_changed => sub { 1523 on_activate => sub {
1540 my ($self, $pod) = @_; 1524 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1541 1525 unshift @future, @history;
1542 $viewer->clear; 1526 @history = ();
1543 $viewer->add_paragraph (CFPlus::Pod::section pod => $pod); 1527 $load_node->(@{shift @future});
1544 $viewer->set_offset (0);
1545
1546 0 1528 },
1529 );
1530
1531 if (@history) {
1532 $buttons->add (new CFPlus::UI::Button
1533 text => "⋘",
1534 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1535 on_activate => sub {
1536 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1537 $load_node->(@{pop @history});
1538 },
1539 );
1547 }, 1540 }
1548 on_visibility_change => sub { 1541
1549 my ($self, $visible) = @_; 1542 if (@future) {
1550 return unless $visible; 1543 $buttons->add (new CFPlus::UI::Button
1551 return if $self->{value}; 1544 text => "⋙",
1552 $self->set_value ("intro"); 1545 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1546 on_activate => sub {
1547 push @history, [$curnode, $viewer->current_paragraph];
1548 $load_node->(@{shift @future});
1549 },
1553 0 1550 );
1554 }, 1551 }
1552
1553 $buttons->add (new CFPlus::UI::Label text => " ");
1554
1555 my @path = CFPlus::Pod::full_path_of $node;
1556 pop @path; # drop current node
1557
1558 for my $node (@path) {
1559 $buttons->add (new CFPlus::UI::Button
1560 text => $node->{kw}[0],
1561 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1562 on_activate => sub {
1563 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1564 $load_node->($node);
1565 },
1566 );
1567 $buttons->add (new CFPlus::UI::Label text => "/");
1568 }
1569
1570 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1571
1572 $curnode = $node;
1573
1574 $viewer->clear;
1575 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1576 $viewer->scroll_to ($para);
1555 ); 1577 };
1578
1579 $load_node->(CFPlus::Pod::find pod => "mainpage");
1580
1581 $CFPlus::Pod::goto_document = sub {
1582 my (@path) = @_;
1583
1584 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1585
1586 $load_node->((CFPlus::Pod::find @path)[0]);
1587 $win->show;
1588 };
1556 1589
1557 $win 1590 $win
1591}
1592
1593sub open_string_query {
1594 my ($title, $cb, $txt, $tooltip) = @_;
1595 my $dialog = new CFPlus::UI::Toplevel
1596 x => "center",
1597 y => "center",
1598 z => 50,
1599 force_w => $WIDTH * 4/5,
1600 title => $title;
1601
1602 $dialog->add (
1603 my $e = new CFPlus::UI::Entry
1604 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1605 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1606 tooltip => $tooltip
1607 );
1608
1609 $e->grab_focus;
1610 $e->set_text ($txt) if $txt;
1611 $dialog->show;
1612}
1613
1614sub open_quit_dialog {
1615 unless ($QUIT_DIALOG) {
1616 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1617 x => "center",
1618 y => "center",
1619 z => 50,
1620 title => "Really Quit?",
1621 on_key_down => sub {
1622 my ($dialog, $ev) = @_;
1623 $ev->{sym} == 27 and $dialog->hide;
1624 }
1625 ;
1626
1627 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1628
1629 $vb->add (new CFPlus::UI::Label
1630 text => "You should find a savebed and apply it first!",
1631 max_w => $WIDTH * 0.25,
1632 ellipsize => 0,
1633 );
1634 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1635 $hb->add (new CFPlus::UI::Button
1636 text => "Ok",
1637 expand => 1,
1638 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1639 );
1640 $hb->add (new CFPlus::UI::Button
1641 text => "Quit anyway",
1642 expand => 1,
1643 on_activate => sub { exit },
1644 );
1645 }
1646
1647 $QUIT_DIALOG->show;
1648 $QUIT_DIALOG->grab_focus;
1649}
1650
1651sub show_tip_of_the_day {
1652 # find all tips
1653 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1654
1655 CFPlus::DB::get state => "tip_of_the_day", sub {
1656 my ($todindex) = @_;
1657 $todindex = 0 if $todindex >= @tod;
1658 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1659
1660 # create dialog
1661 my $dialog;
1662
1663 my $close = sub {
1664 $dialog->destroy;
1665 };
1666
1667 $dialog = new CFPlus::UI::Toplevel
1668 x => "center",
1669 y => "center",
1670 z => 3,
1671 name => 'tip_of_the_day',
1672 force_w => int $WIDTH * 4/9,
1673 force_h => int $WIDTH * 2/9,
1674 title => "Tip of the day #" . (1 + $todindex),
1675 child => my $vbox = new CFPlus::UI::VBox,
1676 has_close_button => 1,
1677 on_delete => $close,
1678 ;
1679
1680 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1681 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1682 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1683
1684 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1685
1686 $table->add (0, 0, new CFPlus::UI::Button
1687 text => "Close",
1688 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>.",
1689 on_activate => $close,
1690 );
1691
1692 $table->add (2, 0, new CFPlus::UI::Button
1693 text => "Next",
1694 tooltip => "Show the next <b>Tip of the day</b>.",
1695 on_activate => sub {
1696 $close->();
1697 &show_tip_of_the_day;
1698 },
1699 );
1700
1701 $dialog->show;
1702 };
1558} 1703}
1559 1704
1560sub sdl_init { 1705sub sdl_init {
1561 CFPlus::SDL_Init 1706 CFPlus::SDL_Init
1562 and die "SDL::Init failed!\n"; 1707 and die "SDL::Init failed!\n";
… …
1597 z => 100, 1742 z => 100,
1598 force_x => "max", 1743 force_x => "max",
1599 force_y => 0; 1744 force_y => 0;
1600 $DEBUG_STATUS->show; 1745 $DEBUG_STATUS->show;
1601 1746
1602 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1603
1604 $STATUSBOX = new CFPlus::UI::Statusbox; 1747 $STATUSBOX = new CFPlus::UI::Statusbox;
1605 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1748 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1606 1749
1607 (new CFPlus::UI::Frame 1750 (new CFPlus::UI::Frame
1608 bg => [0, 0, 0, 0.4], 1751 bg => [0, 0, 0, 0.4],
1609 force_x => 0, 1752 force_x => 0,
1610 force_y => "max", 1753 force_y => "max",
1611 child => $STATUSBOX, 1754 child => $STATUSBOX,
1612 )->show; 1755 )->show;
1613 1756
1614 CFPlus::UI::FancyFrame->new ( 1757 CFPlus::UI::Toplevel->new (
1615 title => "Map", 1758 title => "Map",
1616 name => "mapmap", 1759 name => "mapmap",
1617 x => 0, 1760 x => 0,
1618 y => $FONTSIZE + 8, 1761 y => $FONTSIZE + 8,
1619 border_bg => [1, 1, 1, 192/255], 1762 border_bg => [1, 1, 1, 192/255],
… …
1644 font => $FONT_FIXED, 1787 font => $FONT_FIXED,
1645 fontsize => $::CFG->{log_fontsize}, 1788 fontsize => $::CFG->{log_fontsize},
1646 indent => -4, 1789 indent => -4,
1647 can_hover => 1, 1790 can_hover => 1,
1648 can_events => 1, 1791 can_events => 1,
1792 max_par => $CFG->{logview_max_par},
1649 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1793 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1650 ; 1794 ;
1651 1795
1652 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1796 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1653 title => "Setup", 1797 title => "Setup",
1654 name => "setup_dialog", 1798 name => "setup_dialog",
1655 x => 'center', 1799 x => 'center',
1656 y => 'center', 1800 y => 'center',
1657 z => 2, 1801 z => 2,
… …
1665 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1809 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1666 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1810 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1667 1811
1668 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1812 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1669 "Configure the server to play on, your username, password and other server-related options."); 1813 "Configure the server to play on, your username, password and other server-related options.");
1814 $SETUP_NOTEBOOK->add (Client => client_setup,
1815 "Configure various client-specific settings.");
1670 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1816 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1671 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1817 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1672 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1818 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1673 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1819 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1674 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1820 $SETUP_NOTEBOOK->add (Audio => audio_setup,
… …
1708 ); 1854 );
1709 1855
1710 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1856 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1711 tooltip => "View Documentation"); 1857 tooltip => "View Documentation");
1712 1858
1859
1713 $BUTTONBAR->add (new CFPlus::UI::Button 1860 $BUTTONBAR->add (new CFPlus::UI::Button
1714 text => "Quit", 1861 text => "Quit",
1715 tooltip => "Terminates the program", 1862 tooltip => "Terminates the program",
1716 on_activate => sub { 1863 on_activate => sub {
1717 if ($CONN) { 1864 if ($CONN) {
… …
1728 } 1875 }
1729 1876
1730 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1877 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1731} 1878}
1732 1879
1880sub setup_build_button {
1881 my ($enabled) = @_;
1882 if ($enabled) {
1883 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1884 $BUILD_BUTTON ||= new CFPlus::UI::Button
1885 text => "Build",
1886 tooltip => "Opens the ingame builder",
1887 on_activate => sub {
1888 if ($CONN) {
1889 $CONN->send_ext_req (builder_player_items => sub {
1890 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1891 });
1892 }
1893 0
1894 };
1895 $BUTTONBAR->add ($BUILD_BUTTON);
1896 } else {
1897 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1898 }
1899}
1900
1901sub open_ingame_editor {
1902 my ($msg) = @_;
1903
1904 my $win = new CFPlus::UI::Toplevel
1905 x => 0,
1906 y => 'center',
1907 z => 4,
1908 name => 'builder_window',
1909 force_w => int $WIDTH * 1/4,
1910 force_h => int $HEIGHT * 3/4,
1911 title => "In game builder",
1912 has_close_button => 1;
1913
1914 my $r = new CFPlus::UI::ScrolledWindow (
1915 expand => 1,
1916 scroll_y => 1
1917 );
1918 $r->add (my $vb = new CFPlus::UI::VBox);
1919 $win->add ($r);
1920
1921
1922 $vb->add (
1923 new CFPlus::UI::Button
1924 text => "Disable build mode",
1925 on_activate => sub { $::IN_BUILD_MODE = undef }
1926 );
1927 $vb->add (
1928 new CFPlus::UI::Button
1929 text => "ERASE",
1930 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1931 );
1932
1933 for my $itemarchname (
1934 sort {
1935 $msg->{items}->{$a}->{build_arch_name}
1936 cmp $msg->{items}->{$b}->{build_arch_name}
1937 } keys %{$msg->{items}}
1938 ) {
1939 my $info = $msg->{items}->{$itemarchname};
1940 $vb->add (
1941 new CFPlus::UI::Button text => $info->{build_arch_name},
1942 on_activate => sub {
1943 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1944
1945 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1946 build_mode_query_arch_info ();
1947 }
1948 }
1949 );
1950 }
1951
1952 $win->show;
1953}
1954
1955sub build_mode_query_arch_info {
1956 my ($iteminfo) = $::IN_BUILD_MODE;
1957 my $itemarchname = $iteminfo->{item};
1958 my $info = $iteminfo->{info};
1959
1960 my $dialog = new CFPlus::UI::Toplevel
1961 x => "center",
1962 y => "center",
1963 z => 50,
1964 force_w => int $WIDTH * 1/2,
1965 title => "Enter information for placement of '$itemarchname'",
1966 has_close_button => 1;
1967
1968 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1969
1970 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1971 my $row = 0;
1972 if ($info->{has_name}) {
1973 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1974 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1975 }
1976 if ($info->{has_text}) {
1977 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1978 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1979 }
1980 if ($info->{has_connection}) {
1981 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1982 $table->add (1, $row++,
1983 new CFPlus::UI::Entry
1984 expand => 1,
1985 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1986 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1987 );
1988 }
1989
1990 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1991 $hb->add (new CFPlus::UI::Button
1992 text => "Close",
1993 expand => 1,
1994 on_activate => sub { $dialog->hide; 0 },
1995 );
1996 $dialog->show;
1997}
1998
1733sub video_shutdown { 1999sub video_shutdown {
1734 CFPlus::OpenGL::shutdown; 2000 CFPlus::OpenGL::shutdown;
1735 2001
1736 undef $SDL_ACTIVE; 2002 undef $SDL_ACTIVE;
1737} 2003}
… …
1768 CFPlus::Mix_AllocateChannels 8; 2034 CFPlus::Mix_AllocateChannels 8;
1769 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 2035 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1770 2036
1771 audio_music_finished; 2037 audio_music_finished;
1772 2038
2039 local $_;
1773 while (<$fh>) { 2040 while (<$fh>) {
1774 next if /^\s*#/; 2041 next if /^\s*#/;
1775 next if /^\s*$/; 2042 next if /^\s*$/;
1776 2043
1777 my ($file, $volume, $event) = split /\s+/, $_, 3; 2044 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1854 if $CONN; 2121 if $CONN;
1855}); 2122});
1856 2123
1857%SDL_CB = ( 2124%SDL_CB = (
1858 CFPlus::SDL_QUIT => sub { 2125 CFPlus::SDL_QUIT => sub {
1859 Event::unloop -1; 2126 exit;
1860 }, 2127 },
1861 CFPlus::SDL_VIDEORESIZE => sub { 2128 CFPlus::SDL_VIDEORESIZE => sub {
1862 }, 2129 },
1863 CFPlus::SDL_VIDEOEXPOSE => sub { 2130 CFPlus::SDL_VIDEOEXPOSE => sub {
1864 CFPlus::UI::full_refresh; 2131 CFPlus::UI::full_refresh;
1865 }, 2132 },
1866 CFPlus::SDL_ACTIVEEVENT => sub { 2133 CFPlus::SDL_ACTIVEEVENT => sub {
1867# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2134# not useful, as APPACTIVE include sonly iconified state, not unmapped
2135# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2136# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2137# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2138# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1868 }, 2139 },
1869 CFPlus::SDL_KEYDOWN => sub { 2140 CFPlus::SDL_KEYDOWN => sub {
1870 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2141 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1871 # alt-enter 2142 # alt-enter
1872 $FULLSCREEN_ENABLE->toggle; 2143 $FULLSCREEN_ENABLE->toggle;
… …
1893 2164
1894$SIG{INT} = $SIG{TERM} = sub { exit }; 2165$SIG{INT} = $SIG{TERM} = sub { exit };
1895 2166
1896{ 2167{
1897 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2168 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2169 CFPlus::DB::Server::run;
2170
1898 CFPlus::UI::set_layout ($::CFG->{layout}); 2171 CFPlus::UI::set_layout ($::CFG->{layout});
1899 2172
1900 my %DEF_CFG = ( 2173 my %DEF_CFG = (
1901 sdl_mode => 0, 2174 sdl_mode => 0,
1902 width => 640, 2175 width => 640,
1903 height => 480, 2176 height => 480,
1904 fullscreen => 0, 2177 fullscreen => 0,
1905 fast => 0, 2178 fast => 0,
1906 map_scale => 1, 2179 map_scale => 1,
1907 fow_enable => 1, 2180 fow_enable => 1,
1908 fow_intensity => 0.45, 2181 fow_intensity => 0.45,
1909 fow_smooth => 0, 2182 fow_smooth => 0,
2183 map_smoothing => 1,
1910 gui_fontsize => 1, 2184 gui_fontsize => 1,
1911 log_fontsize => 0.7, 2185 log_fontsize => 0.7,
1912 gauge_fontsize => 1, 2186 gauge_fontsize => 1,
1913 gauge_size => 0.35, 2187 gauge_size => 0.35,
1914 stat_fontsize => 0.7, 2188 stat_fontsize => 0.7,
1915 mapsize => 100, 2189 mapsize => 100,
1916 say_command => 'say', 2190 say_command => 'chat',
1917 audio_enable => 1, 2191 audio_enable => 1,
1918 bgm_enable => 1, 2192 bgm_enable => 1,
1919 bgm_volume => 0.25, 2193 bgm_volume => 0.25,
1920 face_prefetch => 0, 2194 face_prefetch => 0,
1921 output_sync => 1, 2195 output_sync => 1,
1922 output_count => 1, 2196 output_count => 1,
2197 output_rate => "",
1923 pickup => 0, 2198 pickup => 0,
1924 inv_sort => "mtime", 2199 inv_sort => "mtime",
1925 default => "profile", # default profile 2200 default => "profile", # default profile
2201 show_tips => 1,
2202 logview_max_par => 1000,
1926 ); 2203 );
1927 2204
1928 while (my ($k, $v) = each %DEF_CFG) { 2205 while (my ($k, $v) = each %DEF_CFG) {
1929 $CFG->{$k} = $v unless exists $CFG->{$k}; 2206 $CFG->{$k} = $v unless exists $CFG->{$k};
1930 } 2207 }
1931 2208
1932 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2209 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2210 $PROFILE = $CFG->{profile}{default};
2211
2212 # convert old bindings (only default profile matters)
2213 if (my $bindings = delete $PROFILE->{bindings}) {
2214 while (my ($mod, $syms) = each %$bindings) {
2215 while (my ($sym, $cmds) = each %$syms) {
2216 push @{ $PROFILE->{macro} }, {
2217 accelkey => [$mod*1, $sym*1],
2218 action => $cmds,
2219 };
2220 }
2221 }
2222 }
1933 2223
1934 sdl_init; 2224 sdl_init;
1935 2225
1936 @SDL_MODES = reverse 2226 @SDL_MODES = reverse
1937 grep $_->[0] >= 640 && $_->[1] >= 480, 2227 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1974# } 2264# }
1975# my $t2 = Time::HiRes::time; 2265# my $t2 = Time::HiRes::time;
1976# warn $t2-$t1; 2266# warn $t2-$t1;
1977# } 2267# }
1978 2268
2269 $startup_done->();
2270
1979 video_init; 2271 video_init;
1980 audio_init; 2272 audio_init;
1981} 2273}
2274
2275show_tip_of_the_day if $CFG->{show_tips};
1982 2276
1983Event::loop; 2277Event::loop;
1984#CFPlus::SDL_Quit; 2278#CFPlus::SDL_Quit;
1985#CFPlus::_exit 0; 2279#CFPlus::_exit 0;
1986 2280
2281END {
1987END { CFPlus::SDL_Quit } 2282 CFPlus::SDL_Quit;
2283 CFPlus::DB::Server::stop;
2284}
1988 2285
1989=head1 NAME 2286=head1 NAME
1990 2287
1991cfplus - A Crossfire+ and Crossfire game client 2288cfplus - A Crossfire+ and Crossfire game client
1992 2289

Diff Legend

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