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.111 by root, Sun Aug 13 19:47:05 2006 UTC vs.
Revision 1.171 by root, Sun Jul 15 21:42:02 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4our $PANGO = "1.5.0";
5
6# do splash-screen thingy on win32
7BEGIN {
8 if (%PAR::LibCache && $^O eq "MSWin32") {
9 while (my ($filename, $zip) = each %PAR::LibCache) {
10 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
11 }
12
13 require Win32::GUI::SplashScreen;
14
15 Win32::GUI::SplashScreen::Show (
16 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
17 );
18
19 $startup_done = sub {
20 Win32::GUI::SplashScreen::Done (1);
21 };
22 }
23}
2 24
3use strict; 25use strict;
4use utf8; 26use utf8;
27
28use Carp 'verbose';
5 29
6# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
7BEGIN { 31BEGIN {
8 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 34
35 my $tmp = $ENV{PAR_TEMP};
36
11 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 38 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 39 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
16 } 42 }
17 } 43 }
18 44
19 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
20 54
21 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
22 } 67 }
23} 68}
24 69
25# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
35use Compress::LZF; 80use Compress::LZF;
36 81
37use CFPlus; 82use CFPlus;
38use CFPlus::OpenGL (); 83use CFPlus::OpenGL ();
39use CFPlus::Protocol; 84use CFPlus::Protocol;
85use CFPlus::DB;
40use CFPlus::UI; 86use CFPlus::UI;
87use CFPlus::UI::Inventory;
88use CFPlus::UI::SpellList;
41use CFPlus::Pod; 89use CFPlus::Pod;
42use CFPlus::BindingEditor;
43use CFPlus::MapWidget; 90use CFPlus::MapWidget;
91use CFPlus::Macro;
44 92
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 93$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 94$SIG{PIPE} = 'IGNORE';
47 95
48$Event::Eval = 0; 96$Event::Eval = 1;
49$Event::DIED = sub { 97$Event::DIED = sub {
50 # TODO: display dialog box or so 98 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFPlus::error $_[1];
53}; 99};
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 100
66my $MAX_FPS = 60; 101my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 102my $MIN_FPS = 5; # unused as of yet
68 103
69our $META_SERVER = "crossfire.real-time.com:13326"; 104our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 105
71our $LAST_REFRESH; 106our $LAST_REFRESH;
72our $NOW; 107our $NOW;
73 108
74our $CFG; 109our $CFG;
75our $CONN; 110our $CONN;
111our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 112our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 113
78our $WANT_REFRESH; 114our $WANT_REFRESH;
79our $CAN_REFRESH; 115our $CAN_REFRESH;
80 116
111 147
112our $INVENTORY_PAGE; 148our $INVENTORY_PAGE;
113our $STATS_PAGE; 149our $STATS_PAGE;
114our $SKILL_PAGE; 150our $SKILL_PAGE;
115our $SPELL_PAGE; 151our $SPELL_PAGE;
152our $SPELL_LIST;
116 153
117our $HELP_WINDOW; 154our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 155our $MESSAGE_WINDOW;
119our $FLOORBOX; 156our $FLOORBOX;
120our $GAUGES; 157our $GAUGES;
122 159
123our $SDL_ACTIVE; 160our $SDL_ACTIVE;
124our %SDL_CB; 161our %SDL_CB;
125 162
126our $SDL_MIXER; 163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT;
166our $MUSIC_START;
167our $MUSIC_PLAYING;
168our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
127our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
128our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
129 172
130our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
131our $STATUSBOX; 174our $STATUSBOX;
133 176
134our $INV; 177our $INV;
135our $INVR; 178our $INVR;
136our $INV_RIGHT_HB; 179our $INV_RIGHT_HB;
137 180
138our $BIND_EDITOR;
139our $BIND_UPD_CB;
140
141our $PICKUP_CFG; 181our $PICKUP_CFG;
182
183our $IN_BUILD_MODE;
184our $BUILD_BUTTON;
142 185
143sub status { 186sub status {
144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 187 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 188}
146 189
147sub debug { 190sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 191 $DEBUG_STATUS->set_text ($_[0]);
192}
193
194sub message {
195 my ($para) = @_;
196
197 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
198
199 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
200
201 $LOGVIEW->add_paragraph ($para);
202 $LOGVIEW->scroll_to_bottom;
149} 203}
150 204
151sub destroy_query_dialog { 205sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 206 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 207 if $_[0]{query_dialog};
154} 208}
155 209
210# FIXME: a very ugly hack to wait for stat update look below! #d#
211our $QUERY_TIMER; #d#
212
156# server query dialog 213# server query dialog
157sub server_query { 214sub server_query {
158 my ($conn, $flags, $prompt) = @_; 215 my ($conn, $flags, $prompt) = @_;
159 216
217 # FIXME: a very ugly hack to wait for stat update #d#
218 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
219 unless ($QUERY_TIMER) {
220 $QUERY_TIMER =
221 Event->timer (
222 after => 1,
223 cb => sub {
224 server_query ($conn, $flags, $prompt, 1);
225 $QUERY_TIMER = undef
226 }
227 );
228 return;
229 }
230 }
231
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame 232 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 233 x => "center",
162 y => "center", 234 y => "center",
163 title => "Server Query", 235 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 236 child => my $vbox = new CFPlus::UI::VBox,
165 ; 237 ;
166 238
167 my @dialog = my $label = new CFPlus::UI::Label 239 my @dialog = my $label = new CFPlus::UI::Label
168 max_w => $::WIDTH * 0.4, 240 max_w => $::WIDTH * 0.8,
169 ellipsise => 0, 241 ellipsise => 0,
170 text => $prompt; 242 text => $prompt;
171 243
172 if ($flags & CS_QUERY_YESNO) { 244 if ($flags & CS_QUERY_YESNO) {
173 push @dialog, my $hbox = new CFPlus::UI::HBox; 245 push @dialog, my $hbox = new CFPlus::UI::HBox;
190 ); 262 );
191 263
192 $dialog->grab_focus; 264 $dialog->grab_focus;
193 265
194 } elsif ($flags & CS_QUERY_SINGLECHAR) { 266 } elsif ($flags & CS_QUERY_SINGLECHAR) {
195 $dialog->{tooltip} = "#charcreation_focus";
196
197 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 267 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
198 $MESSAGE_WINDOW->show; 268 $dialog->{tooltip} = "#charcreation_focus";
199 269
200 unshift @dialog, new CFPlus::UI::Label 270 unshift @dialog, new CFPlus::UI::Label
201 max_w => $::WIDTH * 0.4, 271 max_w => $::WIDTH * 0.8,
202 ellipsise => 0, 272 ellipsise => 0,
203 markup => "\nOr use your keyboard and the text entry below:\n"; 273 markup => "\nOr use your keyboard and the text entry below:\n";
204 274
205 unshift @dialog, my $table = new CFPlus::UI::Table; 275 unshift @dialog, my $table = new CFPlus::UI::Table;
206 276
218 $conn->send ("reply d"); 288 $conn->send ("reply d");
219 destroy_query_dialog $conn; 289 destroy_query_dialog $conn;
220 0 290 0
221 }, 291 },
222 ); 292 );
293
294 if ($conn->{chargen_race_description}) {
295 unshift @dialog, new CFPlus::UI::Label
296 max_w => $::WIDTH * 0.8,
297 ellipsise => 0,
298 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
299 ;
300 }
301
302 unshift @dialog, new CFPlus::UI::Face
303 face => $conn->{player}{face},
304 bg => [.2, .2, .2, 1],
305 min_w => 64,
306 min_h => 64,
307 ;
308
309 if ($conn->{chargen_race_title}) {
310 unshift @dialog, new CFPlus::UI::Label
311 allign => 1,
312 ellipsise => 0,
313 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
314 ;
315 }
223 316
224 unshift @dialog, new CFPlus::UI::Label 317 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4, 318 max_w => $::WIDTH * 0.4,
226 ellipsise => 0, 319 ellipsise => 0,
227 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 320 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
354 $LOGIN_BUTTON->set_text ("Logout"); 447 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 448 $SETUP_DIALOG->hide;
356 449
357 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 450 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
358 451
359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 452 my ($host, $port) = split /:/, $PROFILE->{host};
360 453
361 $MAP = new CFPlus::Map $mapsize, $mapsize; 454 $MAP = new CFPlus::Map;
362 455
363 $CONN = eval { 456 $CONN = eval {
364 new CFPlus::Protocol 457 new CFPlus::Protocol
365 host => $host, 458 host => $host,
366 port => $port || 13327, 459 port => $port || 13327,
367 user => $CFG->{profile}{default}{user}, 460 user => $PROFILE->{user},
368 pass => $CFG->{profile}{default}{password}, 461 pass => $PROFILE->{password},
369 mapw => $mapsize, 462 mapw => $mapsize,
370 maph => $mapsize, 463 maph => $mapsize,
464
465 client => "cfplus $CFPlus::VERSION $] $^O",
371 466
372 map_widget => $MAPWIDGET, 467 map_widget => $MAPWIDGET,
373 logview => $LOGVIEW, 468 logview => $LOGVIEW,
374 statusbox => $STATUSBOX, 469 statusbox => $STATUSBOX,
375 map => $MAP, 470 map => $MAP,
376 mapmap => $MAPMAP, 471 mapmap => $MAPMAP,
377 query => \&server_query, 472 query => \&server_query,
378 473
474 setup_req => {
475 smoothing => $CFG->{map_smoothing}*1,
476 },
477
379 sound_play => sub { 478 sound_play => sub {
380 my ($x, $y, $soundnum, $type) = @_; 479 my ($x, $y, $soundnum, $type) = @_;
381 480
382 $SDL_MIXER 481 $SDL_MIXER
383 or return; 482 or return;
402sub stop_game { 501sub stop_game {
403 $LOGIN_BUTTON->set_text ("Login"); 502 $LOGIN_BUTTON->set_text ("Login");
404 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 503 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
405 $SETUP_DIALOG->show; 504 $SETUP_DIALOG->show;
406 $PL_WINDOW->hide; 505 $PL_WINDOW->hide;
407 $SPELL_PAGE->clear_spells; 506 $SPELL_LIST->clear_spells;
507 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
508
509 &audio_music_set ([]);
408 510
409 return unless $CONN; 511 return unless $CONN;
410 512
411 status "connection closed"; 513 status "connection closed";
412 514
420sub graphics_setup { 522sub graphics_setup {
421 my $vbox = new CFPlus::UI::VBox; 523 my $vbox = new CFPlus::UI::VBox;
422 524
423 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 525 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
424 526
527 my $row = 0;
528
529 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
530 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
531 can_events => 1,
532 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
533
425 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 534 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
426 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 535 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
427 536
428 $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]); 537 $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]);
429 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 538 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
430 539
431 $mode_slider->connect (changed => sub { 540 $mode_slider->connect (changed => sub {
433 542
434 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 543 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
435 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 544 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
436 }); 545 });
437 $mode_slider->emit (changed => $mode_slider->{range}[0]); 546 $mode_slider->emit (changed => $mode_slider->{range}[0]);
438
439 my $row = 1;
440 547
441 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 548 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
442 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 549 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
443 state => $CFG->{fullscreen}, 550 state => $CFG->{fullscreen},
444 tooltip => "Bring the client into fullscreen mode.", 551 tooltip => "Bring the client into fullscreen mode.",
450 state => $CFG->{fast}, 557 state => $CFG->{fast},
451 tooltip => "Lower the visual quality considerably to speed up rendering.", 558 tooltip => "Lower the visual quality considerably to speed up rendering.",
452 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 559 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
453 ); 560 );
454 561
562 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
563 $table->add (1, $row++, new CFPlus::UI::Slider
564 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
565 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
566 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
567 );
568
569 $table->add (1, $row++, new CFPlus::UI::Button
570 expand => 1, align => 0, text => "Apply",
571 tooltip => "Apply the video settings above.",
572 on_activate => sub {
573 video_shutdown ();
574 video_init ();
575 0
576 }
577 );
578
455 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 579 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
456 $table->add (1, $row++, new CFPlus::UI::Slider 580 $table->add (1, $row++, new CFPlus::UI::Slider
457 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 581 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
458 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 582 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
459 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 583 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
584 );
585
586 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
587 $table->add (1, $row++, new CFPlus::UI::CheckBox
588 state => $CFG->{map_smoothing},
589 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
590 . "This increases load on the graphics subsystem and works only with 2.x servers. "
591 . "Changes take effect at next connection only.",
592 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
460 ); 593 );
461 594
462 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 595 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
463 $table->add (1, $row++, new CFPlus::UI::CheckBox 596 $table->add (1, $row++, new CFPlus::UI::CheckBox
464 state => $CFG->{fow_enable}, 597 state => $CFG->{fow_enable},
483 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; 616 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
484 0 617 0
485 } 618 }
486 ); 619 );
487 620
488 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
489 $table->add (1, $row++, new CFPlus::UI::Slider
490 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
491 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
492 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
493 );
494
495 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 621 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
496 $table->add (1, $row++, new CFPlus::UI::Slider 622 $table->add (1, $row++, new CFPlus::UI::Slider
497 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 623 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
498 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 624 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
499 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 625 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
515 range => [$CFG->{gauge_size}, 0.2, 0.8], 641 range => [$CFG->{gauge_size}, 0.2, 0.8],
516 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 642 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
517 on_changed => sub { 643 on_changed => sub {
518 $CFG->{gauge_size} = $_[1]; 644 $CFG->{gauge_size} = $_[1];
519 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 645 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
520 0
521 }
522 );
523
524 $table->add (1, $row++, new CFPlus::UI::Button
525 expand => 1, align => 0, text => "Apply",
526 tooltip => "Apply the video settings",
527 on_activate => sub {
528 video_shutdown ();
529 video_init ();
530 0 646 0
531 } 647 }
532 ); 648 );
533 649
534 $vbox 650 $vbox
639 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 755 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
640 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 756 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
641 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 757 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
642 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 758 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
643 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 759 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
760 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
644 761
645 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 762 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
646 763
647 for my $x (0..2) { 764 for my $x (0..2) {
648 for my $y (0 .. 2) { 765 for my $y (0 .. 2) {
652 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 769 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
653 ); 770 );
654 } 771 }
655 } 772 }
656 773
774 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
657 775
658 $table 776 $table
659} 777}
660 778
661sub stats_window { 779sub stats_window {
663 expand => 1, 781 expand => 1,
664 scroll_y => 1 782 scroll_y => 1
665 ); 783 );
666 $r->add (my $vb = new CFPlus::UI::VBox); 784 $r->add (my $vb = new CFPlus::UI::VBox);
667 785
786 $vb->add (new CFPlus::UI::FancyFrame
787 label => "Player",
788 child => (my $pi = new CFPlus::UI::VBox),
789 );
790
668 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 791 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669 can_hover => 1, can_events => 1, 792 can_hover => 1, can_events => 1,
670 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 793 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
671 $vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 794 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672 can_hover => 1, can_events => 1, 795 can_hover => 1, can_events => 1,
673 tooltip => "The map you are currently on (if supported by the server)."); 796 tooltip => "The map you are currently on (if supported by the server).");
674 797
675 $vb->add (my $hb0 = new CFPlus::UI::HBox); 798 $pi->add (my $hb0 = new CFPlus::UI::HBox);
676 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 799 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
677 can_hover => 1, can_events => 1, 800 can_hover => 1, can_events => 1,
678 tooltip => "The weight of the player including all inventory items."); 801 tooltip => "The weight of the player including all inventory items.");
679 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 802 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
680 can_hover => 1, can_events => 1, 803 can_hover => 1, can_events => 1,
681 tooltip => "The weight limit: you cannot carry more than this."); 804 tooltip => "The weight limit: you cannot carry more than this.");
682 805
806 $vb->add (new CFPlus::UI::FancyFrame
807 label => "Primary/Secondary Statistics",
683 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 808 child => (my $hb = new CFPlus::UI::HBox expand => 1),
809 );
684 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 810 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
685 811
686 my $color2 = [1, 1, 0]; 812 my $color2 = [1, 1, 0];
687 813
688 for ( 814 for (
709 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 835 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
710 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 836 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
711 align => -1, text => $label, tooltip => "#stat_$label"); 837 align => -1, text => $label, tooltip => "#stat_$label");
712 } 838 }
713 839
840 $vb->add (new CFPlus::UI::FancyFrame
841 label => "Resistancies",
714 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 842 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
843 );
715 844
716 my $row = 0; 845 my $row = 0;
717 my $col = 0; 846 my $col = 0;
718 847
719 my %resist_names = ( 848 my %resist_names = (
819 948
820 my $table = $METASERVER->{table}; 949 my $table = $METASERVER->{table};
821 $table->clear; 950 $table->clear;
822 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 951 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
823 952
824 my $buf; 953 my $ok = 0;
825 954
826 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 955 CFPlus::background {
956 my $ua = CFPlus::lwp_useragent;
827 957
828 unless ($fh) { 958 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
829 $label->set_text ("unable to contact metaserver: $!"); 959 } sub {
830 return; 960 my ($msg) = @_;
831 } 961 if ($msg) {
832
833 Event->io (fd => $fh, poll => 'r', cb => sub {
834 my $res = sysread $fh, $buf, 8192, length $buf;
835
836 if (!defined $res) {
837 $_[0]->w->cancel;
838 $label->set_text ("error while retrieving server list: $!");
839 } elsif ($res == 0) {
840 $_[0]->w->cancel;
841 status "server list retrieved";
842
843 utf8::decode $buf if utf8::valid $buf;
844
845 $table->clear; 962 $table->clear;
846 963
847 my @tip = ( 964 my @tip = (
848 "The current number of users logged in on the server.", 965 "The current number of users logged in on the server.",
849 "The hostname of the server.", 966 "The hostname of the server.",
859 for 0 .. $#col; 976 for 0 .. $#col;
860 977
861 my @align = qw(1 0 1 1 -1); 978 my @align = qw(1 0 1 1 -1);
862 979
863 my $y = 0; 980 my $y = 0;
864 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 981 for my $m (@{ $msg->{servers} }) {
865 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 982 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
983 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
866 984
867 for ($desc) { 985 for ($desc) {
868 s/<br>/\n/gi; 986 s/<br>/\n/gi;
869 s/<li>/\n· /gi; 987 s/<li>/\n· /gi;
870 s/<.*?>//sgi; 988 s/<.*?>//sgi;
871 s/&/&amp;/g; 989 s/&amp;/&/g;
872 s/</&lt;/g; 990 s/&lt;/</g;
873 s/>/&gt;/g; 991 s/&gt;/>/g;
874 } 992 }
875 993
876 $uptime = sprintf "%dd %02d:%02d:%02d", 994 $uptime = sprintf "%dd %02d:%02d:%02d",
877 (int $m->[8] / 86400), 995 (int $uptime / 86400),
878 (int $m->[8] / 3600) % 24, 996 (int $uptime / 3600) % 24,
879 (int $m->[8] / 60) % 60, 997 (int $uptime / 60) % 60,
880 $m->[8] % 60; 998 $uptime % 60;
881 999
882 $m = [$users, $host, $uptime, $version, $desc]; 1000 $m = [$users, $host, $uptime, $version, $desc];
883 1001
884 $y++; 1002 $y++;
885 1003
895 ), 1013 ),
896 (new CFPlus::UI::Empty expand => 1), 1014 (new CFPlus::UI::Empty expand => 1),
897 ]); 1015 ]);
898 1016
899 $table->add ($_, $y, new CFPlus::UI::Label 1017 $table->add ($_, $y, new CFPlus::UI::Label
1018 max_w => $::WIDTH * 0.4,
900 ellipsise => 0, 1019 ellipsise => 0,
901 align => $align[$_], 1020 align => $align[$_],
902 text => $m->[$_], 1021 text => $m->[$_],
903 tooltip => $tip[$_], 1022 tooltip => $tip[$_],
1023 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
904 can_hover => 1, 1024 can_hover => 1,
905 can_events => 1, 1025 can_events => 1,
906 fontsize => 0.8) 1026 fontsize => 0.8)
907 for 0 .. $#$m; 1027 for 0 .. $#$m;
908 } 1028 }
1029 } else {
1030 $ok or $label->set_text ("error while contacting metaserver");
909 } 1031 }
910 }); 1032 };
1033
911} 1034}
912 1035
913sub metaserver_dialog { 1036sub metaserver_dialog {
914 my $vbox = new CFPlus::UI::VBox; 1037 my $vbox = new CFPlus::UI::VBox;
915 my $table = new CFPlus::UI::Table; 1038 my $table = new CFPlus::UI::Table;
916 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 1039 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
917 1040
918 my $dialog = new CFPlus::UI::FancyFrame 1041 my $dialog = new CFPlus::UI::Toplevel
919 title => "Server List", 1042 title => "Server List",
920 name => 'metaserver_dialog', 1043 name => 'metaserver_dialog',
921 x => 'center', 1044 x => 'center',
922 y => 'center', 1045 y => 'center',
923 z => 3, 1046 z => 3,
1047 force_w => $::WIDTH * 0.9,
924 force_h => $::HEIGHT * 0.4, 1048 force_h => $::HEIGHT * 0.7,
925 child => $vbox, 1049 child => $vbox,
926 has_close_button => 1, 1050 has_close_button => 1,
927 table => $table, 1051 table => $table,
928 on_visibility_change => sub { 1052 on_visibility_change => sub {
929 update_metaserver ($_[0]) if $_[1]; 1053 update_metaserver ($_[0]) if $_[1];
935} 1059}
936 1060
937sub server_setup { 1061sub server_setup {
938 my $vbox = new CFPlus::UI::VBox; 1062 my $vbox = new CFPlus::UI::VBox;
939 1063
1064 $vbox->add (new CFPlus::UI::FancyFrame
1065 label => "Connection Settings",
940 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 1066 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1067 );
941 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1068 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
942 1069
943 { 1070 {
944 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1071 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
945 1072
1002 . "so only set it if you really need to prefetch images. " 1129 . "so only set it if you really need to prefetch images. "
1003 . "This option can be set and unset any time.", 1130 . "This option can be set and unset any time.",
1004 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1131 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1005 ); 1132 );
1006 1133
1007 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1134 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1008 $table->add (1, 9, new CFPlus::UI::Entry 1135 $table->add (1, 9, new CFPlus::UI::Entry
1136 text => $CFG->{output_rate},
1137 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1138 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1139 . "default will be used, which is usually around 100kb/s.",
1140 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1141 );
1142
1143 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1144 $table->add (1, 10, new CFPlus::UI::Entry
1009 text => $CFG->{output_count}, 1145 text => $CFG->{output_count},
1010 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1146 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1011 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1147 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1012 ); 1148 );
1013 1149
1014 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1150 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1015 $table->add (1, 10, new CFPlus::UI::Entry 1151 $table->add (1, 11, new CFPlus::UI::Entry
1016 text => $CFG->{output_sync}, 1152 text => $CFG->{output_sync},
1017 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1153 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1018 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1154 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1019 ); 1155 );
1020 1156
1021 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1157 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1022 expand => 1, 1158 expand => 1,
1023 align => 0, 1159 align => 0,
1024 text => "Login", 1160 text => "Login",
1025 on_activate => sub { 1161 on_activate => sub {
1026 $CONN ? stop_game 1162 $CONN ? stop_game
1027 : start_game; 1163 : start_game;
1028 0 1164 0
1029 }, 1165 },
1030 ); 1166 );
1031 1167
1168 $vbox->add (new CFPlus::UI::FancyFrame
1169 label => "Server Info",
1170 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1171 );
1172
1173 $vbox
1174}
1175
1176sub client_setup {
1177 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1178
1179 my $row = 0;
1180
1032 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1181 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1033 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1182 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1034 text => $CFG->{say_command}, 1183 text => $CFG->{say_command},
1035 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. " 1184 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. "
1036 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1185 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1037 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1186 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1038 on_changed => sub { 1187 on_changed => sub {
1039 my ($self, $value) = @_; 1188 my ($self, $value) = @_;
1040 $CFG->{say_command} = $value; 1189 $CFG->{say_command} = $value;
1041 0 1190 0
1042 } 1191 }
1043 ); 1192 );
1044 1193
1045 $vbox->add (new CFPlus::UI::Label 1194 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1046 text => "Server Info", 1195 $table->add (1, $row++, new CFPlus::UI::CheckBox
1047 fontsize => 1.2, 1196 state => $CFG->{show_tips},
1048 padding_y => 8, 1197 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1049 fg => [1, 1, 0, 1], 1198 on_changed => sub {
1199 my ($self, $value) = @_;
1200 $CFG->{show_tips} = $value;
1201 0
1202 }
1050 ); 1203 );
1051 1204
1052 $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0); 1205 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1206 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1207 text => $CFG->{logview_max_par},
1208 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1209 . "sends more messages than this number, older messages get removed to save memory and "
1210 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1211 on_changed => sub {
1212 my ($self, $value) = @_;
1213 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1214 0
1215 },
1216 );
1053 1217
1054 $vbox 1218 $table
1055} 1219}
1056 1220
1057sub message_window { 1221sub message_window {
1058 my $window = new CFPlus::UI::FancyFrame 1222 my $window = new CFPlus::UI::Toplevel
1059 name => "message_window", 1223 name => "message_window",
1060 title => "Messages", 1224 title => "Messages",
1061 border_bg => [1, 1, 1, 1], 1225 border_bg => [1, 1, 1, 1],
1062 x => "max", 1226 x => "max",
1063 y => 0, 1227 y => 0,
1115 }; 1279 };
1116 1280
1117 $window 1281 $window
1118} 1282}
1119 1283
1120sub open_string_query {
1121 my $cb = $_[1];
1122 my $dialog = new CFPlus::UI::FancyFrame
1123 x => "center",
1124 y => "center",
1125 z => 50,
1126 force_w => $WIDTH * 4/5,
1127 title => $_[0];
1128
1129 $dialog->add (
1130 my $e = new CFPlus::UI::Entry
1131 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1132 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1133 );
1134
1135 $e->grab_focus;
1136 $dialog->show;
1137}
1138
1139sub open_quit_dialog {
1140 unless ($QUIT_DIALOG) {
1141 $QUIT_DIALOG = new CFPlus::UI::FancyFrame
1142 x => "center",
1143 y => "center",
1144 z => 50,
1145 title => "Really Quit?",
1146 on_key_down => sub {
1147 my ($dialog, $ev) = @_;
1148 $ev->{sym} == 27 and $dialog->hide;
1149 }
1150 ;
1151
1152 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1153
1154 $vb->add (new CFPlus::UI::Label
1155 text => "You should find a savebed and apply it first!",
1156 max_w => $WIDTH * 0.25,
1157 ellipsize => 0,
1158 );
1159 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1160 $hb->add (new CFPlus::UI::Button
1161 text => "Ok",
1162 expand => 1,
1163 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1164 );
1165 $hb->add (new CFPlus::UI::Button
1166 text => "Quit anyway",
1167 expand => 1,
1168 on_activate => sub { exit },
1169 );
1170 }
1171
1172 $QUIT_DIALOG->show;
1173 $QUIT_DIALOG->grab_focus;
1174}
1175
1176sub autopickup_setup { 1284sub autopickup_setup {
1285 my $r = new CFPlus::UI::ScrolledWindow (
1286 expand => 1,
1287 scroll_y => 1
1288 );
1177 my $table = new CFPlus::UI::Table; 1289 $r->add (my $table = new CFPlus::UI::Table
1290 row_expand => [0],
1291 col_expand => [0, 1, 0, 1],
1292 );
1178 1293
1179 for ( 1294 for (
1180 ["General", 0, 0, 1295 ["General", 0, 0,
1181 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1296 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1182 ["Inhibit autopickup" => PICKUP_INHIBIT], 1297 ["Inhibit autopickup" => PICKUP_INHIBIT],
1196 ["Boots" => PICKUP_BOOTS], 1311 ["Boots" => PICKUP_BOOTS],
1197 ["Gloves" => PICKUP_GLOVES], 1312 ["Gloves" => PICKUP_GLOVES],
1198 ["Cloaks" => PICKUP_CLOAK], 1313 ["Cloaks" => PICKUP_CLOAK],
1199 ], 1314 ],
1200 1315
1201 ["Readables", 2, 2, 1316 ["Readables", 2, 0,
1202 ["Spellbooks" => PICKUP_SPELLBOOK], 1317 ["Spellbooks" => PICKUP_SPELLBOOK],
1203 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1318 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1204 ["Normal Books/Scrolls" => PICKUP_READABLES], 1319 ["Normal Books/Scrolls" => PICKUP_READABLES],
1205 ], 1320 ],
1206 ["Misc", 2, 7, 1321 ["Misc", 2, 5,
1207 ["Food" => PICKUP_FOOD], 1322 ["Food" => PICKUP_FOOD],
1208 ["Drinks" => PICKUP_DRINK], 1323 ["Drinks" => PICKUP_DRINK],
1209 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1324 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1210 ["Keys" => PICKUP_KEY], 1325 ["Keys" => PICKUP_KEY],
1211 ["Magical Items" => PICKUP_MAGICAL], 1326 ["Magical Items" => PICKUP_MAGICAL],
1212 ["Potions" => PICKUP_POTION], 1327 ["Potions" => PICKUP_POTION],
1213 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1328 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1214 ["Ignore cursed" => PICKUP_NOT_CURSED], 1329 ["Ignore cursed" => PICKUP_NOT_CURSED],
1215 ["Jewelery" => PICKUP_JEWELS], 1330 ["Jewelery" => PICKUP_JEWELS],
1331 ["Flesh" => PICKUP_FLESH],
1216 ], 1332 ],
1217 ["Weight/Value ratio", 2, 17] 1333 ["Weight/Value ratio", 2, 17]
1218 ) 1334 )
1219 { 1335 {
1220 my ($title, $x, $y, @bits) = @$_; 1336 my ($title, $x, $y, @bits) = @$_;
1265 $::CONN->send_command ("pickup $::CFG->{pickup}") 1381 $::CONN->send_command ("pickup $::CFG->{pickup}")
1266 if defined $::CONN; 1382 if defined $::CONN;
1267 0 1383 0
1268 }); 1384 });
1269 1385
1270 $table 1386 $r
1271} 1387}
1272 1388
1273my %SORT_ORDER = ( 1389my %SORT_ORDER = (
1274 type => undef, 1390 type => undef,
1275 mtime => sub { sort { 1391 mtime => sub {
1392 my $NOW = time;
1393 sort {
1394 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1395 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1396
1276 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1397 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1277 or $b->{mtime} <=> $a->{mtime} 1398 or $btime <=> $atime
1278 or $a->{type} <=> $b->{type} 1399 or $a->{type} <=> $b->{type}
1400 } @_
1279 } @_ }, 1401 },
1280 weight => sub { sort { 1402 weight => sub { sort {
1281 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1403 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1282 or $a->{type} <=> $b->{type} 1404 or $a->{type} <=> $b->{type}
1283 } @_ }, 1405 } @_ },
1284); 1406);
1309 #TODO# update to weigh/maxweight 1431 #TODO# update to weigh/maxweight
1310 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1432 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1311 1433
1312 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1434 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1313 $sw1->add ($INV = new CFPlus::UI::Inventory); 1435 $sw1->add ($INV = new CFPlus::UI::Inventory);
1436 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1314 1437
1315 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1438 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1316 1439
1317 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1440 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1318 1441
1335 $PL_WINDOW->show; 1458 $PL_WINDOW->show;
1336 } 1459 }
1337} 1460}
1338 1461
1339sub player_window { 1462sub player_window {
1340 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1463 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1341 x => "center", 1464 x => "center",
1342 y => "center", 1465 y => "center",
1343 force_w => $WIDTH * 9/10, 1466 force_w => $WIDTH * 9/10,
1344 force_h => $HEIGHT * 9/10, 1467 force_h => $HEIGHT * 9/10,
1345 title => "Player", 1468 title => "Player",
1347 has_close_button => 1 1470 has_close_button => 1
1348 ; 1471 ;
1349 1472
1350 my $ntb = 1473 my $ntb =
1351 $PL_NOTEBOOK = 1474 $PL_NOTEBOOK =
1352 new CFPlus::UI::Notebook expand => 1, debug => 1; 1475 new CFPlus::UI::Notebook expand => 1;
1353 1476
1354 $ntb->add ( 1477 $ntb->add (
1355 "Statistics (F2)" => $STATS_PAGE = stats_window, 1478 "Statistics (F2)" => $STATS_PAGE = stats_window,
1356 "Shows statistics, where all your Stats and Resistances are shown." 1479 "Shows statistics, where all your Stats and Resistances are shown."
1357 ); 1480 );
1358 $ntb->add ( 1481 $ntb->add (
1359 "Skills (F3)" => $SKILL_PAGE = skill_window, 1482 "Skills (F3)" => $SKILL_PAGE = skill_window,
1360 "Shows all your Skills." 1483 "Shows all your Skills."
1361 ); 1484 );
1362 1485
1363 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1486 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1364 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1487 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1365 $ntb->add ( 1488 $ntb->add (
1366 "Spellbook (F4)" => $spellsw, 1489 "Spellbook (F4)" => $spellsw,
1367 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1490 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1368 ); 1491 );
1369 $ntb->add ( 1492 $ntb->add (
1370 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1493 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1371 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1494 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1372 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1495 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1373 ); 1496 );
1497 $ntb->add (Pickup => autopickup_setup,
1498 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1374 1499
1375 $ntb->set_current_page ($INVENTORY_PAGE); 1500 $ntb->set_current_page ($INVENTORY_PAGE);
1376 1501
1377 $plwin->add ($ntb); 1502 $plwin->add ($ntb);
1378 $plwin 1503 $plwin
1379} 1504}
1380 1505
1381sub update_bindings {
1382 $BIND_UPD_CB->() if $BIND_UPD_CB;
1383}
1384
1385sub keyboard_setup { 1506sub keyboard_setup {
1386 my $binding_list = new CFPlus::UI::VBox; 1507 CFPlus::Macro::keyboard_setup
1387
1388 my $refresh;
1389 $refresh = $BIND_UPD_CB = sub {
1390 $binding_list->clear ();
1391
1392 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1393 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1394 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1395 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1396
1397 my $lbl = join "; ", @$cmds;
1398 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1399 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1400 $hb->add (new CFPlus::UI::Button
1401 text => "delete",
1402 tooltip => "Deletes the binding",
1403 on_activate => sub {
1404 $binding_list->remove ($hb);
1405 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1406 0
1407 });
1408
1409 $hb->add (new CFPlus::UI::Button
1410 text => "edit",
1411 tooltip => "Edits the binding",
1412 on_activate => sub {
1413 $::BIND_EDITOR->set_binding (
1414 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1415 sub {
1416 my ($nmod, $nsym, $ncmds) = @_;
1417 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1418 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1419 $refresh->();
1420 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1421 $SETUP_DIALOG->show;
1422 },
1423 sub {
1424 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1425 $SETUP_DIALOG->show;
1426 });
1427 $::BIND_EDITOR->show;
1428 $SETUP_DIALOG->hide;
1429 0
1430 });
1431
1432 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1433 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1434 }
1435 }
1436 };
1437
1438 my $vb = new CFPlus::UI::VBox;
1439 $vb->add (my $hb = new CFPlus::UI::HBox);
1440 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1441 $hb->add (new CFPlus::UI::CheckBox
1442 expand => 1,
1443 state => $CFG->{shift_fire_stop},
1444 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1445 on_changed => sub {
1446 my ($cbox, $value) = @_;
1447 $CFG->{shift_fire_stop} = $value;
1448 0
1449 });
1450
1451 $vb->add ($binding_list);
1452 $vb->add (my $hb = new CFPlus::UI::HBox);
1453
1454 $hb->add (new CFPlus::UI::Button
1455 text => "record new",
1456 expand => 1,
1457 tooltip => "This button opens the binding editor with an empty binding.",
1458 on_activate => sub {
1459 $::BIND_EDITOR->set_binding (undef, undef, [],
1460 sub {
1461 my ($mod, $sym, $cmds) = @_;
1462 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1463 $refresh->();
1464 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1465 $SETUP_DIALOG->show;
1466 },
1467 sub {
1468 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1469 $SETUP_DIALOG->show;
1470 },
1471 );
1472 $SETUP_DIALOG->hide;
1473 $::BIND_EDITOR->show;
1474 0
1475 },
1476 );
1477
1478 $hb->add (new CFPlus::UI::Button
1479 text => "close",
1480 tooltip => "Closes the binding window",
1481 expand => 1,
1482 on_activate => sub {
1483 $SETUP_DIALOG->hide;
1484 0
1485 }
1486 );
1487
1488 $refresh->();
1489
1490 $vb
1491} 1508}
1492 1509
1493sub help_window { 1510sub help_window {
1494 my $win = new CFPlus::UI::FancyFrame 1511 my $win = new CFPlus::UI::Toplevel
1495 x => 'center', 1512 x => 'center',
1496 y => 'center', 1513 y => 'center',
1497 z => 2, 1514 z => 4,
1498 name => 'doc_browser', 1515 name => 'doc_browser',
1499 force_w => int $WIDTH * 7/8, 1516 force_w => int $WIDTH * 7/8,
1500 force_h => int $HEIGHT * 7/8, 1517 force_h => int $HEIGHT * 7/8,
1501 title => "Help Browser", 1518 title => "Help Browser",
1502 has_close_button => 1; 1519 has_close_button => 1;
1503 1520
1504 $win->add (my $vbox = new CFPlus::UI::VBox); 1521 $win->add (my $vbox = new CFPlus::UI::VBox);
1505 1522
1523 $vbox->add (new CFPlus::UI::FancyFrame
1524 label => "Navigation",
1506 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1525 child => (my $buttons = new CFPlus::UI::HBox),
1526 );
1507 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1527 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1508 expand => 1, fontsize => 0.8, padding_x => 4); 1528 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1509 1529
1510 my @history; 1530 my @history;
1511 my @future; 1531 my @future;
1512 my $node; 1532 my $curnode;
1513 1533
1514 my $load_node; $load_node = sub { 1534 my $load_node; $load_node = sub {
1515 my ($node) = @_; 1535 my ($node, $para) = @_;
1516 1536
1517 $buttons->clear; 1537 $buttons->clear;
1518 1538
1539 $buttons->add (new CFPlus::UI::Button
1540 text => "⇤",
1541 tooltip => "back to the starting page",
1542 on_activate => sub {
1543 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1544 unshift @future, @history;
1545 @history = ();
1546 $load_node->(@{shift @future});
1547 },
1548 );
1549
1519 if (@history) { 1550 if (@history) {
1520 $buttons->add (new CFPlus::UI::Button label => "&lt;", on_activate => sub { 1551 $buttons->add (new CFPlus::UI::Button
1521 unshift @future, $node if $node; 1552 text => "⋘",
1553 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1554 on_activate => sub {
1555 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1522 $node = pop @history; 1556 $load_node->(@{pop @history});
1523 1557 },
1524 }); 1558 );
1525 } 1559 }
1560
1561 if (@future) {
1562 $buttons->add (new CFPlus::UI::Button
1563 text => "⋙",
1564 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1565 on_activate => sub {
1566 push @history, [$curnode, $viewer->current_paragraph];
1567 $load_node->(@{shift @future});
1568 },
1569 );
1570 }
1571
1572 $buttons->add (new CFPlus::UI::Label text => " ");
1573
1574 my @path = CFPlus::Pod::full_path_of $node;
1575 pop @path; # drop current node
1576
1577 for my $node (@path) {
1578 $buttons->add (new CFPlus::UI::Button
1579 text => $node->{kw}[0],
1580 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1581 on_activate => sub {
1582 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1583 $load_node->($node);
1584 },
1585 );
1586 $buttons->add (new CFPlus::UI::Label text => "/");
1587 }
1588
1589 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1590
1591 $curnode = $node;
1592
1526 $viewer->clear; 1593 $viewer->clear;
1527 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $node); 1594 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1528 $viewer->set_offset (0); 1595 $viewer->scroll_to ($para);
1529 }; 1596 };
1530 1597
1531 $load_node->(CFPlus::Pod::find pod => "mainpage"); 1598 $load_node->(CFPlus::Pod::find pod => "mainpage");
1532 1599
1533 $CFPlus::Pod::on_link = sub { 1600 $CFPlus::Pod::goto_document = sub {
1534 my (@path) = @_; 1601 my (@path) = @_;
1535 1602
1536 push @history, $node if $node; 1603 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1537 @future = ();
1538 1604
1539 $load_node->(CFPlus::Pod::find @path); 1605 $load_node->((CFPlus::Pod::find @path)[0]);
1540 $win->show; 1606 $win->show;
1541 }; 1607 };
1542 1608
1543 $win 1609 $win
1610}
1611
1612sub open_string_query {
1613 my ($title, $cb, $txt, $tooltip) = @_;
1614 my $dialog = new CFPlus::UI::Toplevel
1615 x => "center",
1616 y => "center",
1617 z => 50,
1618 force_w => $WIDTH * 4/5,
1619 title => $title;
1620
1621 $dialog->add (
1622 my $e = new CFPlus::UI::Entry
1623 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1624 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1625 tooltip => $tooltip
1626 );
1627
1628 $e->grab_focus;
1629 $e->set_text ($txt) if $txt;
1630 $dialog->show;
1631}
1632
1633sub open_quit_dialog {
1634 unless ($QUIT_DIALOG) {
1635 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1636 x => "center",
1637 y => "center",
1638 z => 50,
1639 title => "Really Quit?",
1640 on_key_down => sub {
1641 my ($dialog, $ev) = @_;
1642 $ev->{sym} == 27 and $dialog->hide;
1643 }
1644 ;
1645
1646 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1647
1648 $vb->add (new CFPlus::UI::Label
1649 text => "You should find a savebed and apply it first!",
1650 max_w => $WIDTH * 0.25,
1651 ellipsize => 0,
1652 );
1653 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1654 $hb->add (new CFPlus::UI::Button
1655 text => "Ok",
1656 expand => 1,
1657 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1658 );
1659 $hb->add (new CFPlus::UI::Button
1660 text => "Quit anyway",
1661 expand => 1,
1662 on_activate => sub { exit },
1663 );
1664 }
1665
1666 $QUIT_DIALOG->show;
1667 $QUIT_DIALOG->grab_focus;
1668}
1669
1670sub show_tip_of_the_day {
1671 # find all tips
1672 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1673
1674 CFPlus::DB::get state => "tip_of_the_day", sub {
1675 my ($todindex) = @_;
1676 $todindex = 0 if $todindex >= @tod;
1677 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1678
1679 # create dialog
1680 my $dialog;
1681
1682 my $close = sub {
1683 $dialog->destroy;
1684 };
1685
1686 $dialog = new CFPlus::UI::Toplevel
1687 x => "center",
1688 y => "center",
1689 z => 3,
1690 name => 'tip_of_the_day',
1691 force_w => int $WIDTH * 4/9,
1692 force_h => int $WIDTH * 2/9,
1693 title => "Tip of the day #" . (1 + $todindex),
1694 child => my $vbox = new CFPlus::UI::VBox,
1695 has_close_button => 1,
1696 on_delete => $close,
1697 ;
1698
1699 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1700 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1701 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1702
1703 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1704
1705 $table->add (0, 0, new CFPlus::UI::Button
1706 text => "Close",
1707 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>.",
1708 on_activate => $close,
1709 );
1710
1711 $table->add (2, 0, new CFPlus::UI::Button
1712 text => "Next",
1713 tooltip => "Show the next <b>Tip of the day</b>.",
1714 on_activate => sub {
1715 $close->();
1716 &show_tip_of_the_day;
1717 },
1718 );
1719
1720 $dialog->show;
1721 };
1544} 1722}
1545 1723
1546sub sdl_init { 1724sub sdl_init {
1547 CFPlus::SDL_Init 1725 CFPlus::SDL_Init
1548 and die "SDL::Init failed!\n"; 1726 and die "SDL::Init failed!\n";
1583 z => 100, 1761 z => 100,
1584 force_x => "max", 1762 force_x => "max",
1585 force_y => 0; 1763 force_y => 0;
1586 $DEBUG_STATUS->show; 1764 $DEBUG_STATUS->show;
1587 1765
1588 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1589
1590 $STATUSBOX = new CFPlus::UI::Statusbox; 1766 $STATUSBOX = new CFPlus::UI::Statusbox;
1591 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1767 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1592 1768
1593 (new CFPlus::UI::Frame 1769 (new CFPlus::UI::Frame
1594 bg => [0, 0, 0, 0.4], 1770 bg => [0, 0, 0, 0.4],
1595 force_x => 0, 1771 force_x => 0,
1596 force_y => "max", 1772 force_y => "max",
1597 child => $STATUSBOX, 1773 child => $STATUSBOX,
1598 )->show; 1774 )->show;
1599 1775
1600 CFPlus::UI::FancyFrame->new ( 1776 CFPlus::UI::Toplevel->new (
1601 title => "Map", 1777 title => "Map",
1602 name => "mapmap", 1778 name => "mapmap",
1603 x => 0, 1779 x => 0,
1604 y => $FONTSIZE + 8, 1780 y => $FONTSIZE + 8,
1605 border_bg => [1, 1, 1, 192/255], 1781 border_bg => [1, 1, 1, 192/255],
1630 font => $FONT_FIXED, 1806 font => $FONT_FIXED,
1631 fontsize => $::CFG->{log_fontsize}, 1807 fontsize => $::CFG->{log_fontsize},
1632 indent => -4, 1808 indent => -4,
1633 can_hover => 1, 1809 can_hover => 1,
1634 can_events => 1, 1810 can_events => 1,
1811 max_par => $CFG->{logview_max_par},
1635 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1812 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1636 ; 1813 ;
1637 1814
1638 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1815 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1639 title => "Setup", 1816 title => "Setup",
1640 name => "setup_dialog", 1817 name => "setup_dialog",
1641 x => 'center', 1818 x => 'center',
1642 y => 'center', 1819 y => 'center',
1643 z => 2, 1820 z => 2,
1651 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1828 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1652 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1829 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1653 1830
1654 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1831 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1655 "Configure the server to play on, your username, password and other server-related options."); 1832 "Configure the server to play on, your username, password and other server-related options.");
1656 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1833 $SETUP_NOTEBOOK->add (Client => client_setup,
1657 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1834 "Configure various client-specific settings.");
1658 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1835 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1659 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1836 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1660 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1837 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1661 "Configure the use of audio, sound effects and background music."); 1838 "Configure the use of audio, sound effects and background music.");
1662 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1839 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1694 ); 1871 );
1695 1872
1696 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1873 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1697 tooltip => "View Documentation"); 1874 tooltip => "View Documentation");
1698 1875
1876
1699 $BUTTONBAR->add (new CFPlus::UI::Button 1877 $BUTTONBAR->add (new CFPlus::UI::Button
1700 text => "Quit", 1878 text => "Quit",
1701 tooltip => "Terminates the program", 1879 tooltip => "Terminates the program",
1702 on_activate => sub { 1880 on_activate => sub {
1703 if ($CONN) { 1881 if ($CONN) {
1714 } 1892 }
1715 1893
1716 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1894 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1717} 1895}
1718 1896
1897sub setup_build_button {
1898 my ($enabled) = @_;
1899 if ($enabled) {
1900 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1901 $BUILD_BUTTON ||= new CFPlus::UI::Button
1902 text => "Build",
1903 tooltip => "Opens the ingame builder",
1904 on_activate => sub {
1905 if ($CONN) {
1906 $CONN->send_ext_req (builder_player_items => sub {
1907 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1908 });
1909 }
1910 0
1911 };
1912 $BUTTONBAR->add ($BUILD_BUTTON);
1913 } else {
1914 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1915 }
1916}
1917
1918sub open_ingame_editor {
1919 my ($msg) = @_;
1920
1921 my $win = new CFPlus::UI::Toplevel
1922 x => 0,
1923 y => 'center',
1924 z => 4,
1925 name => 'builder_window',
1926 force_w => int $WIDTH * 1/4,
1927 force_h => int $HEIGHT * 3/4,
1928 title => "In game builder",
1929 has_close_button => 1;
1930
1931 my $r = new CFPlus::UI::ScrolledWindow (
1932 expand => 1,
1933 scroll_y => 1
1934 );
1935 $r->add (my $vb = new CFPlus::UI::VBox);
1936 $win->add ($r);
1937
1938
1939 $vb->add (
1940 new CFPlus::UI::Button
1941 text => "Disable build mode",
1942 on_activate => sub { $::IN_BUILD_MODE = undef }
1943 );
1944 $vb->add (
1945 new CFPlus::UI::Button
1946 text => "ERASE",
1947 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1948 );
1949
1950 for my $itemarchname (
1951 sort {
1952 $msg->{items}->{$a}->{build_arch_name}
1953 cmp $msg->{items}->{$b}->{build_arch_name}
1954 } keys %{$msg->{items}}
1955 ) {
1956 my $info = $msg->{items}->{$itemarchname};
1957 $vb->add (
1958 new CFPlus::UI::Button text => $info->{build_arch_name},
1959 on_activate => sub {
1960 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1961
1962 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1963 build_mode_query_arch_info ();
1964 }
1965 }
1966 );
1967 }
1968
1969 $win->show;
1970}
1971
1972sub build_mode_query_arch_info {
1973 my ($iteminfo) = $::IN_BUILD_MODE;
1974 my $itemarchname = $iteminfo->{item};
1975 my $info = $iteminfo->{info};
1976
1977 my $dialog = new CFPlus::UI::Toplevel
1978 x => "center",
1979 y => "center",
1980 z => 50,
1981 force_w => int $WIDTH * 1/2,
1982 title => "Enter information for placement of '$itemarchname'",
1983 has_close_button => 1;
1984
1985 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1986
1987 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1988 my $row = 0;
1989 if ($info->{has_name}) {
1990 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1991 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1992 }
1993 if ($info->{has_text}) {
1994 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1995 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1996 }
1997 if ($info->{has_connection}) {
1998 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1999 $table->add (1, $row++,
2000 new CFPlus::UI::Entry
2001 expand => 1,
2002 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
2003 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
2004 );
2005 }
2006
2007 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
2008 $hb->add (new CFPlus::UI::Button
2009 text => "Close",
2010 expand => 1,
2011 on_activate => sub { $dialog->hide; 0 },
2012 );
2013 $dialog->show;
2014}
2015
1719sub video_shutdown { 2016sub video_shutdown {
1720 CFPlus::OpenGL::shutdown; 2017 CFPlus::OpenGL::shutdown;
1721 2018
1722 undef $SDL_ACTIVE; 2019 undef $SDL_ACTIVE;
1723} 2020}
1724 2021
1725my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1726my $bgmusic;#TODO#hack#d#
1727
1728sub audio_channel_finished { 2022sub audio_channel_finished {
1729 my ($channel) = @_; 2023 my ($channel) = @_;
1730 2024
1731 #warn "channel $channel finished\n";#d# 2025 #warn "channel $channel finished\n";#d#
1732} 2026}
1733 2027
2028sub audio_music_set {
2029 my ($songs) = @_;
2030
2031 my @want =
2032 grep $_,
2033 map $CONN->{music_meta}{$_},
2034 @$songs;
2035
2036 if (@want) {
2037 @MUSIC_WANT = @want;
2038 &audio_music_changed ();
2039 }
2040}
2041
2042sub audio_music_start {
2043 my $path = $MUSIC_PLAYING->{path}
2044 or return;
2045
2046 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2047 # music might have changed...
2048 $path eq $MUSIC_PLAYING->{path}
2049 or return &audio_music_start ();
2050
2051 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2052
2053 my $NOW = time;
2054
2055 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2056 my $pos = $MUSIC_PLAYING->{stop_pos};
2057 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2058 $MUSIC_START = time - $pos;
2059 } else {
2060 $MUSIC_PLAYER->play (0);
2061 $MUSIC_START = time;
2062 }
2063
2064 delete $MUSIC_PLAYING->{stop_time};
2065 delete $MUSIC_PLAYING->{stop_pos};
2066 }
2067}
2068
2069sub audio_music_changed {
2070 return unless $CFG->{bgm_enable};
2071
2072 # default MUSIC_WANT == MUSIC_DEFAULT
2073 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2074
2075 # if the currently playing song is acceptable, let it continue
2076 return if $MUSIC_PLAYING
2077 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2078
2079 my $NOW = time;
2080
2081 if ($MUSIC_PLAYING) {
2082 $MUSIC_PLAYING->{stop_time} = $NOW;
2083 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2084 CFPlus::MixMusic::fade_out 1000;
2085 } else {
2086 # sort by stop time, oldest first
2087 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2088
2089 # if the most recently-played piece played very recently,
2090 # resume it, else choose the oldest piece for rotation.
2091 $MUSIC_PLAYING =
2092 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2093 ? $MUSIC_WANT[-1]
2094 : $MUSIC_WANT[0];
2095
2096 audio_music_start;
2097 }
2098}
2099
1734sub audio_music_finished { 2100sub audio_music_finished {
1735 return unless $CFG->{bgm_enable}; 2101 $MUSIC_PLAYING = undef;
2102 undef $MUSIC_PLAYER;
1736 2103
1737 # TODO: hack, do play loop and mood music 2104 audio_music_changed;
1738 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1739 $bgmusic->play (0);
1740
1741 push @bgmusic, shift @bgmusic;
1742} 2105}
1743 2106
1744sub audio_init { 2107sub audio_init {
1745 if ($CFG->{audio_enable}) { 2108 if ($CFG->{audio_enable}) {
1746 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2109 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1754 CFPlus::Mix_AllocateChannels 8; 2117 CFPlus::Mix_AllocateChannels 8;
1755 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 2118 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1756 2119
1757 audio_music_finished; 2120 audio_music_finished;
1758 2121
2122 local $_;
1759 while (<$fh>) { 2123 while (<$fh>) {
1760 next if /^\s*#/; 2124 next if /^\s*#/;
1761 next if /^\s*$/; 2125 next if /^\s*$/;
1762 2126
1763 my ($file, $volume, $event) = split /\s+/, $_, 3; 2127 my ($file, $volume, $event) = split /\s+/, $_, 3;
1805 2169
1806my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2170my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1807 $NOW = time; 2171 $NOW = time;
1808 2172
1809 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2173 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1810 for CFPlus::SDL_PollEvent; 2174 for CFPlus::poll_events;
1811 2175
1812 if (%animate_object) { 2176 if (%animate_object) {
1813 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2177 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1814 $WANT_REFRESH++; 2178 $WANT_REFRESH++;
1815 } 2179 }
1840 if $CONN; 2204 if $CONN;
1841}); 2205});
1842 2206
1843%SDL_CB = ( 2207%SDL_CB = (
1844 CFPlus::SDL_QUIT => sub { 2208 CFPlus::SDL_QUIT => sub {
1845 Event::unloop -1; 2209 exit;
1846 }, 2210 },
1847 CFPlus::SDL_VIDEORESIZE => sub { 2211 CFPlus::SDL_VIDEORESIZE => sub {
1848 }, 2212 },
1849 CFPlus::SDL_VIDEOEXPOSE => sub { 2213 CFPlus::SDL_VIDEOEXPOSE => sub {
1850 CFPlus::UI::full_refresh; 2214 CFPlus::UI::full_refresh;
1851 }, 2215 },
1852 CFPlus::SDL_ACTIVEEVENT => sub { 2216 CFPlus::SDL_ACTIVEEVENT => sub {
1853# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2217# not useful, as APPACTIVE include sonly iconified state, not unmapped
2218# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2219# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2220# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2221# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2222# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1854 }, 2223 },
1855 CFPlus::SDL_KEYDOWN => sub { 2224 CFPlus::SDL_KEYDOWN => sub {
1856 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2225 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1857 # alt-enter 2226 # alt-enter
1858 $FULLSCREEN_ENABLE->toggle; 2227 $FULLSCREEN_ENABLE->toggle;
1879 2248
1880$SIG{INT} = $SIG{TERM} = sub { exit }; 2249$SIG{INT} = $SIG{TERM} = sub { exit };
1881 2250
1882{ 2251{
1883 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2252 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2253 CFPlus::DB::Server::run;
2254
1884 CFPlus::UI::set_layout ($::CFG->{layout}); 2255 CFPlus::UI::set_layout ($::CFG->{layout});
1885 2256
1886 my %DEF_CFG = ( 2257 my %DEF_CFG = (
1887 sdl_mode => 0, 2258 sdl_mode => 0,
1888 width => 640, 2259 width => 640,
1889 height => 480, 2260 height => 480,
1890 fullscreen => 0, 2261 fullscreen => 0,
1891 fast => 0, 2262 fast => 0,
1892 map_scale => 1, 2263 map_scale => 1,
1893 fow_enable => 1, 2264 fow_enable => 1,
1894 fow_intensity => 0.45, 2265 fow_intensity => 0.45,
1895 fow_smooth => 0, 2266 fow_smooth => 0,
2267 map_smoothing => 1,
1896 gui_fontsize => 1, 2268 gui_fontsize => 1,
1897 log_fontsize => 0.7, 2269 log_fontsize => 0.7,
1898 gauge_fontsize => 1, 2270 gauge_fontsize => 1,
1899 gauge_size => 0.35, 2271 gauge_size => 0.35,
1900 stat_fontsize => 0.7, 2272 stat_fontsize => 0.7,
1901 mapsize => 100, 2273 mapsize => 100,
1902 say_command => 'say', 2274 say_command => 'chat',
1903 audio_enable => 1, 2275 audio_enable => 1,
1904 bgm_enable => 1, 2276 bgm_enable => 1,
1905 bgm_volume => 0.25, 2277 bgm_volume => 0.25,
1906 face_prefetch => 0, 2278 face_prefetch => 0,
1907 output_sync => 1, 2279 output_sync => 1,
1908 output_count => 1, 2280 output_count => 1,
2281 output_rate => "",
1909 pickup => 0, 2282 pickup => 0,
1910 inv_sort => "mtime", 2283 inv_sort => "mtime",
1911 default => "profile", # default profile 2284 default => "profile", # default profile
2285 show_tips => 1,
2286 logview_max_par => 1000,
1912 ); 2287 );
1913 2288
1914 while (my ($k, $v) = each %DEF_CFG) { 2289 while (my ($k, $v) = each %DEF_CFG) {
1915 $CFG->{$k} = $v unless exists $CFG->{$k}; 2290 $CFG->{$k} = $v unless exists $CFG->{$k};
1916 } 2291 }
1917 2292
1918 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2293 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2294 $PROFILE = $CFG->{profile}{default};
2295
2296 # convert old bindings (only default profile matters)
2297 if (my $bindings = delete $PROFILE->{bindings}) {
2298 while (my ($mod, $syms) = each %$bindings) {
2299 while (my ($sym, $cmds) = each %$syms) {
2300 push @{ $PROFILE->{macro} }, {
2301 accelkey => [$mod*1, $sym*1],
2302 action => $cmds,
2303 };
2304 }
2305 }
2306 }
1919 2307
1920 sdl_init; 2308 sdl_init;
1921 2309
1922 @SDL_MODES = reverse 2310 @SDL_MODES = reverse
1923 grep $_->[0] >= 640 && $_->[1] >= 480, 2311 grep $_->[0] >= 640 && $_->[1] >= 480,
1960# } 2348# }
1961# my $t2 = Time::HiRes::time; 2349# my $t2 = Time::HiRes::time;
1962# warn $t2-$t1; 2350# warn $t2-$t1;
1963# } 2351# }
1964 2352
2353 $startup_done->();
2354
1965 video_init; 2355 video_init;
1966 audio_init; 2356 audio_init;
1967} 2357}
2358
2359show_tip_of_the_day if $CFG->{show_tips};
1968 2360
1969Event::loop; 2361Event::loop;
1970#CFPlus::SDL_Quit; 2362#CFPlus::SDL_Quit;
1971#CFPlus::_exit 0; 2363#CFPlus::_exit 0;
1972 2364
2365END {
1973END { CFPlus::SDL_Quit } 2366 CFPlus::SDL_Quit;
2367 CFPlus::DB::Server::stop;
2368}
1974 2369
1975=head1 NAME 2370=head1 NAME
1976 2371
1977cfplus - A Crossfire+ and Crossfire game client 2372cfplus - A Crossfire+ and Crossfire game client
1978 2373

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines