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.180 by root, Sat Jul 21 13:37:09 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
207 $table->add (0, 0, new CFPlus::UI::Button 277 $table->add_at (0, 0, new CFPlus::UI::Button
208 text => "Next Race", 278 text => "Next Race",
209 on_activate => sub { 279 on_activate => sub {
210 $conn->send ("reply n"); 280 $conn->send ("reply n");
211 destroy_query_dialog $conn; 281 destroy_query_dialog $conn;
212 0 282 0
213 }, 283 },
214 ); 284 );
215 $table->add (2, 0, new CFPlus::UI::Button 285 $table->add_at (2, 0, new CFPlus::UI::Button
216 text => "Accept", 286 text => "Accept",
217 on_activate => sub { 287 on_activate => sub {
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 );
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 329
244 $STATS_PAGE->show;
245 $MESSAGE_WINDOW->hide;
246
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";
251 334
252 unshift @dialog, my $table = new CFPlus::UI::Table; 335 unshift @dialog, my $table = new CFPlus::UI::Table;
253 336
254 # left: re-roll 337 # left: re-roll
255 $table->add (0, 0, new CFPlus::UI::Button 338 $table->add_at (0, 0, new CFPlus::UI::Button
256 text => "Roll Again", 339 text => "Roll Again",
257 on_activate => sub { 340 on_activate => sub {
258 $conn->send ("reply y"); 341 $conn->send ("reply y");
259 destroy_query_dialog $conn; 342 destroy_query_dialog $conn;
260 0 343 0
274 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 357 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
275 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 358 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
276 ], 359 ],
277 ), 1 .. 2; 360 ), 1 .. 2;
278 361
279 $table->add (2, 0, new CFPlus::UI::Button 362 $table->add_at (2, 0, new CFPlus::UI::Button
280 text => "Swap Stats", 363 text => "Swap Stats",
281 on_activate => sub { 364 on_activate => sub {
282 $conn->{stat_change_with} = $sw2->{value}; 365 $conn->{stat_change_with} = $sw2->{value};
283 $conn->send ("reply $sw1->{value}"); 366 $conn->send ("reply $sw1->{value}");
284 destroy_query_dialog $conn; 367 destroy_query_dialog $conn;
285 0 368 0
286 }, 369 },
287 ); 370 );
288 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 371 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
289 372
290 # right: accept 373 # right: accept
291 $table->add (4, 0, new CFPlus::UI::Button 374 $table->add_at (4, 0, new CFPlus::UI::Button
292 text => "Accept", 375 text => "Accept",
293 on_activate => sub { 376 on_activate => sub {
294 $conn->send ("reply n"); 377 $conn->send ("reply n");
295 $STATS_PAGE->hide; 378 $STATS_PAGE->hide;
296 destroy_query_dialog $conn; 379 destroy_query_dialog $conn;
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_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
527 $table->add_at (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_at (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_at (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 552
451 my $row = 1;
452
453 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 553 $table->add_at (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_at (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.",
457 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 557 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
458 ); 558 );
459 559
460 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 560 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
461 $table->add (1, $row++, new CFPlus::UI::CheckBox 561 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
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_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
568 $table->add_at (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_at (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_at (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_at (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_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
592 $table->add_at (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_at (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_at (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 }
479 ); 605 );
480 606
481 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 607 $table->add_at (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_at (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 ); 612 );
487 613
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 );
506
507 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 614 $table->add_at (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_at (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],
510 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 617 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
511 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 618 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
512 ); 619 );
513 620
514 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 621 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
515 $table->add (1, $row++, new CFPlus::UI::Slider 622 $table->add_at (1, $row++, new CFPlus::UI::Slider
516 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 623 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
517 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 624 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
518 on_changed => sub { 625 on_changed => sub {
519 $CFG->{gauge_fontsize} = $_[1]; 626 $CFG->{gauge_fontsize} = $_[1];
520 &set_gauge_window_fontsize; 627 &set_gauge_window_fontsize;
521 0 628 0
522 } 629 }
523 ); 630 );
524 631
525 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 632 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
526 $table->add (1, $row++, new CFPlus::UI::Slider 633 $table->add_at (1, $row++, new CFPlus::UI::Slider
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 639 0
533 } 640 }
534 ); 641 );
535 642
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
543 }
544 );
545
546 $vbox 643 $vbox
547} 644}
548 645
549sub audio_setup { 646sub audio_setup {
550 my $vbox = new CFPlus::UI::VBox; 647 my $vbox = new CFPlus::UI::VBox;
551 648
552 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 649 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
553 650
554 my $row = 0; 651 my $row = 0;
555 652
556 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 653 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
557 $table->add (1, $row++, new CFPlus::UI::CheckBox 654 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
558 state => $CFG->{audio_enable}, 655 state => $CFG->{audio_enable},
559 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 656 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
560 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 657 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
561 ); 658 );
562# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 659# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
563# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 660# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
564# $CFG->{effects_volume} = $_[1]; 661# $CFG->{effects_volume} = $_[1];
565# }); 662# });
566 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 663 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
567 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 664 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
568 $hbox->add (new CFPlus::UI::CheckBox 665 $hbox->add (new CFPlus::UI::CheckBox
569 expand => 1, state => $CFG->{bgm_enable}, 666 expand => 1, state => $CFG->{bgm_enable},
570 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 667 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
571 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 668 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
572 ); 669 );
574 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 671 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
575 tooltip => "The volume of the background music. Changes are instant.", 672 tooltip => "The volume of the background music. Changes are instant.",
576 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 673 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
577 ); 674 );
578 675
579 $table->add (1, $row++, new CFPlus::UI::Button 676 $table->add_at (1, $row++, new CFPlus::UI::Button
580 expand => 1, align => 0, text => "Apply", 677 expand => 1, align => 0, text => "Apply",
581 tooltip => "Apply the audio settings", 678 tooltip => "Apply the audio settings",
582 on_activate => sub { 679 on_activate => sub {
583 audio_shutdown (); 680 audio_shutdown ();
584 audio_init (); 681 audio_init ();
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 };
649} 740}
650 741
651sub debug_setup { 742sub debug_setup {
652 my $table = new CFPlus::UI::Table; 743 my $table = new CFPlus::UI::Table;
653 744
654 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 745 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
655 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 746 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
656 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 747 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
657 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 748 $table->add_at (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_at (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_at (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_at (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_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
753 $table->add_at (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_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
664 756
665 for my $x (0..2) { 757 $table->add_at (7,7, my $t = new CFPlus::UI::Table);
666 for my $y (0 .. 2) { 758 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
667 $table->add ($x + 3, $y, 759 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
668 new CFPlus::UI::Entry 760 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
669 text => $default_smooth[$x * 3 + $y], 761 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
670 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 762 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
671 );
672 }
673 }
674
675 763
676 $table 764 $table
677} 765}
678 766
679sub stats_window { 767sub stats_window {
681 expand => 1, 769 expand => 1,
682 scroll_y => 1 770 scroll_y => 1
683 ); 771 );
684 $r->add (my $vb = new CFPlus::UI::VBox); 772 $r->add (my $vb = new CFPlus::UI::VBox);
685 773
774 $vb->add (new CFPlus::UI::FancyFrame
775 label => "Player",
776 child => (my $pi = new CFPlus::UI::VBox),
777 );
778
686 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 779 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
687 can_hover => 1, can_events => 1, 780 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."); 781 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, 782 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
690 can_hover => 1, can_events => 1, 783 can_hover => 1, can_events => 1,
691 tooltip => "The map you are currently on (if supported by the server)."); 784 tooltip => "The map you are currently on (if supported by the server).");
692 785
693 $vb->add (my $hb0 = new CFPlus::UI::HBox); 786 $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, 787 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
695 can_hover => 1, can_events => 1, 788 can_hover => 1, can_events => 1,
696 tooltip => "The weight of the player including all inventory items."); 789 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, 790 $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, 791 can_hover => 1, can_events => 1,
699 tooltip => "The weight limit: you cannot carry more than this."); 792 tooltip => "The weight limit: you cannot carry more than this.");
700 793
794 $vb->add (new CFPlus::UI::FancyFrame
795 label => "Primary/Secondary Statistics",
701 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 796 child => (my $hb = new CFPlus::UI::HBox expand => 1),
797 );
702 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 798 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
703 799
704 my $color2 = [1, 1, 0]; 800 my $color2 = [1, 1, 0];
705 801
706 for ( 802 for (
719 [2, 4, st_spd => "Spd", 10.54], 815 [2, 4, st_spd => "Spd", 10.54],
720 [2, 5, st_wspd => "WSp", 10.54], 816 [2, 5, st_wspd => "WSp", 10.54],
721 ) { 817 ) {
722 my ($col, $row, $id, $label, $template) = @$_; 818 my ($col, $row, $id, $label, $template) = @$_;
723 819
724 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 820 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
725 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 821 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
726 align => +1, template => $template, tooltip => "#stat_$label"); 822 align => +1, template => $template, tooltip => "#stat_$label");
727 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 823 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
728 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 824 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
729 align => -1, text => $label, tooltip => "#stat_$label"); 825 align => -1, text => $label, tooltip => "#stat_$label");
730 } 826 }
731 827
828 $vb->add (new CFPlus::UI::FancyFrame
829 label => "Resistancies",
732 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 830 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
831 );
733 832
734 my $row = 0; 833 my $row = 0;
735 my $col = 0; 834 my $col = 0;
736 835
737 my %resist_names = ( 836 my %resist_names = (
770 cold => ["Cold", 869 cold => ["Cold",
771 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 870 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
772 ghit => ["Ghost hit", 871 ghit => ["Ghost hit",
773 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 872 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
774 ); 873 );
874
775 for (qw/slow holyw conf fire depl magic 875 for (qw/slow holyw conf fire depl magic
776 drain acid pois para deat phys 876 drain acid pois para deat phys
777 blind fear tund elec cold ghit/) 877 blind fear tund elec cold ghit/)
778 { 878 {
779 $tbl2->add ($col, $row, 879 $tbl2->add_at ($col, $row,
780 $STATWIDS->{"res_$_"} = 880 $STATWIDS->{"res_$_"} =
781 new CFPlus::UI::Label 881 new CFPlus::UI::Label
782 font => $FONT_FIXED, 882 font => $FONT_FIXED,
783 template => "-100%", 883 template => "-100%",
784 align => +1, 884 align => +1,
785 valign => 0, 885 valign => 0,
786 can_events => 1, 886 can_events => 1,
787 can_hover => 1, 887 can_hover => 1,
788 tooltip => $resist_names{$_}->[1], 888 tooltip => $resist_names{$_}->[1],
789 ); 889 );
790 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 890 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
791 font => $FONT_FIXED, 891 font => $FONT_FIXED,
792 can_hover => 1, 892 can_hover => 1,
793 can_events => 1, 893 can_events => 1,
794 path => "ui/resist/resist_$_.png", 894 path => "ui/resist/resist_$_.png",
795 tooltip => $resist_names{$_}->[1], 895 tooltip => $resist_names{$_}->[1],
796 ); 896 );
797 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 897 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
798 text => $resist_names{$_}->[0], 898 text => $resist_names{$_}->[0],
799 font => $FONT_FIXED, 899 font => $FONT_FIXED,
800 can_hover => 1, 900 can_hover => 1,
801 can_events => 1, 901 can_events => 1,
802 tooltip => $resist_names{$_}->[1], 902 tooltip => $resist_names{$_}->[1],
835 return if $METASERVER_ATIME > time; 935 return if $METASERVER_ATIME > time;
836 $METASERVER_ATIME = time + 60; 936 $METASERVER_ATIME = time + 60;
837 937
838 my $table = $METASERVER->{table}; 938 my $table = $METASERVER->{table};
839 $table->clear; 939 $table->clear;
840 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 940 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
841 941
842 my $buf; 942 my $ok = 0;
843 943
844 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 944 CFPlus::background {
945 my $ua = CFPlus::lwp_useragent;
845 946
846 unless ($fh) { 947 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
847 $label->set_text ("unable to contact metaserver: $!"); 948 } sub {
848 return; 949 my ($msg) = @_;
849 } 950 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; 951 $table->clear;
864 952
865 my @tip = ( 953 my @tip = (
866 "The current number of users logged in on the server.", 954 "The current number of users logged in on the server.",
867 "The hostname of the server.", 955 "The hostname of the server.",
868 "The time this server has been running without being restarted.", 956 "The time this server has been running without being restarted.",
869 "The server software version - a '+' indicates a Crossfire+ server.", 957 "The server software version - a '+' indicates a Crossfire+ server.",
870 "Short information about this server provided by its admins.", 958 "Short information about this server provided by its admins.",
871 ); 959 );
872 my @col = qw(#Users Host Uptime Version Description); 960 my @col = qw(#Users Host Uptime Version Description);
873 $table->add ($_, 0, new CFPlus::UI::Label 961 $table->add_at ($_, 0, new CFPlus::UI::Label
874 can_hover => 1, can_events => 1, 962 can_hover => 1, can_events => 1,
875 align => 0, fg => [1, 1, 0], 963 align => 0, fg => [1, 1, 0],
876 text => $col[$_], tooltip => $tip[$_]) 964 text => $col[$_], tooltip => $tip[$_])
877 for 0 .. $#col; 965 for 0 .. $#col;
878 966
879 my @align = qw(1 0 1 1 -1); 967 my @align = qw(1 0 1 1 -1);
880 968
881 my $y = 0; 969 my $y = 0;
882 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 970 for my $m (@{ $msg->{servers} }) {
883 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 971 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
972 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
884 973
885 for ($desc) { 974 for ($desc) {
886 s/<br>/\n/gi; 975 s/<br>/\n/gi;
887 s/<li>/\n· /gi; 976 s/<li>/\n· /gi;
888 s/<.*?>//sgi; 977 s/<.*?>//sgi;
889 s/&/&amp;/g; 978 s/&amp;/&/g;
890 s/</&lt;/g; 979 s/&lt;/</g;
891 s/>/&gt;/g; 980 s/&gt;/>/g;
892 } 981 }
893 982
894 $uptime = sprintf "%dd %02d:%02d:%02d", 983 $uptime = sprintf "%dd %02d:%02d:%02d",
895 (int $m->[8] / 86400), 984 (int $uptime / 86400),
896 (int $m->[8] / 3600) % 24, 985 (int $uptime / 3600) % 24,
897 (int $m->[8] / 60) % 60, 986 (int $uptime / 60) % 60,
898 $m->[8] % 60; 987 $uptime % 60;
899 988
900 $m = [$users, $host, $uptime, $version, $desc]; 989 $m = [$users, $host, $uptime, $version, $desc];
901 990
902 $y++; 991 $y++;
903 992
904 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 993 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
905 (new CFPlus::UI::Button 994 (new CFPlus::UI::Button
906 text => "Use", 995 text => "Use",
907 tooltip => "Put this server into the <b>Host:Port</b> field", 996 tooltip => "Put this server into the <b>Host:Port</b> field",
908 on_activate => sub { 997 on_activate => sub {
909 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 998 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
912 }, 1001 },
913 ), 1002 ),
914 (new CFPlus::UI::Empty expand => 1), 1003 (new CFPlus::UI::Empty expand => 1),
915 ]); 1004 ]);
916 1005
917 $table->add ($_, $y, new CFPlus::UI::Label 1006 $table->add_at ($_, $y, new CFPlus::UI::Label
1007 max_w => $::WIDTH * 0.4,
918 ellipsise => 0, 1008 ellipsise => 0,
919 align => $align[$_], 1009 align => $align[$_],
920 text => $m->[$_], 1010 text => $m->[$_],
921 tooltip => $tip[$_], 1011 tooltip => $tip[$_],
1012 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
922 can_hover => 1, 1013 can_hover => 1,
923 can_events => 1, 1014 can_events => 1,
924 fontsize => 0.8) 1015 fontsize => 0.8)
925 for 0 .. $#$m; 1016 for 0 .. $#$m;
926 } 1017 }
1018 } else {
1019 $ok or $label->set_text ("error while contacting metaserver");
927 } 1020 }
928 }); 1021 };
1022
929} 1023}
930 1024
931sub metaserver_dialog { 1025sub metaserver_dialog {
932 my $vbox = new CFPlus::UI::VBox; 1026 my $vbox = new CFPlus::UI::VBox;
933 my $table = new CFPlus::UI::Table; 1027 my $table = new CFPlus::UI::Table;
934 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 1028 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
935 1029
936 my $dialog = new CFPlus::UI::FancyFrame 1030 my $dialog = new CFPlus::UI::Toplevel
937 title => "Server List", 1031 title => "Server List",
938 name => 'metaserver_dialog', 1032 name => 'metaserver_dialog',
939 x => 'center', 1033 x => 'center',
940 y => 'center', 1034 y => 'center',
941 z => 3, 1035 z => 3,
1036 force_w => $::WIDTH * 0.9,
942 force_h => $::HEIGHT * 0.4, 1037 force_h => $::HEIGHT * 0.7,
943 child => $vbox, 1038 child => $vbox,
944 has_close_button => 1, 1039 has_close_button => 1,
945 table => $table, 1040 table => $table,
946 on_visibility_change => sub { 1041 on_visibility_change => sub {
947 update_metaserver ($_[0]) if $_[1]; 1042 update_metaserver ($_[0]) if $_[1];
953} 1048}
954 1049
955sub server_setup { 1050sub server_setup {
956 my $vbox = new CFPlus::UI::VBox; 1051 my $vbox = new CFPlus::UI::VBox;
957 1052
1053 $vbox->add (new CFPlus::UI::FancyFrame
1054 label => "Connection Settings",
958 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 1055 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1056 );
959 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1057 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
960 1058
961 { 1059 {
962 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1060 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
963 1061
964 $vbox->add ( 1062 $vbox->add (
965 $HOST_ENTRY = new CFPlus::UI::Entry 1063 $HOST_ENTRY = new CFPlus::UI::Entry
966 expand => 1, 1064 expand => 1,
967 text => $CFG->{profile}{default}{host}, 1065 text => $CFG->{profile}{default}{host},
981 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1079 on_activate => sub { $METASERVER->toggle_visibility; 0 },
982 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1080 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
983 ); 1081 );
984 } 1082 }
985 1083
986 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1084 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
987 $table->add (1, 4, new CFPlus::UI::Entry 1085 $table->add_at (1, 4, new CFPlus::UI::Entry
988 text => $CFG->{profile}{default}{user}, 1086 text => $CFG->{profile}{default}{user},
989 tooltip => "The name of your character on the server", 1087 tooltip => "The name of your character on the server",
990 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1088 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
991 ); 1089 );
992 1090
993 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1091 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
994 $table->add (1, 5, new CFPlus::UI::Entry 1092 $table->add_at (1, 5, new CFPlus::UI::Entry
995 text => $CFG->{profile}{default}{password}, 1093 text => $CFG->{profile}{default}{password},
996 hidden => 1, 1094 hidden => 1,
997 tooltip => "The password for your character", 1095 tooltip => "The password for your character",
998 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1096 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
999 ); 1097 );
1000 1098
1001 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1099 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1002 $table->add (1, 7, new CFPlus::UI::Slider 1100 $table->add_at (1, 7, new CFPlus::UI::Slider
1003 force_w => 100, 1101 force_w => 100,
1004 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1102 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1005 tooltip => "This is the size of the portion of the map update the server sends you. " 1103 tooltip => "This is the size of the portion of the map update the server sends you. "
1006 . "If you set this to a high value you will be able to see further, " 1104 . "If you set this to a high value you will be able to see further, "
1007 . "but you also increase bandwidth requirements and latency. " 1105 . "but you also increase bandwidth requirements and latency. "
1008 . "This option is only used once at log-in.", 1106 . "This option is only used once at log-in.",
1009 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1107 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1010 ); 1108 );
1011 1109
1012 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1110 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1013 $table->add (1, 8, new CFPlus::UI::CheckBox 1111 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1014 state => $CFG->{face_prefetch}, 1112 state => $CFG->{face_prefetch},
1015 tooltip => "<b>Background Image Prefetch</b>\n\n" 1113 tooltip => "<b>Background Image Prefetch</b>\n\n"
1016 . "If enabled, the client automatically pre-fetches images from the server. " 1114 . "If enabled, the client automatically pre-fetches images from the server. "
1017 . "This might increase or create lag, but increases the chances " 1115 . "This might increase or create lag, but increases the chances "
1018 . "of faces being ready for display when you encounter them. " 1116 . "of faces being ready for display when you encounter them. "
1020 . "so only set it if you really need to prefetch images. " 1118 . "so only set it if you really need to prefetch images. "
1021 . "This option can be set and unset any time.", 1119 . "This option can be set and unset any time.",
1022 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1120 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1023 ); 1121 );
1024 1122
1123 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1124 $table->add_at (1, 9, new CFPlus::UI::Entry
1125 text => $CFG->{output_rate},
1126 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1127 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1128 . "default will be used, which is usually around 100kb/s.",
1129 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1130 );
1131
1025 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1132 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1026 $table->add (1, 9, new CFPlus::UI::Entry 1133 $table->add_at (1, 10, new CFPlus::UI::Entry
1027 text => $CFG->{output_count}, 1134 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.", 1135 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 }, 1136 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1030 ); 1137 );
1031 1138
1032 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1139 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1033 $table->add (1, 10, new CFPlus::UI::Entry 1140 $table->add_at (1, 11, new CFPlus::UI::Entry
1034 text => $CFG->{output_sync}, 1141 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.", 1142 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 }, 1143 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1037 ); 1144 );
1038 1145
1039 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1146 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1040 expand => 1, 1147 expand => 1,
1041 align => 0, 1148 align => 0,
1042 text => "Login", 1149 text => "Login",
1043 on_activate => sub { 1150 on_activate => sub {
1044 $CONN ? stop_game 1151 $CONN ? stop_game
1045 : start_game; 1152 : start_game;
1046 0 1153 0
1047 }, 1154 },
1048 ); 1155 );
1049 1156
1157 $vbox->add (new CFPlus::UI::FancyFrame
1158 label => "Server Info",
1159 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1160 );
1161
1162 $vbox
1163}
1164
1165sub client_setup {
1166 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1167
1168 my $row = 0;
1169
1050 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1170 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1051 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1171 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1052 text => $CFG->{say_command}, 1172 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. " 1173 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. " 1174 . "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.", 1175 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1056 on_changed => sub { 1176 on_changed => sub {
1057 my ($self, $value) = @_; 1177 my ($self, $value) = @_;
1058 $CFG->{say_command} = $value; 1178 $CFG->{say_command} = $value;
1059 0 1179 0
1060 } 1180 }
1061 ); 1181 );
1062 1182
1063 $vbox->add (new CFPlus::UI::Label 1183 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1064 text => "Server Info", 1184 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1065 fontsize => 1.2, 1185 state => $CFG->{show_tips},
1066 padding_y => 8, 1186 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1067 fg => [1, 1, 0, 1], 1187 on_changed => sub {
1188 my ($self, $value) = @_;
1189 $CFG->{show_tips} = $value;
1190 0
1191 }
1068 ); 1192 );
1069 1193
1070 $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0); 1194 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1195 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1196 text => $CFG->{logview_max_par},
1197 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1198 . "sends more messages than this number, older messages get removed to save memory and "
1199 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1200 on_changed => sub {
1201 my ($self, $value) = @_;
1202 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1203 0
1204 },
1205 );
1071 1206
1072 $vbox 1207 $table
1073} 1208}
1074 1209
1075sub message_window { 1210sub message_window {
1076 my $window = new CFPlus::UI::FancyFrame 1211 my $window = new CFPlus::UI::Toplevel
1077 name => "message_window", 1212 name => "message_window",
1078 title => "Messages", 1213 title => "Messages",
1079 border_bg => [1, 1, 1, 1], 1214 border_bg => [1, 1, 1, 1],
1080 x => "max", 1215 x => "max",
1081 y => 0, 1216 y => 0,
1133 }; 1268 };
1134 1269
1135 $window 1270 $window
1136} 1271}
1137 1272
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 { 1273sub autopickup_setup {
1274 my $r = new CFPlus::UI::ScrolledWindow (
1275 expand => 1,
1276 scroll_y => 1
1277 );
1195 my $table = new CFPlus::UI::Table; 1278 $r->add (my $table = new CFPlus::UI::Table
1279 row_expand => [0],
1280 col_expand => [0, 1, 0, 1],
1281 );
1196 1282
1197 for ( 1283 for (
1198 ["General", 0, 0, 1284 ["General", 0, 0,
1199 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1285 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1200 ["Inhibit autopickup" => PICKUP_INHIBIT], 1286 ["Inhibit autopickup" => PICKUP_INHIBIT],
1214 ["Boots" => PICKUP_BOOTS], 1300 ["Boots" => PICKUP_BOOTS],
1215 ["Gloves" => PICKUP_GLOVES], 1301 ["Gloves" => PICKUP_GLOVES],
1216 ["Cloaks" => PICKUP_CLOAK], 1302 ["Cloaks" => PICKUP_CLOAK],
1217 ], 1303 ],
1218 1304
1219 ["Readables", 2, 2, 1305 ["Readables", 2, 0,
1220 ["Spellbooks" => PICKUP_SPELLBOOK], 1306 ["Spellbooks" => PICKUP_SPELLBOOK],
1221 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1307 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1222 ["Normal Books/Scrolls" => PICKUP_READABLES], 1308 ["Normal Books/Scrolls" => PICKUP_READABLES],
1223 ], 1309 ],
1224 ["Misc", 2, 7, 1310 ["Misc", 2, 5,
1225 ["Food" => PICKUP_FOOD], 1311 ["Food" => PICKUP_FOOD],
1226 ["Drinks" => PICKUP_DRINK], 1312 ["Drinks" => PICKUP_DRINK],
1227 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1313 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1228 ["Keys" => PICKUP_KEY], 1314 ["Keys" => PICKUP_KEY],
1229 ["Magical Items" => PICKUP_MAGICAL], 1315 ["Magical Items" => PICKUP_MAGICAL],
1230 ["Potions" => PICKUP_POTION], 1316 ["Potions" => PICKUP_POTION],
1231 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1317 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1232 ["Ignore cursed" => PICKUP_NOT_CURSED], 1318 ["Ignore cursed" => PICKUP_NOT_CURSED],
1233 ["Jewelery" => PICKUP_JEWELS], 1319 ["Jewelery" => PICKUP_JEWELS],
1320 ["Flesh" => PICKUP_FLESH],
1234 ], 1321 ],
1235 ["Weight/Value ratio", 2, 17] 1322 ["Weight/Value ratio", 2, 17]
1236 ) 1323 )
1237 { 1324 {
1238 my ($title, $x, $y, @bits) = @$_; 1325 my ($title, $x, $y, @bits) = @$_;
1239 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1326 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1240 1327
1241 for (@bits) { 1328 for (@bits) {
1242 ++$y; 1329 ++$y;
1243 1330
1244 my $mask = $_->[1]; 1331 my $mask = $_->[1];
1245 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1332 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1246 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1333 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1247 state => $::CFG->{pickup} & $mask, 1334 state => $::CFG->{pickup} & $mask,
1248 on_changed => sub { 1335 on_changed => sub {
1249 my ($box, $value) = @_; 1336 my ($box, $value) = @_;
1250 1337
1251 if ($value) { 1338 if ($value) {
1262 1349
1263 ${$_->[2]} = $checkbox if $_->[2]; 1350 ${$_->[2]} = $checkbox if $_->[2];
1264 } 1351 }
1265 } 1352 }
1266 1353
1267 $table->add (2, 18, new CFPlus::UI::ValSlider 1354 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1268 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1355 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1269 template => ">= 99", 1356 template => ">= 99",
1270 to_value => sub { ">= " . 5 * $_[0] }, 1357 to_value => sub { ">= " . 5 * $_[0] },
1271 on_changed => sub { 1358 on_changed => sub {
1272 my ($slider, $value) = @_; 1359 my ($slider, $value) = @_;
1275 $::CFG->{pickup} |= int $value 1362 $::CFG->{pickup} |= int $value
1276 if $value; 1363 if $value;
1277 1; 1364 1;
1278 }); 1365 });
1279 1366
1280 $table->add (3, 18, new CFPlus::UI::Button 1367 $table->add_at (3, 18, new CFPlus::UI::Button
1281 text => "set", 1368 text => "set",
1282 on_activate => sub { 1369 on_activate => sub {
1283 $::CONN->send_command ("pickup $::CFG->{pickup}") 1370 $::CONN->send_command ("pickup $::CFG->{pickup}")
1284 if defined $::CONN; 1371 if defined $::CONN;
1285 0 1372 0
1286 }); 1373 });
1287 1374
1288 $table 1375 $r
1289} 1376}
1290 1377
1291my %SORT_ORDER = ( 1378my %SORT_ORDER = (
1292 type => undef, 1379 type => undef,
1293 mtime => sub { sort { 1380 mtime => sub {
1381 my $NOW = time;
1382 sort {
1383 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1384 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1385
1294 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1386 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1295 or $b->{mtime} <=> $a->{mtime} 1387 or $btime <=> $atime
1296 or $a->{type} <=> $b->{type} 1388 or $a->{type} <=> $b->{type}
1389 } @_
1297 } @_ }, 1390 },
1298 weight => sub { sort { 1391 weight => sub { sort {
1299 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1392 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1300 or $a->{type} <=> $b->{type} 1393 or $a->{type} <=> $b->{type}
1301 } @_ }, 1394 } @_ },
1302); 1395);
1327 #TODO# update to weigh/maxweight 1420 #TODO# update to weigh/maxweight
1328 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1421 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1329 1422
1330 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1423 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1331 $sw1->add ($INV = new CFPlus::UI::Inventory); 1424 $sw1->add ($INV = new CFPlus::UI::Inventory);
1425 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1332 1426
1333 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1427 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1334 1428
1335 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1429 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1336 1430
1353 $PL_WINDOW->show; 1447 $PL_WINDOW->show;
1354 } 1448 }
1355} 1449}
1356 1450
1357sub player_window { 1451sub player_window {
1358 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1452 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1359 x => "center", 1453 x => "center",
1360 y => "center", 1454 y => "center",
1361 force_w => $WIDTH * 9/10, 1455 force_w => $WIDTH * 9/10,
1362 force_h => $HEIGHT * 9/10, 1456 force_h => $HEIGHT * 9/10,
1363 title => "Player", 1457 title => "Player",
1365 has_close_button => 1 1459 has_close_button => 1
1366 ; 1460 ;
1367 1461
1368 my $ntb = 1462 my $ntb =
1369 $PL_NOTEBOOK = 1463 $PL_NOTEBOOK =
1370 new CFPlus::UI::Notebook expand => 1, debug => 1; 1464 new CFPlus::UI::Notebook expand => 1;
1371 1465
1372 $ntb->add ( 1466 $ntb->add (
1373 "Statistics (F2)" => $STATS_PAGE = stats_window, 1467 "Statistics (F2)" => $STATS_PAGE = stats_window,
1374 "Shows statistics, where all your Stats and Resistances are shown." 1468 "Shows statistics, where all your Stats and Resistances are shown."
1375 ); 1469 );
1376 $ntb->add ( 1470 $ntb->add (
1377 "Skills (F3)" => $SKILL_PAGE = skill_window, 1471 "Skills (F3)" => $SKILL_PAGE = skill_window,
1378 "Shows all your Skills." 1472 "Shows all your Skills."
1379 ); 1473 );
1380 1474
1381 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1475 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1382 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1476 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1383 $ntb->add ( 1477 $ntb->add (
1384 "Spellbook (F4)" => $spellsw, 1478 "Spellbook (F4)" => $spellsw,
1385 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1479 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1386 ); 1480 );
1387 $ntb->add ( 1481 $ntb->add (
1388 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1482 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1389 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1483 "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." 1484 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1391 ); 1485 );
1486 $ntb->add (Pickup => autopickup_setup,
1487 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1392 1488
1393 $ntb->set_current_page ($INVENTORY_PAGE); 1489 $ntb->set_current_page ($INVENTORY_PAGE);
1394 1490
1395 $plwin->add ($ntb); 1491 $plwin->add ($ntb);
1396 $plwin 1492 $plwin
1397} 1493}
1398 1494
1399sub update_bindings {
1400 $BIND_UPD_CB->() if $BIND_UPD_CB;
1401}
1402
1403sub keyboard_setup { 1495sub keyboard_setup {
1404 my $binding_list = new CFPlus::UI::VBox; 1496 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} 1497}
1510 1498
1511sub help_window { 1499sub help_window {
1512 my $win = new CFPlus::UI::FancyFrame 1500 my $win = new CFPlus::UI::Toplevel
1513 x => 'center', 1501 x => 'center',
1514 y => 'center', 1502 y => 'center',
1515 z => 2, 1503 z => 4,
1516 name => 'doc_browser', 1504 name => 'doc_browser',
1517 force_w => int $WIDTH * 7/8, 1505 force_w => int $WIDTH * 7/8,
1518 force_h => int $HEIGHT * 7/8, 1506 force_h => int $HEIGHT * 7/8,
1519 title => "Help Browser", 1507 title => "Help Browser",
1520 has_close_button => 1; 1508 has_close_button => 1;
1521 1509
1522 $win->add (my $vbox = new CFPlus::UI::VBox); 1510 $win->add (my $vbox = new CFPlus::UI::VBox);
1523 1511
1512 $vbox->add (new CFPlus::UI::FancyFrame
1513 label => "Navigation",
1524 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1514 child => (my $buttons = new CFPlus::UI::HBox),
1515 );
1525 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1516 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1526 expand => 1, fontsize => 0.8, padding_x => 4); 1517 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1527 1518
1528 $buttons->add (new CFPlus::UI::Label text => "Choose a document to display: "); 1519 my @history;
1529 $buttons->add (my $combo = new CFPlus::UI::Selector 1520 my @future;
1530 value => undef, 1521 my $curnode;
1531 options => [ 1522
1532 [intro => "Introduction"], 1523 my $load_node; $load_node = sub {
1533 [manual => "Main Manual"], 1524 my ($node, $para) = @_;
1534 [skill_help => "Skill Reference"], 1525
1535 [command_help => "Command Reference"], 1526 $buttons->clear;
1536 [dmcommand_help => "DM Commands"], 1527
1537 [COPYING => "License Terms"], 1528 $buttons->add (new CFPlus::UI::Button
1538 ], 1529 text => "⇤",
1530 tooltip => "back to the starting page",
1539 on_changed => sub { 1531 on_activate => sub {
1540 my ($self, $pod) = @_; 1532 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1541 1533 unshift @future, @history;
1542 $viewer->clear; 1534 @history = ();
1543 $viewer->add_paragraph (CFPlus::Pod::section pod => $pod); 1535 $load_node->(@{shift @future});
1544 $viewer->set_offset (0);
1545
1546 0 1536 },
1537 );
1538
1539 if (@history) {
1540 $buttons->add (new CFPlus::UI::Button
1541 text => "⋘",
1542 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1543 on_activate => sub {
1544 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1545 $load_node->(@{pop @history});
1546 },
1547 );
1547 }, 1548 }
1548 on_visibility_change => sub { 1549
1549 my ($self, $visible) = @_; 1550 if (@future) {
1550 return unless $visible; 1551 $buttons->add (new CFPlus::UI::Button
1551 return if $self->{value}; 1552 text => "⋙",
1552 $self->set_value ("intro"); 1553 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1554 on_activate => sub {
1555 push @history, [$curnode, $viewer->current_paragraph];
1556 $load_node->(@{shift @future});
1557 },
1553 0 1558 );
1554 }, 1559 }
1560
1561 $buttons->add (new CFPlus::UI::Label text => " ");
1562
1563 my @path = CFPlus::Pod::full_path_of $node;
1564 pop @path; # drop current node
1565
1566 for my $node (@path) {
1567 $buttons->add (new CFPlus::UI::Button
1568 text => $node->{kw}[0],
1569 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1570 on_activate => sub {
1571 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1572 $load_node->($node);
1573 },
1574 );
1575 $buttons->add (new CFPlus::UI::Label text => "/");
1576 }
1577
1578 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1579
1580 $curnode = $node;
1581
1582 $viewer->clear;
1583 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1584 $viewer->scroll_to ($para);
1555 ); 1585 };
1586
1587 $load_node->(CFPlus::Pod::find pod => "mainpage");
1588
1589 $CFPlus::Pod::goto_document = sub {
1590 my (@path) = @_;
1591
1592 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1593
1594 $load_node->((CFPlus::Pod::find @path)[0]);
1595 $win->show;
1596 };
1556 1597
1557 $win 1598 $win
1599}
1600
1601sub open_string_query {
1602 my ($title, $cb, $txt, $tooltip) = @_;
1603 my $dialog = new CFPlus::UI::Toplevel
1604 x => "center",
1605 y => "center",
1606 z => 50,
1607 force_w => $WIDTH * 4/5,
1608 title => $title;
1609
1610 $dialog->add (
1611 my $e = new CFPlus::UI::Entry
1612 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1613 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1614 tooltip => $tooltip
1615 );
1616
1617 $e->grab_focus;
1618 $e->set_text ($txt) if $txt;
1619 $dialog->show;
1620}
1621
1622sub open_quit_dialog {
1623 unless ($QUIT_DIALOG) {
1624 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1625 x => "center",
1626 y => "center",
1627 z => 50,
1628 title => "Really Quit?",
1629 on_key_down => sub {
1630 my ($dialog, $ev) = @_;
1631 $ev->{sym} == 27 and $dialog->hide;
1632 }
1633 ;
1634
1635 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1636
1637 $vb->add (new CFPlus::UI::Label
1638 text => "You should find a savebed and apply it first!",
1639 max_w => $WIDTH * 0.25,
1640 ellipsize => 0,
1641 );
1642 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1643 $hb->add (new CFPlus::UI::Button
1644 text => "Ok",
1645 expand => 1,
1646 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1647 );
1648 $hb->add (new CFPlus::UI::Button
1649 text => "Quit anyway",
1650 expand => 1,
1651 on_activate => sub { exit },
1652 );
1653 }
1654
1655 $QUIT_DIALOG->show;
1656 $QUIT_DIALOG->grab_focus;
1657}
1658
1659sub show_tip_of_the_day {
1660 # find all tips
1661 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1662
1663 CFPlus::DB::get state => "tip_of_the_day", sub {
1664 my ($todindex) = @_;
1665 $todindex = 0 if $todindex >= @tod;
1666 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1667
1668 # create dialog
1669 my $dialog;
1670
1671 my $close = sub {
1672 $dialog->destroy;
1673 };
1674
1675 $dialog = new CFPlus::UI::Toplevel
1676 x => "center",
1677 y => "center",
1678 z => 3,
1679 name => 'tip_of_the_day',
1680 force_w => int $WIDTH * 4/9,
1681 force_h => int $WIDTH * 2/9,
1682 title => "Tip of the day #" . (1 + $todindex),
1683 child => my $vbox = new CFPlus::UI::VBox,
1684 has_close_button => 1,
1685 on_delete => $close,
1686 ;
1687
1688 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1689 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1690 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1691
1692 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1693
1694 $table->add_at (0, 0, new CFPlus::UI::Button
1695 text => "Close",
1696 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>.",
1697 on_activate => $close,
1698 );
1699
1700 $table->add_at (2, 0, new CFPlus::UI::Button
1701 text => "Next",
1702 tooltip => "Show the next <b>Tip of the day</b>.",
1703 on_activate => sub {
1704 $close->();
1705 &show_tip_of_the_day;
1706 },
1707 );
1708
1709 $dialog->show;
1710 };
1558} 1711}
1559 1712
1560sub sdl_init { 1713sub sdl_init {
1561 CFPlus::SDL_Init 1714 CFPlus::SDL_Init
1562 and die "SDL::Init failed!\n"; 1715 and die "SDL::Init failed!\n";
1563} 1716}
1564 1717
1565sub video_init { 1718sub video_init {
1566 sdl_init;
1567
1568 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1719 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1569 1720
1570 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1721 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1571 1722
1572 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1723 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1573 $FULLSCREEN = $CFG->{fullscreen}; 1724 $FULLSCREEN = $CFG->{fullscreen};
1574 $FAST = $CFG->{fast}; 1725 $FAST = $CFG->{fast};
1575 1726
1576 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1727 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1577 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1728 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1578 1729
1579 $SDL_ACTIVE = 1; 1730 $SDL_ACTIVE = 1;
1580 $LAST_REFRESH = time - 0.01; 1731 $LAST_REFRESH = time - 0.01;
1581 1732
1597 z => 100, 1748 z => 100,
1598 force_x => "max", 1749 force_x => "max",
1599 force_y => 0; 1750 force_y => 0;
1600 $DEBUG_STATUS->show; 1751 $DEBUG_STATUS->show;
1601 1752
1602 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1603
1604 $STATUSBOX = new CFPlus::UI::Statusbox; 1753 $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]); 1754 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1606 1755
1607 (new CFPlus::UI::Frame 1756 (new CFPlus::UI::Frame
1608 bg => [0, 0, 0, 0.4], 1757 bg => [0, 0, 0, 0.4],
1609 force_x => 0, 1758 force_x => 0,
1610 force_y => "max", 1759 force_y => "max",
1611 child => $STATUSBOX, 1760 child => $STATUSBOX,
1612 )->show; 1761 )->show;
1613 1762
1614 CFPlus::UI::FancyFrame->new ( 1763 CFPlus::UI::Toplevel->new (
1615 title => "Map", 1764 title => "Map",
1616 name => "mapmap", 1765 name => "mapmap",
1617 x => 0, 1766 x => 0,
1618 y => $FONTSIZE + 8, 1767 y => $FONTSIZE + 8,
1619 border_bg => [1, 1, 1, 192/255], 1768 border_bg => [1, 1, 1, 192/255],
1644 font => $FONT_FIXED, 1793 font => $FONT_FIXED,
1645 fontsize => $::CFG->{log_fontsize}, 1794 fontsize => $::CFG->{log_fontsize},
1646 indent => -4, 1795 indent => -4,
1647 can_hover => 1, 1796 can_hover => 1,
1648 can_events => 1, 1797 can_events => 1,
1798 max_par => $CFG->{logview_max_par},
1649 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1799 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1650 ; 1800 ;
1651 1801
1652 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1802 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1653 title => "Setup", 1803 title => "Setup",
1654 name => "setup_dialog", 1804 name => "setup_dialog",
1655 x => 'center', 1805 x => 'center',
1656 y => 'center', 1806 y => 'center',
1657 z => 2, 1807 z => 2,
1665 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1815 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1666 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1816 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1667 1817
1668 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1818 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1669 "Configure the server to play on, your username, password and other server-related options."); 1819 "Configure the server to play on, your username, password and other server-related options.");
1670 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1820 $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."); 1821 "Configure various client-specific settings.");
1672 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1822 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1673 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1823 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1674 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1824 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1675 "Configure the use of audio, sound effects and background music."); 1825 "Configure the use of audio, sound effects and background music.");
1676 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1826 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1708 ); 1858 );
1709 1859
1710 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1860 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1711 tooltip => "View Documentation"); 1861 tooltip => "View Documentation");
1712 1862
1863
1713 $BUTTONBAR->add (new CFPlus::UI::Button 1864 $BUTTONBAR->add (new CFPlus::UI::Button
1714 text => "Quit", 1865 text => "Quit",
1715 tooltip => "Terminates the program", 1866 tooltip => "Terminates the program",
1716 on_activate => sub { 1867 on_activate => sub {
1717 if ($CONN) { 1868 if ($CONN) {
1728 } 1879 }
1729 1880
1730 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1881 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1731} 1882}
1732 1883
1884sub setup_build_button {
1885 my ($enabled) = @_;
1886 if ($enabled) {
1887 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1888 $BUILD_BUTTON ||= new CFPlus::UI::Button
1889 text => "Build",
1890 tooltip => "Opens the ingame builder",
1891 on_activate => sub {
1892 if ($CONN) {
1893 $CONN->send_ext_req (builder_player_items => sub {
1894 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1895 });
1896 }
1897 0
1898 };
1899 $BUTTONBAR->add ($BUILD_BUTTON);
1900 } else {
1901 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1902 }
1903}
1904
1905sub open_ingame_editor {
1906 my ($msg) = @_;
1907
1908 my $win = new CFPlus::UI::Toplevel
1909 x => 0,
1910 y => 'center',
1911 z => 4,
1912 name => 'builder_window',
1913 force_w => int $WIDTH * 1/4,
1914 force_h => int $HEIGHT * 3/4,
1915 title => "In game builder",
1916 has_close_button => 1;
1917
1918 my $r = new CFPlus::UI::ScrolledWindow (
1919 expand => 1,
1920 scroll_y => 1
1921 );
1922 $r->add (my $vb = new CFPlus::UI::VBox);
1923 $win->add ($r);
1924
1925
1926 $vb->add (
1927 new CFPlus::UI::Button
1928 text => "Disable build mode",
1929 on_activate => sub { $::IN_BUILD_MODE = undef }
1930 );
1931 $vb->add (
1932 new CFPlus::UI::Button
1933 text => "ERASE",
1934 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1935 );
1936
1937 for my $itemarchname (
1938 sort {
1939 $msg->{items}->{$a}->{build_arch_name}
1940 cmp $msg->{items}->{$b}->{build_arch_name}
1941 } keys %{$msg->{items}}
1942 ) {
1943 my $info = $msg->{items}->{$itemarchname};
1944 $vb->add (
1945 new CFPlus::UI::Button text => $info->{build_arch_name},
1946 on_activate => sub {
1947 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1948
1949 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1950 build_mode_query_arch_info ();
1951 }
1952 }
1953 );
1954 }
1955
1956 $win->show;
1957}
1958
1959sub build_mode_query_arch_info {
1960 my ($iteminfo) = $::IN_BUILD_MODE;
1961 my $itemarchname = $iteminfo->{item};
1962 my $info = $iteminfo->{info};
1963
1964 my $dialog = new CFPlus::UI::Toplevel
1965 x => "center",
1966 y => "center",
1967 z => 50,
1968 force_w => int $WIDTH * 1/2,
1969 title => "Enter information for placement of '$itemarchname'",
1970 has_close_button => 1;
1971
1972 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1973
1974 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1975 my $row = 0;
1976 if ($info->{has_name}) {
1977 $table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
1978 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1979 }
1980 if ($info->{has_text}) {
1981 $table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
1982 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1983 }
1984 if ($info->{has_connection}) {
1985 $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1986 $table->add_at (1, $row++,
1987 new CFPlus::UI::Entry
1988 expand => 1,
1989 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1990 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1991 );
1992 }
1993
1994 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1995 $hb->add (new CFPlus::UI::Button
1996 text => "Close",
1997 expand => 1,
1998 on_activate => sub { $dialog->hide; 0 },
1999 );
2000 $dialog->show;
2001}
2002
1733sub video_shutdown { 2003sub video_shutdown {
1734 CFPlus::OpenGL::shutdown; 2004 CFPlus::OpenGL::shutdown;
1735 2005
1736 undef $SDL_ACTIVE; 2006 undef $SDL_ACTIVE;
1737} 2007}
1738 2008
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 { 2009sub audio_channel_finished {
1743 my ($channel) = @_; 2010 my ($channel) = @_;
1744 2011
1745 #warn "channel $channel finished\n";#d# 2012 #warn "channel $channel finished\n";#d#
1746} 2013}
1747 2014
2015sub audio_music_set {
2016 my ($songs) = @_;
2017
2018 my @want =
2019 grep $_,
2020 map $CONN->{music_meta}{$_},
2021 @$songs;
2022
2023 if (@want) {
2024 @MUSIC_WANT = @want;
2025 &audio_music_changed ();
2026 }
2027}
2028
2029sub audio_music_start {
2030 my $path = $MUSIC_PLAYING->{path}
2031 or return;
2032
2033 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2034 # music might have changed...
2035 $path eq $MUSIC_PLAYING->{path}
2036 or return &audio_music_start ();
2037
2038 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2039
2040 my $NOW = time;
2041
2042 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2043 my $pos = $MUSIC_PLAYING->{stop_pos};
2044 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2045 $MUSIC_START = time - $pos;
2046 } else {
2047 $MUSIC_PLAYER->play (0);
2048 $MUSIC_START = time;
2049 }
2050
2051 delete $MUSIC_PLAYING->{stop_time};
2052 delete $MUSIC_PLAYING->{stop_pos};
2053 }
2054}
2055
2056sub audio_music_changed {
2057 return unless $CFG->{bgm_enable};
2058
2059 # default MUSIC_WANT == MUSIC_DEFAULT
2060 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2061
2062 # if the currently playing song is acceptable, let it continue
2063 return if $MUSIC_PLAYING
2064 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2065
2066 my $NOW = time;
2067
2068 if ($MUSIC_PLAYING) {
2069 $MUSIC_PLAYING->{stop_time} = $NOW;
2070 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2071 CFPlus::MixMusic::fade_out 1000;
2072 } else {
2073 # sort by stop time, oldest first
2074 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2075
2076 # if the most recently-played piece played very recently,
2077 # resume it, else choose the oldest piece for rotation.
2078 $MUSIC_PLAYING =
2079 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2080 ? $MUSIC_WANT[-1]
2081 : $MUSIC_WANT[0];
2082
2083 audio_music_start;
2084 }
2085}
2086
1748sub audio_music_finished { 2087sub audio_music_finished {
1749 return unless $CFG->{bgm_enable}; 2088 $MUSIC_PLAYING = undef;
2089 undef $MUSIC_PLAYER;
1750 2090
1751 # TODO: hack, do play loop and mood music 2091 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} 2092}
1757 2093
1758sub audio_init { 2094sub audio_init {
1759 if ($CFG->{audio_enable}) { 2095 if ($CFG->{audio_enable}) {
1760 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2096 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1768 CFPlus::Mix_AllocateChannels 8; 2104 CFPlus::Mix_AllocateChannels 8;
1769 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 2105 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1770 2106
1771 audio_music_finished; 2107 audio_music_finished;
1772 2108
2109 local $_;
1773 while (<$fh>) { 2110 while (<$fh>) {
1774 next if /^\s*#/; 2111 next if /^\s*#/;
1775 next if /^\s*$/; 2112 next if /^\s*$/;
1776 2113
1777 my ($file, $volume, $event) = split /\s+/, $_, 3; 2114 my ($file, $volume, $event) = split /\s+/, $_, 3;
1809 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2146 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1810 2147
1811 $CFPlus::UI::ROOT->draw; 2148 $CFPlus::UI::ROOT->draw;
1812 2149
1813 $WANT_REFRESH = 0; 2150 $WANT_REFRESH = 0;
1814 $CAN_REFRESH = 0; 2151 $CAN_REFRESH = 0;
1815 $LAST_REFRESH = $NOW; 2152 $LAST_REFRESH = $NOW;
1816 2153
1817 CFPlus::SDL_GL_SwapBuffers; 2154 CFPlus::SDL_GL_SwapBuffers;
1818} 2155}
1819 2156
1820my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2157my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1821 $NOW = time; 2158 $NOW = time;
1822 2159
1823 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2160 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1824 for CFPlus::SDL_PollEvent; 2161 for CFPlus::poll_events;
1825 2162
1826 if (%animate_object) { 2163 if (%animate_object) {
1827 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2164 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1828 $WANT_REFRESH++; 2165 ++$WANT_REFRESH;
1829 } 2166 }
1830 2167
1831 if ($WANT_REFRESH) { 2168 if ($WANT_REFRESH) {
1832 force_refresh; 2169 force_refresh;
1833 } else { 2170 } else {
1854 if $CONN; 2191 if $CONN;
1855}); 2192});
1856 2193
1857%SDL_CB = ( 2194%SDL_CB = (
1858 CFPlus::SDL_QUIT => sub { 2195 CFPlus::SDL_QUIT => sub {
1859 Event::unloop -1; 2196 exit;
1860 }, 2197 },
1861 CFPlus::SDL_VIDEORESIZE => sub { 2198 CFPlus::SDL_VIDEORESIZE => sub {
1862 }, 2199 },
1863 CFPlus::SDL_VIDEOEXPOSE => sub { 2200 CFPlus::SDL_VIDEOEXPOSE => sub {
1864 CFPlus::UI::full_refresh; 2201 CFPlus::UI::full_refresh;
1865 }, 2202 },
1866 CFPlus::SDL_ACTIVEEVENT => sub { 2203 CFPlus::SDL_ACTIVEEVENT => sub {
1867# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2204# not useful, as APPACTIVE include sonly iconified state, not unmapped
2205# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2206# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2207# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2208# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2209# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1868 }, 2210 },
1869 CFPlus::SDL_KEYDOWN => sub { 2211 CFPlus::SDL_KEYDOWN => sub {
1870 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2212 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1871 # alt-enter 2213 # alt-enter
1872 $FULLSCREEN_ENABLE->toggle; 2214 $FULLSCREEN_ENABLE->toggle;
1893 2235
1894$SIG{INT} = $SIG{TERM} = sub { exit }; 2236$SIG{INT} = $SIG{TERM} = sub { exit };
1895 2237
1896{ 2238{
1897 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2239 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2240 CFPlus::DB::Server::run;
2241
1898 CFPlus::UI::set_layout ($::CFG->{layout}); 2242 CFPlus::UI::set_layout ($::CFG->{layout});
1899 2243
1900 my %DEF_CFG = ( 2244 my %DEF_CFG = (
1901 sdl_mode => 0, 2245 sdl_mode => 0,
1902 width => 640, 2246 width => 640,
1903 height => 480, 2247 height => 480,
1904 fullscreen => 0, 2248 fullscreen => 0,
1905 fast => 0, 2249 fast => 0,
1906 map_scale => 1, 2250 map_scale => 1,
1907 fow_enable => 1, 2251 fow_enable => 1,
1908 fow_intensity => 0.45, 2252 fow_intensity => 0,
1909 fow_smooth => 0, 2253 map_smoothing => 1,
1910 gui_fontsize => 1, 2254 gui_fontsize => 1,
1911 log_fontsize => 0.7, 2255 log_fontsize => 0.7,
1912 gauge_fontsize => 1, 2256 gauge_fontsize => 1,
1913 gauge_size => 0.35, 2257 gauge_size => 0.35,
1914 stat_fontsize => 0.7, 2258 stat_fontsize => 0.7,
1915 mapsize => 100, 2259 mapsize => 100,
1916 say_command => 'say', 2260 say_command => 'chat',
1917 audio_enable => 1, 2261 audio_enable => 1,
1918 bgm_enable => 1, 2262 bgm_enable => 1,
1919 bgm_volume => 0.25, 2263 bgm_volume => 0.25,
1920 face_prefetch => 0, 2264 face_prefetch => 0,
1921 output_sync => 1, 2265 output_sync => 1,
1922 output_count => 1, 2266 output_count => 1,
2267 output_rate => "",
1923 pickup => 0, 2268 pickup => 0,
1924 inv_sort => "mtime", 2269 inv_sort => "mtime",
1925 default => "profile", # default profile 2270 default => "profile", # default profile
2271 show_tips => 1,
2272 logview_max_par => 1000,
1926 ); 2273 );
1927 2274
1928 while (my ($k, $v) = each %DEF_CFG) { 2275 while (my ($k, $v) = each %DEF_CFG) {
1929 $CFG->{$k} = $v unless exists $CFG->{$k}; 2276 $CFG->{$k} = $v unless exists $CFG->{$k};
1930 } 2277 }
1931 2278
1932 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2279 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2280 $PROFILE = $CFG->{profile}{default};
2281
2282 # convert old bindings (only default profile matters)
2283 if (my $bindings = delete $PROFILE->{bindings}) {
2284 while (my ($mod, $syms) = each %$bindings) {
2285 while (my ($sym, $cmds) = each %$syms) {
2286 push @{ $PROFILE->{macro} }, {
2287 accelkey => [$mod*1, $sym*1],
2288 action => $cmds,
2289 };
2290 }
2291 }
2292 }
1933 2293
1934 sdl_init; 2294 sdl_init;
1935 2295
1936 @SDL_MODES = reverse 2296 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1937 grep $_->[0] >= 640 && $_->[1] >= 480, 2297 @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)"; 2298 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2299
2300 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
1941 2301
1942 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2302 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1943 2303
1944 { 2304 {
1945 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2305 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1974# } 2334# }
1975# my $t2 = Time::HiRes::time; 2335# my $t2 = Time::HiRes::time;
1976# warn $t2-$t1; 2336# warn $t2-$t1;
1977# } 2337# }
1978 2338
2339 $startup_done->();
2340
1979 video_init; 2341 video_init;
1980 audio_init; 2342 audio_init;
1981} 2343}
2344
2345show_tip_of_the_day if $CFG->{show_tips};
1982 2346
1983Event::loop; 2347Event::loop;
1984#CFPlus::SDL_Quit; 2348#CFPlus::SDL_Quit;
1985#CFPlus::_exit 0; 2349#CFPlus::_exit 0;
1986 2350
2351END {
1987END { CFPlus::SDL_Quit } 2352 CFPlus::SDL_Quit;
2353 CFPlus::DB::Server::stop;
2354}
1988 2355
1989=head1 NAME 2356=head1 NAME
1990 2357
1991cfplus - A Crossfire+ and Crossfire game client 2358cfplus - A Crossfire+ and Crossfire game client
1992 2359

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines