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.177 by root, Thu Jul 19 15:43:14 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} = "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) { 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
… …
219 destroy_query_dialog $conn; 289 destroy_query_dialog $conn;
220 0 290 0
221 }, 291 },
222 ); 292 );
223 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 }
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 => 320 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 ; 321 ;
236 322
237 } elsif ($prompt =~ /roll new stats/) { 323 } elsif ($prompt =~ /roll new stats/) {
238 if (my $stat = delete $conn->{stat_change_with}) { 324 if (my $stat = delete $conn->{stat_change_with}) {
239 $conn->send ("reply $stat"); 325 $conn->send ("reply $stat");
240 destroy_query_dialog $conn; 326 destroy_query_dialog $conn;
241 return; 327 return;
242 } 328 }
243
244 $STATS_PAGE->show;
245 $MESSAGE_WINDOW->hide;
246 329
247 unshift @dialog, new CFPlus::UI::Label 330 unshift @dialog, new CFPlus::UI::Label
248 max_w => $::WIDTH * 0.4, 331 max_w => $::WIDTH * 0.4,
249 ellipsise => 0, 332 ellipsise => 0,
250 markup => "\nOr use your keyboard and the text entry below:\n"; 333 markup => "\nOr use your keyboard and the text entry below:\n";
… …
320 } 403 }
321 404
322 unshift @dialog, new CFPlus::UI::Label 405 unshift @dialog, new CFPlus::UI::Label
323 max_w => $::WIDTH * 0.4, 406 max_w => $::WIDTH * 0.4,
324 ellipsise => 0, 407 ellipsise => 0,
325 markup => 408 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 ; 409 ;
332 } 410 }
333 411
334 push @dialog, my $entry = new CFPlus::UI::Entry 412 push @dialog, my $entry = new CFPlus::UI::Entry
335 on_changed => sub { 413 on_changed => sub {
… …
366 $LOGIN_BUTTON->set_text ("Logout"); 444 $LOGIN_BUTTON->set_text ("Logout");
367 $SETUP_DIALOG->hide; 445 $SETUP_DIALOG->hide;
368 446
369 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 447 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
370 448
371 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 449 my ($host, $port) = split /:/, $PROFILE->{host};
372 450
373 $MAP = new CFPlus::Map $mapsize, $mapsize; 451 $MAP = new CFPlus::Map;
374 452
375 $CONN = eval { 453 $CONN = eval {
376 new CFPlus::Protocol 454 new CFPlus::Protocol
377 host => $host, 455 host => $host,
378 port => $port || 13327, 456 port => $port || 13327,
379 user => $CFG->{profile}{default}{user}, 457 user => $PROFILE->{user},
380 pass => $CFG->{profile}{default}{password}, 458 pass => $PROFILE->{password},
381 mapw => $mapsize, 459 mapw => $mapsize,
382 maph => $mapsize, 460 maph => $mapsize,
461
462 client => "cfplus $CFPlus::VERSION $] $^O",
383 463
384 map_widget => $MAPWIDGET, 464 map_widget => $MAPWIDGET,
385 logview => $LOGVIEW, 465 logview => $LOGVIEW,
386 statusbox => $STATUSBOX, 466 statusbox => $STATUSBOX,
387 map => $MAP, 467 map => $MAP,
388 mapmap => $MAPMAP, 468 mapmap => $MAPMAP,
389 query => \&server_query, 469 query => \&server_query,
390 470
471 setup_req => {
472 smoothing => $CFG->{map_smoothing}*1,
473 },
474
391 sound_play => sub { 475 sound_play => sub {
392 my ($x, $y, $soundnum, $type) = @_; 476 my ($x, $y, $soundnum, $type) = @_;
393 477
394 $SDL_MIXER 478 $SDL_MIXER
395 or return; 479 or return;
… …
414sub stop_game { 498sub stop_game {
415 $LOGIN_BUTTON->set_text ("Login"); 499 $LOGIN_BUTTON->set_text ("Login");
416 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 500 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
417 $SETUP_DIALOG->show; 501 $SETUP_DIALOG->show;
418 $PL_WINDOW->hide; 502 $PL_WINDOW->hide;
419 $SPELL_PAGE->clear_spells; 503 $SPELL_LIST->clear_spells;
504 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
505
506 &audio_music_set ([]);
420 507
421 return unless $CONN; 508 return unless $CONN;
422 509
423 status "connection closed"; 510 status "connection closed";
424 511
… …
432sub graphics_setup { 519sub graphics_setup {
433 my $vbox = new CFPlus::UI::VBox; 520 my $vbox = new CFPlus::UI::VBox;
434 521
435 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 522 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
436 523
524 my $row = 0;
525
526 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
527 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
528 can_events => 1,
529 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
530
531 my $vidmode_tooltip =
532 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
533 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
534
437 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 535 $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); 536 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
439 537
538 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
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]); 539 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"); 540 tooltip => $vidmode_tooltip);
541 $hbox->add (my $mode_label = new CFPlus::UI::Label
542 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
543 can_events => 1, tooltip => $vidmode_tooltip);
442 544
443 $mode_slider->connect (changed => sub { 545 $mode_slider->connect (changed => sub {
444 my ($self, $value) = @_; 546 my ($self, $value) = @_;
445 547
446 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 548 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
447 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 549 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
448 }); 550 });
449 $mode_slider->emit (changed => $mode_slider->{range}[0]); 551 $mode_slider->emit (changed => $mode_slider->{range}[0]);
450
451 my $row = 1;
452 552
453 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 553 $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 554 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
455 state => $CFG->{fullscreen}, 555 state => $CFG->{fullscreen},
456 tooltip => "Bring the client into fullscreen mode.", 556 tooltip => "Bring the client into fullscreen mode.",
… …
462 state => $CFG->{fast}, 562 state => $CFG->{fast},
463 tooltip => "Lower the visual quality considerably to speed up rendering.", 563 tooltip => "Lower the visual quality considerably to speed up rendering.",
464 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 564 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
465 ); 565 );
466 566
567 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
568 $table->add (1, $row++, new CFPlus::UI::Slider
569 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
570 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
571 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
572 );
573
574 $table->add (1, $row++, new CFPlus::UI::Button
575 expand => 1, align => 0, text => "Apply",
576 tooltip => "Apply the video settings above.",
577 on_activate => sub {
578 video_shutdown ();
579 video_init ();
580 0
581 }
582 );
583
467 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 584 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
468 $table->add (1, $row++, new CFPlus::UI::Slider 585 $table->add (1, $row++, new CFPlus::UI::Slider
469 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 586 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
470 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 587 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
471 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 588 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
472 ); 589 );
473 590
591 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
592 $table->add (1, $row++, new CFPlus::UI::CheckBox
593 state => $CFG->{map_smoothing},
594 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
595 . "This increases load on the graphics subsystem and works only with 2.x servers. "
596 . "Changes take effect at next connection only.",
597 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
598 );
599
474 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 600 $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 601 $table->add (1, $row++, new CFPlus::UI::CheckBox
476 state => $CFG->{fow_enable}, 602 state => $CFG->{fow_enable},
477 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 603 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
478 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 604 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
… …
481 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 607 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
482 $table->add (1, $row++, new CFPlus::UI::Slider 608 $table->add (1, $row++, new CFPlus::UI::Slider
483 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 609 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
484 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 610 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
485 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 611 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
486 );
487
488 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
489 $table->add (1, $row++, new CFPlus::UI::CheckBox
490 state => $CFG->{fow_smooth},
491 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
492 on_changed => sub {
493 my ($self, $value) = @_;
494 $CFG->{fow_smooth} = $value;
495 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
496 0
497 }
498 );
499
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 ); 612 );
506 613
507 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 614 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
508 $table->add (1, $row++, new CFPlus::UI::Slider 615 $table->add (1, $row++, new CFPlus::UI::Slider
509 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 616 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
… …
527 range => [$CFG->{gauge_size}, 0.2, 0.8], 634 range => [$CFG->{gauge_size}, 0.2, 0.8],
528 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 635 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
529 on_changed => sub { 636 on_changed => sub {
530 $CFG->{gauge_size} = $_[1]; 637 $CFG->{gauge_size} = $_[1];
531 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 638 $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 639 0
543 } 640 }
544 ); 641 );
545 642
546 $vbox 643 $vbox
… …
622 (new CFPlus::UI::Empty expand => 1), 719 (new CFPlus::UI::Empty expand => 1),
623 (my $hb = new CFPlus::UI::HBox), 720 (my $hb = new CFPlus::UI::HBox),
624 ], 721 ],
625 ); 722 );
626 723
627 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', 724 $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', 725 $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', 726 $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', 727 $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 728
636 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 729 $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, 730 $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 731
641 $GAUGES = { 732 $GAUGES = {
642 exp => $exp, win => $win, range => $rng, 733 exp => $exp, win => $win, range => $rng,
643 food => $fg, mana => $mg, hp => $hg, grace => $gg 734 food => $fg, mana => $mg, hp => $hg, grace => $gg
644 }; 735 };
… …
657 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 748 $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"); 749 $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 }); 750 $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"); 751 $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 }); 752 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
753 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
662 754
663 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 755 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
664
665 for my $x (0..2) {
666 for my $y (0 .. 2) {
667 $table->add ($x + 3, $y,
668 new CFPlus::UI::Entry
669 text => $default_smooth[$x * 3 + $y],
670 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
671 );
672 }
673 }
674
675 756
676 $table 757 $table
677} 758}
678 759
679sub stats_window { 760sub stats_window {
… …
681 expand => 1, 762 expand => 1,
682 scroll_y => 1 763 scroll_y => 1
683 ); 764 );
684 $r->add (my $vb = new CFPlus::UI::VBox); 765 $r->add (my $vb = new CFPlus::UI::VBox);
685 766
767 $vb->add (new CFPlus::UI::FancyFrame
768 label => "Player",
769 child => (my $pi = new CFPlus::UI::VBox),
770 );
771
686 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 772 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
687 can_hover => 1, can_events => 1, 773 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."); 774 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, 775 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
690 can_hover => 1, can_events => 1, 776 can_hover => 1, can_events => 1,
691 tooltip => "The map you are currently on (if supported by the server)."); 777 tooltip => "The map you are currently on (if supported by the server).");
692 778
693 $vb->add (my $hb0 = new CFPlus::UI::HBox); 779 $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, 780 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
695 can_hover => 1, can_events => 1, 781 can_hover => 1, can_events => 1,
696 tooltip => "The weight of the player including all inventory items."); 782 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, 783 $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, 784 can_hover => 1, can_events => 1,
699 tooltip => "The weight limit: you cannot carry more than this."); 785 tooltip => "The weight limit: you cannot carry more than this.");
700 786
787 $vb->add (new CFPlus::UI::FancyFrame
788 label => "Primary/Secondary Statistics",
701 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 789 child => (my $hb = new CFPlus::UI::HBox expand => 1),
790 );
702 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 791 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
703 792
704 my $color2 = [1, 1, 0]; 793 my $color2 = [1, 1, 0];
705 794
706 for ( 795 for (
… …
727 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 816 $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, 817 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
729 align => -1, text => $label, tooltip => "#stat_$label"); 818 align => -1, text => $label, tooltip => "#stat_$label");
730 } 819 }
731 820
821 $vb->add (new CFPlus::UI::FancyFrame
822 label => "Resistancies",
732 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 823 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
824 );
733 825
734 my $row = 0; 826 my $row = 0;
735 my $col = 0; 827 my $col = 0;
736 828
737 my %resist_names = ( 829 my %resist_names = (
… …
837 929
838 my $table = $METASERVER->{table}; 930 my $table = $METASERVER->{table};
839 $table->clear; 931 $table->clear;
840 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 932 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
841 933
842 my $buf; 934 my $ok = 0;
843 935
844 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 936 CFPlus::background {
937 my $ua = CFPlus::lwp_useragent;
845 938
846 unless ($fh) { 939 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
847 $label->set_text ("unable to contact metaserver: $!"); 940 } sub {
848 return; 941 my ($msg) = @_;
849 } 942 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; 943 $table->clear;
864 944
865 my @tip = ( 945 my @tip = (
866 "The current number of users logged in on the server.", 946 "The current number of users logged in on the server.",
867 "The hostname of the server.", 947 "The hostname of the server.",
… …
877 for 0 .. $#col; 957 for 0 .. $#col;
878 958
879 my @align = qw(1 0 1 1 -1); 959 my @align = qw(1 0 1 1 -1);
880 960
881 my $y = 0; 961 my $y = 0;
882 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 962 for my $m (@{ $msg->{servers} }) {
883 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 963 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
964 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
884 965
885 for ($desc) { 966 for ($desc) {
886 s/<br>/\n/gi; 967 s/<br>/\n/gi;
887 s/<li>/\n· /gi; 968 s/<li>/\n· /gi;
888 s/<.*?>//sgi; 969 s/<.*?>//sgi;
889 s/&/&amp;/g; 970 s/&amp;/&/g;
890 s/</&lt;/g; 971 s/&lt;/</g;
891 s/>/&gt;/g; 972 s/&gt;/>/g;
892 } 973 }
893 974
894 $uptime = sprintf "%dd %02d:%02d:%02d", 975 $uptime = sprintf "%dd %02d:%02d:%02d",
895 (int $m->[8] / 86400), 976 (int $uptime / 86400),
896 (int $m->[8] / 3600) % 24, 977 (int $uptime / 3600) % 24,
897 (int $m->[8] / 60) % 60, 978 (int $uptime / 60) % 60,
898 $m->[8] % 60; 979 $uptime % 60;
899 980
900 $m = [$users, $host, $uptime, $version, $desc]; 981 $m = [$users, $host, $uptime, $version, $desc];
901 982
902 $y++; 983 $y++;
903 984
… …
913 ), 994 ),
914 (new CFPlus::UI::Empty expand => 1), 995 (new CFPlus::UI::Empty expand => 1),
915 ]); 996 ]);
916 997
917 $table->add ($_, $y, new CFPlus::UI::Label 998 $table->add ($_, $y, new CFPlus::UI::Label
999 max_w => $::WIDTH * 0.4,
918 ellipsise => 0, 1000 ellipsise => 0,
919 align => $align[$_], 1001 align => $align[$_],
920 text => $m->[$_], 1002 text => $m->[$_],
921 tooltip => $tip[$_], 1003 tooltip => $tip[$_],
1004 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
922 can_hover => 1, 1005 can_hover => 1,
923 can_events => 1, 1006 can_events => 1,
924 fontsize => 0.8) 1007 fontsize => 0.8)
925 for 0 .. $#$m; 1008 for 0 .. $#$m;
926 } 1009 }
1010 } else {
1011 $ok or $label->set_text ("error while contacting metaserver");
927 } 1012 }
928 }); 1013 };
1014
929} 1015}
930 1016
931sub metaserver_dialog { 1017sub metaserver_dialog {
932 my $vbox = new CFPlus::UI::VBox; 1018 my $vbox = new CFPlus::UI::VBox;
933 my $table = new CFPlus::UI::Table; 1019 my $table = new CFPlus::UI::Table;
934 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 1020 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
935 1021
936 my $dialog = new CFPlus::UI::FancyFrame 1022 my $dialog = new CFPlus::UI::Toplevel
937 title => "Server List", 1023 title => "Server List",
938 name => 'metaserver_dialog', 1024 name => 'metaserver_dialog',
939 x => 'center', 1025 x => 'center',
940 y => 'center', 1026 y => 'center',
941 z => 3, 1027 z => 3,
1028 force_w => $::WIDTH * 0.9,
942 force_h => $::HEIGHT * 0.4, 1029 force_h => $::HEIGHT * 0.7,
943 child => $vbox, 1030 child => $vbox,
944 has_close_button => 1, 1031 has_close_button => 1,
945 table => $table, 1032 table => $table,
946 on_visibility_change => sub { 1033 on_visibility_change => sub {
947 update_metaserver ($_[0]) if $_[1]; 1034 update_metaserver ($_[0]) if $_[1];
… …
953} 1040}
954 1041
955sub server_setup { 1042sub server_setup {
956 my $vbox = new CFPlus::UI::VBox; 1043 my $vbox = new CFPlus::UI::VBox;
957 1044
1045 $vbox->add (new CFPlus::UI::FancyFrame
1046 label => "Connection Settings",
958 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 1047 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1048 );
959 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1049 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
960 1050
961 { 1051 {
962 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1052 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
963 1053
… …
1020 . "so only set it if you really need to prefetch images. " 1110 . "so only set it if you really need to prefetch images. "
1021 . "This option can be set and unset any time.", 1111 . "This option can be set and unset any time.",
1022 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1112 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1023 ); 1113 );
1024 1114
1025 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1115 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1026 $table->add (1, 9, new CFPlus::UI::Entry 1116 $table->add (1, 9, new CFPlus::UI::Entry
1117 text => $CFG->{output_rate},
1118 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1119 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1120 . "default will be used, which is usually around 100kb/s.",
1121 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1122 );
1123
1124 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1125 $table->add (1, 10, new CFPlus::UI::Entry
1027 text => $CFG->{output_count}, 1126 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.", 1127 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 }, 1128 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1030 ); 1129 );
1031 1130
1032 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1131 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1033 $table->add (1, 10, new CFPlus::UI::Entry 1132 $table->add (1, 11, new CFPlus::UI::Entry
1034 text => $CFG->{output_sync}, 1133 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.", 1134 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 }, 1135 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1037 ); 1136 );
1038 1137
1039 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1138 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1040 expand => 1, 1139 expand => 1,
1041 align => 0, 1140 align => 0,
1042 text => "Login", 1141 text => "Login",
1043 on_activate => sub { 1142 on_activate => sub {
1044 $CONN ? stop_game 1143 $CONN ? stop_game
1045 : start_game; 1144 : start_game;
1046 0 1145 0
1047 }, 1146 },
1048 ); 1147 );
1049 1148
1149 $vbox->add (new CFPlus::UI::FancyFrame
1150 label => "Server Info",
1151 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1152 );
1153
1154 $vbox
1155}
1156
1157sub client_setup {
1158 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1159
1160 my $row = 0;
1161
1050 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1162 $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 1163 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1052 text => $CFG->{say_command}, 1164 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. " 1165 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. " 1166 . "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.", 1167 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1056 on_changed => sub { 1168 on_changed => sub {
1057 my ($self, $value) = @_; 1169 my ($self, $value) = @_;
1058 $CFG->{say_command} = $value; 1170 $CFG->{say_command} = $value;
1059 0 1171 0
1060 } 1172 }
1061 ); 1173 );
1062 1174
1063 $vbox->add (new CFPlus::UI::Label 1175 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1064 text => "Server Info", 1176 $table->add (1, $row++, new CFPlus::UI::CheckBox
1065 fontsize => 1.2, 1177 state => $CFG->{show_tips},
1066 padding_y => 8, 1178 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1067 fg => [1, 1, 0, 1], 1179 on_changed => sub {
1180 my ($self, $value) = @_;
1181 $CFG->{show_tips} = $value;
1182 0
1183 }
1068 ); 1184 );
1069 1185
1070 $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0); 1186 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1187 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1188 text => $CFG->{logview_max_par},
1189 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1190 . "sends more messages than this number, older messages get removed to save memory and "
1191 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1192 on_changed => sub {
1193 my ($self, $value) = @_;
1194 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1195 0
1196 },
1197 );
1071 1198
1072 $vbox 1199 $table
1073} 1200}
1074 1201
1075sub message_window { 1202sub message_window {
1076 my $window = new CFPlus::UI::FancyFrame 1203 my $window = new CFPlus::UI::Toplevel
1077 name => "message_window", 1204 name => "message_window",
1078 title => "Messages", 1205 title => "Messages",
1079 border_bg => [1, 1, 1, 1], 1206 border_bg => [1, 1, 1, 1],
1080 x => "max", 1207 x => "max",
1081 y => 0, 1208 y => 0,
… …
1133 }; 1260 };
1134 1261
1135 $window 1262 $window
1136} 1263}
1137 1264
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}
1193
1194sub autopickup_setup { 1265sub autopickup_setup {
1266 my $r = new CFPlus::UI::ScrolledWindow (
1267 expand => 1,
1268 scroll_y => 1
1269 );
1195 my $table = new CFPlus::UI::Table; 1270 $r->add (my $table = new CFPlus::UI::Table
1271 row_expand => [0],
1272 col_expand => [0, 1, 0, 1],
1273 );
1196 1274
1197 for ( 1275 for (
1198 ["General", 0, 0, 1276 ["General", 0, 0,
1199 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1277 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1200 ["Inhibit autopickup" => PICKUP_INHIBIT], 1278 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1214 ["Boots" => PICKUP_BOOTS], 1292 ["Boots" => PICKUP_BOOTS],
1215 ["Gloves" => PICKUP_GLOVES], 1293 ["Gloves" => PICKUP_GLOVES],
1216 ["Cloaks" => PICKUP_CLOAK], 1294 ["Cloaks" => PICKUP_CLOAK],
1217 ], 1295 ],
1218 1296
1219 ["Readables", 2, 2, 1297 ["Readables", 2, 0,
1220 ["Spellbooks" => PICKUP_SPELLBOOK], 1298 ["Spellbooks" => PICKUP_SPELLBOOK],
1221 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1299 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1222 ["Normal Books/Scrolls" => PICKUP_READABLES], 1300 ["Normal Books/Scrolls" => PICKUP_READABLES],
1223 ], 1301 ],
1224 ["Misc", 2, 7, 1302 ["Misc", 2, 5,
1225 ["Food" => PICKUP_FOOD], 1303 ["Food" => PICKUP_FOOD],
1226 ["Drinks" => PICKUP_DRINK], 1304 ["Drinks" => PICKUP_DRINK],
1227 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1305 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1228 ["Keys" => PICKUP_KEY], 1306 ["Keys" => PICKUP_KEY],
1229 ["Magical Items" => PICKUP_MAGICAL], 1307 ["Magical Items" => PICKUP_MAGICAL],
1230 ["Potions" => PICKUP_POTION], 1308 ["Potions" => PICKUP_POTION],
1231 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1309 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1232 ["Ignore cursed" => PICKUP_NOT_CURSED], 1310 ["Ignore cursed" => PICKUP_NOT_CURSED],
1233 ["Jewelery" => PICKUP_JEWELS], 1311 ["Jewelery" => PICKUP_JEWELS],
1312 ["Flesh" => PICKUP_FLESH],
1234 ], 1313 ],
1235 ["Weight/Value ratio", 2, 17] 1314 ["Weight/Value ratio", 2, 17]
1236 ) 1315 )
1237 { 1316 {
1238 my ($title, $x, $y, @bits) = @$_; 1317 my ($title, $x, $y, @bits) = @$_;
… …
1283 $::CONN->send_command ("pickup $::CFG->{pickup}") 1362 $::CONN->send_command ("pickup $::CFG->{pickup}")
1284 if defined $::CONN; 1363 if defined $::CONN;
1285 0 1364 0
1286 }); 1365 });
1287 1366
1288 $table 1367 $r
1289} 1368}
1290 1369
1291my %SORT_ORDER = ( 1370my %SORT_ORDER = (
1292 type => undef, 1371 type => undef,
1293 mtime => sub { sort { 1372 mtime => sub {
1373 my $NOW = time;
1374 sort {
1375 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1376 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1377
1294 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1378 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1295 or $b->{mtime} <=> $a->{mtime} 1379 or $btime <=> $atime
1296 or $a->{type} <=> $b->{type} 1380 or $a->{type} <=> $b->{type}
1381 } @_
1297 } @_ }, 1382 },
1298 weight => sub { sort { 1383 weight => sub { sort {
1299 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1384 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1300 or $a->{type} <=> $b->{type} 1385 or $a->{type} <=> $b->{type}
1301 } @_ }, 1386 } @_ },
1302); 1387);
… …
1327 #TODO# update to weigh/maxweight 1412 #TODO# update to weigh/maxweight
1328 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1413 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1329 1414
1330 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1415 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1331 $sw1->add ($INV = new CFPlus::UI::Inventory); 1416 $sw1->add ($INV = new CFPlus::UI::Inventory);
1417 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1332 1418
1333 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1419 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1334 1420
1335 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1421 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1336 1422
… …
1353 $PL_WINDOW->show; 1439 $PL_WINDOW->show;
1354 } 1440 }
1355} 1441}
1356 1442
1357sub player_window { 1443sub player_window {
1358 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1444 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1359 x => "center", 1445 x => "center",
1360 y => "center", 1446 y => "center",
1361 force_w => $WIDTH * 9/10, 1447 force_w => $WIDTH * 9/10,
1362 force_h => $HEIGHT * 9/10, 1448 force_h => $HEIGHT * 9/10,
1363 title => "Player", 1449 title => "Player",
… …
1365 has_close_button => 1 1451 has_close_button => 1
1366 ; 1452 ;
1367 1453
1368 my $ntb = 1454 my $ntb =
1369 $PL_NOTEBOOK = 1455 $PL_NOTEBOOK =
1370 new CFPlus::UI::Notebook expand => 1, debug => 1; 1456 new CFPlus::UI::Notebook expand => 1;
1371 1457
1372 $ntb->add ( 1458 $ntb->add (
1373 "Statistics (F2)" => $STATS_PAGE = stats_window, 1459 "Statistics (F2)" => $STATS_PAGE = stats_window,
1374 "Shows statistics, where all your Stats and Resistances are shown." 1460 "Shows statistics, where all your Stats and Resistances are shown."
1375 ); 1461 );
1376 $ntb->add ( 1462 $ntb->add (
1377 "Skills (F3)" => $SKILL_PAGE = skill_window, 1463 "Skills (F3)" => $SKILL_PAGE = skill_window,
1378 "Shows all your Skills." 1464 "Shows all your Skills."
1379 ); 1465 );
1380 1466
1381 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1467 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1382 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1468 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1383 $ntb->add ( 1469 $ntb->add (
1384 "Spellbook (F4)" => $spellsw, 1470 "Spellbook (F4)" => $spellsw,
1385 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1471 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1386 ); 1472 );
1387 $ntb->add ( 1473 $ntb->add (
1388 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1474 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1389 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1475 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1390 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1476 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1391 ); 1477 );
1478 $ntb->add (Pickup => autopickup_setup,
1479 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1392 1480
1393 $ntb->set_current_page ($INVENTORY_PAGE); 1481 $ntb->set_current_page ($INVENTORY_PAGE);
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";
1563} 1708}
1564 1709
1565sub video_init { 1710sub video_init {
1566 sdl_init;
1567
1568 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1711 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1569 1712
1570 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1713 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1571 1714
1572 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1715 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1573 $FULLSCREEN = $CFG->{fullscreen}; 1716 $FULLSCREEN = $CFG->{fullscreen};
1574 $FAST = $CFG->{fast}; 1717 $FAST = $CFG->{fast};
1575 1718
1576 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1719 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1577 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1720 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1578 1721
1579 $SDL_ACTIVE = 1; 1722 $SDL_ACTIVE = 1;
1580 $LAST_REFRESH = time - 0.01; 1723 $LAST_REFRESH = time - 0.01;
1581 1724
… …
1597 z => 100, 1740 z => 100,
1598 force_x => "max", 1741 force_x => "max",
1599 force_y => 0; 1742 force_y => 0;
1600 $DEBUG_STATUS->show; 1743 $DEBUG_STATUS->show;
1601 1744
1602 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1603
1604 $STATUSBOX = new CFPlus::UI::Statusbox; 1745 $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]); 1746 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1606 1747
1607 (new CFPlus::UI::Frame 1748 (new CFPlus::UI::Frame
1608 bg => [0, 0, 0, 0.4], 1749 bg => [0, 0, 0, 0.4],
1609 force_x => 0, 1750 force_x => 0,
1610 force_y => "max", 1751 force_y => "max",
1611 child => $STATUSBOX, 1752 child => $STATUSBOX,
1612 )->show; 1753 )->show;
1613 1754
1614 CFPlus::UI::FancyFrame->new ( 1755 CFPlus::UI::Toplevel->new (
1615 title => "Map", 1756 title => "Map",
1616 name => "mapmap", 1757 name => "mapmap",
1617 x => 0, 1758 x => 0,
1618 y => $FONTSIZE + 8, 1759 y => $FONTSIZE + 8,
1619 border_bg => [1, 1, 1, 192/255], 1760 border_bg => [1, 1, 1, 192/255],
… …
1644 font => $FONT_FIXED, 1785 font => $FONT_FIXED,
1645 fontsize => $::CFG->{log_fontsize}, 1786 fontsize => $::CFG->{log_fontsize},
1646 indent => -4, 1787 indent => -4,
1647 can_hover => 1, 1788 can_hover => 1,
1648 can_events => 1, 1789 can_events => 1,
1790 max_par => $CFG->{logview_max_par},
1649 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1791 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1650 ; 1792 ;
1651 1793
1652 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1794 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1653 title => "Setup", 1795 title => "Setup",
1654 name => "setup_dialog", 1796 name => "setup_dialog",
1655 x => 'center', 1797 x => 'center',
1656 y => 'center', 1798 y => 'center',
1657 z => 2, 1799 z => 2,
… …
1665 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1807 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1666 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1808 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1667 1809
1668 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1810 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1669 "Configure the server to play on, your username, password and other server-related options."); 1811 "Configure the server to play on, your username, password and other server-related options.");
1670 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1812 $SETUP_NOTEBOOK->add (Client => client_setup,
1671 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1813 "Configure various client-specific settings.");
1672 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1814 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1673 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1815 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1674 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1816 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1675 "Configure the use of audio, sound effects and background music."); 1817 "Configure the use of audio, sound effects and background music.");
1676 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1818 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1708 ); 1850 );
1709 1851
1710 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1852 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1711 tooltip => "View Documentation"); 1853 tooltip => "View Documentation");
1712 1854
1855
1713 $BUTTONBAR->add (new CFPlus::UI::Button 1856 $BUTTONBAR->add (new CFPlus::UI::Button
1714 text => "Quit", 1857 text => "Quit",
1715 tooltip => "Terminates the program", 1858 tooltip => "Terminates the program",
1716 on_activate => sub { 1859 on_activate => sub {
1717 if ($CONN) { 1860 if ($CONN) {
… …
1728 } 1871 }
1729 1872
1730 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1873 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1731} 1874}
1732 1875
1876sub setup_build_button {
1877 my ($enabled) = @_;
1878 if ($enabled) {
1879 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1880 $BUILD_BUTTON ||= new CFPlus::UI::Button
1881 text => "Build",
1882 tooltip => "Opens the ingame builder",
1883 on_activate => sub {
1884 if ($CONN) {
1885 $CONN->send_ext_req (builder_player_items => sub {
1886 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1887 });
1888 }
1889 0
1890 };
1891 $BUTTONBAR->add ($BUILD_BUTTON);
1892 } else {
1893 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1894 }
1895}
1896
1897sub open_ingame_editor {
1898 my ($msg) = @_;
1899
1900 my $win = new CFPlus::UI::Toplevel
1901 x => 0,
1902 y => 'center',
1903 z => 4,
1904 name => 'builder_window',
1905 force_w => int $WIDTH * 1/4,
1906 force_h => int $HEIGHT * 3/4,
1907 title => "In game builder",
1908 has_close_button => 1;
1909
1910 my $r = new CFPlus::UI::ScrolledWindow (
1911 expand => 1,
1912 scroll_y => 1
1913 );
1914 $r->add (my $vb = new CFPlus::UI::VBox);
1915 $win->add ($r);
1916
1917
1918 $vb->add (
1919 new CFPlus::UI::Button
1920 text => "Disable build mode",
1921 on_activate => sub { $::IN_BUILD_MODE = undef }
1922 );
1923 $vb->add (
1924 new CFPlus::UI::Button
1925 text => "ERASE",
1926 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1927 );
1928
1929 for my $itemarchname (
1930 sort {
1931 $msg->{items}->{$a}->{build_arch_name}
1932 cmp $msg->{items}->{$b}->{build_arch_name}
1933 } keys %{$msg->{items}}
1934 ) {
1935 my $info = $msg->{items}->{$itemarchname};
1936 $vb->add (
1937 new CFPlus::UI::Button text => $info->{build_arch_name},
1938 on_activate => sub {
1939 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1940
1941 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1942 build_mode_query_arch_info ();
1943 }
1944 }
1945 );
1946 }
1947
1948 $win->show;
1949}
1950
1951sub build_mode_query_arch_info {
1952 my ($iteminfo) = $::IN_BUILD_MODE;
1953 my $itemarchname = $iteminfo->{item};
1954 my $info = $iteminfo->{info};
1955
1956 my $dialog = new CFPlus::UI::Toplevel
1957 x => "center",
1958 y => "center",
1959 z => 50,
1960 force_w => int $WIDTH * 1/2,
1961 title => "Enter information for placement of '$itemarchname'",
1962 has_close_button => 1;
1963
1964 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1965
1966 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1967 my $row = 0;
1968 if ($info->{has_name}) {
1969 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1970 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1971 }
1972 if ($info->{has_text}) {
1973 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1974 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1975 }
1976 if ($info->{has_connection}) {
1977 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1978 $table->add (1, $row++,
1979 new CFPlus::UI::Entry
1980 expand => 1,
1981 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1982 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1983 );
1984 }
1985
1986 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1987 $hb->add (new CFPlus::UI::Button
1988 text => "Close",
1989 expand => 1,
1990 on_activate => sub { $dialog->hide; 0 },
1991 );
1992 $dialog->show;
1993}
1994
1733sub video_shutdown { 1995sub video_shutdown {
1734 CFPlus::OpenGL::shutdown; 1996 CFPlus::OpenGL::shutdown;
1735 1997
1736 undef $SDL_ACTIVE; 1998 undef $SDL_ACTIVE;
1737} 1999}
1738 2000
1739my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1740my $bgmusic;#TODO#hack#d#
1741
1742sub audio_channel_finished { 2001sub audio_channel_finished {
1743 my ($channel) = @_; 2002 my ($channel) = @_;
1744 2003
1745 #warn "channel $channel finished\n";#d# 2004 #warn "channel $channel finished\n";#d#
1746} 2005}
1747 2006
2007sub audio_music_set {
2008 my ($songs) = @_;
2009
2010 my @want =
2011 grep $_,
2012 map $CONN->{music_meta}{$_},
2013 @$songs;
2014
2015 if (@want) {
2016 @MUSIC_WANT = @want;
2017 &audio_music_changed ();
2018 }
2019}
2020
2021sub audio_music_start {
2022 my $path = $MUSIC_PLAYING->{path}
2023 or return;
2024
2025 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2026 # music might have changed...
2027 $path eq $MUSIC_PLAYING->{path}
2028 or return &audio_music_start ();
2029
2030 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2031
2032 my $NOW = time;
2033
2034 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2035 my $pos = $MUSIC_PLAYING->{stop_pos};
2036 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2037 $MUSIC_START = time - $pos;
2038 } else {
2039 $MUSIC_PLAYER->play (0);
2040 $MUSIC_START = time;
2041 }
2042
2043 delete $MUSIC_PLAYING->{stop_time};
2044 delete $MUSIC_PLAYING->{stop_pos};
2045 }
2046}
2047
2048sub audio_music_changed {
2049 return unless $CFG->{bgm_enable};
2050
2051 # default MUSIC_WANT == MUSIC_DEFAULT
2052 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2053
2054 # if the currently playing song is acceptable, let it continue
2055 return if $MUSIC_PLAYING
2056 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2057
2058 my $NOW = time;
2059
2060 if ($MUSIC_PLAYING) {
2061 $MUSIC_PLAYING->{stop_time} = $NOW;
2062 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2063 CFPlus::MixMusic::fade_out 1000;
2064 } else {
2065 # sort by stop time, oldest first
2066 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2067
2068 # if the most recently-played piece played very recently,
2069 # resume it, else choose the oldest piece for rotation.
2070 $MUSIC_PLAYING =
2071 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2072 ? $MUSIC_WANT[-1]
2073 : $MUSIC_WANT[0];
2074
2075 audio_music_start;
2076 }
2077}
2078
1748sub audio_music_finished { 2079sub audio_music_finished {
1749 return unless $CFG->{bgm_enable}; 2080 $MUSIC_PLAYING = undef;
2081 undef $MUSIC_PLAYER;
1750 2082
1751 # TODO: hack, do play loop and mood music 2083 audio_music_changed;
1752 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1753 $bgmusic->play (0);
1754
1755 push @bgmusic, shift @bgmusic;
1756} 2084}
1757 2085
1758sub audio_init { 2086sub audio_init {
1759 if ($CFG->{audio_enable}) { 2087 if ($CFG->{audio_enable}) {
1760 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2088 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
1768 CFPlus::Mix_AllocateChannels 8; 2096 CFPlus::Mix_AllocateChannels 8;
1769 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 2097 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1770 2098
1771 audio_music_finished; 2099 audio_music_finished;
1772 2100
2101 local $_;
1773 while (<$fh>) { 2102 while (<$fh>) {
1774 next if /^\s*#/; 2103 next if /^\s*#/;
1775 next if /^\s*$/; 2104 next if /^\s*$/;
1776 2105
1777 my ($file, $volume, $event) = split /\s+/, $_, 3; 2106 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1809 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2138 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1810 2139
1811 $CFPlus::UI::ROOT->draw; 2140 $CFPlus::UI::ROOT->draw;
1812 2141
1813 $WANT_REFRESH = 0; 2142 $WANT_REFRESH = 0;
1814 $CAN_REFRESH = 0; 2143 $CAN_REFRESH = 0;
1815 $LAST_REFRESH = $NOW; 2144 $LAST_REFRESH = $NOW;
1816 2145
1817 CFPlus::SDL_GL_SwapBuffers; 2146 CFPlus::SDL_GL_SwapBuffers;
1818} 2147}
1819 2148
1820my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2149my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1821 $NOW = time; 2150 $NOW = time;
1822 2151
1823 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2152 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1824 for CFPlus::SDL_PollEvent; 2153 for CFPlus::poll_events;
1825 2154
1826 if (%animate_object) { 2155 if (%animate_object) {
1827 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2156 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1828 $WANT_REFRESH++; 2157 ++$WANT_REFRESH;
1829 } 2158 }
1830 2159
1831 if ($WANT_REFRESH) { 2160 if ($WANT_REFRESH) {
1832 force_refresh; 2161 force_refresh;
1833 } else { 2162 } else {
… …
1854 if $CONN; 2183 if $CONN;
1855}); 2184});
1856 2185
1857%SDL_CB = ( 2186%SDL_CB = (
1858 CFPlus::SDL_QUIT => sub { 2187 CFPlus::SDL_QUIT => sub {
1859 Event::unloop -1; 2188 exit;
1860 }, 2189 },
1861 CFPlus::SDL_VIDEORESIZE => sub { 2190 CFPlus::SDL_VIDEORESIZE => sub {
1862 }, 2191 },
1863 CFPlus::SDL_VIDEOEXPOSE => sub { 2192 CFPlus::SDL_VIDEOEXPOSE => sub {
1864 CFPlus::UI::full_refresh; 2193 CFPlus::UI::full_refresh;
1865 }, 2194 },
1866 CFPlus::SDL_ACTIVEEVENT => sub { 2195 CFPlus::SDL_ACTIVEEVENT => sub {
1867# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2196# not useful, as APPACTIVE include sonly iconified state, not unmapped
2197# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2198# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2199# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2200# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2201# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1868 }, 2202 },
1869 CFPlus::SDL_KEYDOWN => sub { 2203 CFPlus::SDL_KEYDOWN => sub {
1870 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2204 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1871 # alt-enter 2205 # alt-enter
1872 $FULLSCREEN_ENABLE->toggle; 2206 $FULLSCREEN_ENABLE->toggle;
… …
1893 2227
1894$SIG{INT} = $SIG{TERM} = sub { exit }; 2228$SIG{INT} = $SIG{TERM} = sub { exit };
1895 2229
1896{ 2230{
1897 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2231 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2232 CFPlus::DB::Server::run;
2233
1898 CFPlus::UI::set_layout ($::CFG->{layout}); 2234 CFPlus::UI::set_layout ($::CFG->{layout});
1899 2235
1900 my %DEF_CFG = ( 2236 my %DEF_CFG = (
1901 sdl_mode => 0, 2237 sdl_mode => 0,
1902 width => 640, 2238 width => 640,
1903 height => 480, 2239 height => 480,
1904 fullscreen => 0, 2240 fullscreen => 0,
1905 fast => 0, 2241 fast => 0,
1906 map_scale => 1, 2242 map_scale => 1,
1907 fow_enable => 1, 2243 fow_enable => 1,
1908 fow_intensity => 0.45, 2244 fow_intensity => 0,
1909 fow_smooth => 0, 2245 map_smoothing => 1,
1910 gui_fontsize => 1, 2246 gui_fontsize => 1,
1911 log_fontsize => 0.7, 2247 log_fontsize => 0.7,
1912 gauge_fontsize => 1, 2248 gauge_fontsize => 1,
1913 gauge_size => 0.35, 2249 gauge_size => 0.35,
1914 stat_fontsize => 0.7, 2250 stat_fontsize => 0.7,
1915 mapsize => 100, 2251 mapsize => 100,
1916 say_command => 'say', 2252 say_command => 'chat',
1917 audio_enable => 1, 2253 audio_enable => 1,
1918 bgm_enable => 1, 2254 bgm_enable => 1,
1919 bgm_volume => 0.25, 2255 bgm_volume => 0.25,
1920 face_prefetch => 0, 2256 face_prefetch => 0,
1921 output_sync => 1, 2257 output_sync => 1,
1922 output_count => 1, 2258 output_count => 1,
2259 output_rate => "",
1923 pickup => 0, 2260 pickup => 0,
1924 inv_sort => "mtime", 2261 inv_sort => "mtime",
1925 default => "profile", # default profile 2262 default => "profile", # default profile
2263 show_tips => 1,
2264 logview_max_par => 1000,
1926 ); 2265 );
1927 2266
1928 while (my ($k, $v) = each %DEF_CFG) { 2267 while (my ($k, $v) = each %DEF_CFG) {
1929 $CFG->{$k} = $v unless exists $CFG->{$k}; 2268 $CFG->{$k} = $v unless exists $CFG->{$k};
1930 } 2269 }
1931 2270
1932 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2271 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2272 $PROFILE = $CFG->{profile}{default};
2273
2274 # convert old bindings (only default profile matters)
2275 if (my $bindings = delete $PROFILE->{bindings}) {
2276 while (my ($mod, $syms) = each %$bindings) {
2277 while (my ($sym, $cmds) = each %$syms) {
2278 push @{ $PROFILE->{macro} }, {
2279 accelkey => [$mod*1, $sym*1],
2280 action => $cmds,
2281 };
2282 }
2283 }
2284 }
1933 2285
1934 sdl_init; 2286 sdl_init;
1935 2287
1936 @SDL_MODES = reverse 2288 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1937 grep $_->[0] >= 640 && $_->[1] >= 480, 2289 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1938 CFPlus::SDL_ListModes;
1939
1940 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2290 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2291
2292 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
1941 2293
1942 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2294 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1943 2295
1944 { 2296 {
1945 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2297 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
1974# } 2326# }
1975# my $t2 = Time::HiRes::time; 2327# my $t2 = Time::HiRes::time;
1976# warn $t2-$t1; 2328# warn $t2-$t1;
1977# } 2329# }
1978 2330
2331 $startup_done->();
2332
1979 video_init; 2333 video_init;
1980 audio_init; 2334 audio_init;
1981} 2335}
2336
2337show_tip_of_the_day if $CFG->{show_tips};
1982 2338
1983Event::loop; 2339Event::loop;
1984#CFPlus::SDL_Quit; 2340#CFPlus::SDL_Quit;
1985#CFPlus::_exit 0; 2341#CFPlus::_exit 0;
1986 2342
2343END {
1987END { CFPlus::SDL_Quit } 2344 CFPlus::SDL_Quit;
2345 CFPlus::DB::Server::stop;
2346}
1988 2347
1989=head1 NAME 2348=head1 NAME
1990 2349
1991cfplus - A Crossfire+ and Crossfire game client 2350cfplus - A Crossfire+ and Crossfire game client
1992 2351

Diff Legend

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