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.112 by root, Sun Aug 13 20:01:14 2006 UTC vs.
Revision 1.178 by root, Fri Jul 20 16:32:04 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4our $PANGO = "1.5.0";
5
6# do splash-screen thingy on win32
7BEGIN {
8 if (%PAR::LibCache && $^O eq "MSWin32") {
9 while (my ($filename, $zip) = each %PAR::LibCache) {
10 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
11 }
12
13 require Win32::GUI::SplashScreen;
14
15 Win32::GUI::SplashScreen::Show (
16 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
17 );
18
19 $startup_done = sub {
20 Win32::GUI::SplashScreen::Done (1);
21 };
22 }
23}
2 24
3use strict; 25use strict;
4use utf8; 26use utf8;
27
28use Carp 'verbose';
5 29
6# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
7BEGIN { 31BEGIN {
8 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 34
35 my $tmp = $ENV{PAR_TEMP};
36
11 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 38 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 39 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
16 } 42 }
17 } 43 }
18 44
19 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
20 54
21 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
22 } 67 }
23} 68}
24 69
25# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
… …
35use Compress::LZF; 80use Compress::LZF;
36 81
37use CFPlus; 82use CFPlus;
38use CFPlus::OpenGL (); 83use CFPlus::OpenGL ();
39use CFPlus::Protocol; 84use CFPlus::Protocol;
85use CFPlus::DB;
40use CFPlus::UI; 86use CFPlus::UI;
87use CFPlus::UI::Inventory;
88use CFPlus::UI::SpellList;
41use CFPlus::Pod; 89use CFPlus::Pod;
42use CFPlus::BindingEditor;
43use CFPlus::MapWidget; 90use CFPlus::MapWidget;
91use CFPlus::Macro;
44 92
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 93$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 94$SIG{PIPE} = 'IGNORE';
47 95
48$Event::Eval = 0; 96$Event::Eval = 1;
49$Event::DIED = sub { 97$Event::DIED = sub {
50 # TODO: display dialog box or so 98 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFPlus::error $_[1];
53}; 99};
54
55$SIG{__DIE__} = sub {
56 return if CFPlus::in_destruct;
57 Carp::cluck $_[0];
58 CFPlus::error $_[0];
59 return;#d#
60 #return unless defined $^S && !$^S;
61 $Event::DIED->(undef, $_[0]);
62};
63
64our $VERSION = '0.1';
65 100
66my $MAX_FPS = 60; 101my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 102my $MIN_FPS = 5; # unused as of yet
68 103
69our $META_SERVER = "crossfire.real-time.com:13326"; 104our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 105
71our $LAST_REFRESH; 106our $LAST_REFRESH;
72our $NOW; 107our $NOW;
73 108
74our $CFG; 109our $CFG;
75our $CONN; 110our $CONN;
111our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 112our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 113
78our $WANT_REFRESH; 114our $WANT_REFRESH;
79our $CAN_REFRESH; 115our $CAN_REFRESH;
80 116
… …
111 147
112our $INVENTORY_PAGE; 148our $INVENTORY_PAGE;
113our $STATS_PAGE; 149our $STATS_PAGE;
114our $SKILL_PAGE; 150our $SKILL_PAGE;
115our $SPELL_PAGE; 151our $SPELL_PAGE;
152our $SPELL_LIST;
116 153
117our $HELP_WINDOW; 154our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 155our $MESSAGE_WINDOW;
119our $FLOORBOX; 156our $FLOORBOX;
120our $GAUGES; 157our $GAUGES;
… …
122 159
123our $SDL_ACTIVE; 160our $SDL_ACTIVE;
124our %SDL_CB; 161our %SDL_CB;
125 162
126our $SDL_MIXER; 163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT;
166our $MUSIC_START;
167our $MUSIC_PLAYING;
168our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
127our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
128our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
129 172
130our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
131our $STATUSBOX; 174our $STATUSBOX;
… …
133 176
134our $INV; 177our $INV;
135our $INVR; 178our $INVR;
136our $INV_RIGHT_HB; 179our $INV_RIGHT_HB;
137 180
138our $BIND_EDITOR;
139our $BIND_UPD_CB;
140
141our $PICKUP_CFG; 181our $PICKUP_CFG;
182
183our $IN_BUILD_MODE;
184our $BUILD_BUTTON;
142 185
143sub status { 186sub status {
144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 187 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 188}
146 189
147sub debug { 190sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 191 $DEBUG_STATUS->set_text ($_[0]);
192}
193
194sub message {
195 my ($para) = @_;
196
197 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
198
199 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
200
201 $LOGVIEW->add_paragraph ($para);
202 $LOGVIEW->scroll_to_bottom;
149} 203}
150 204
151sub destroy_query_dialog { 205sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 206 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 207 if $_[0]{query_dialog};
154} 208}
155 209
210# FIXME: a very ugly hack to wait for stat update look below! #d#
211our $QUERY_TIMER; #d#
212
156# server query dialog 213# server query dialog
157sub server_query { 214sub server_query {
158 my ($conn, $flags, $prompt) = @_; 215 my ($conn, $flags, $prompt) = @_;
159 216
217 # FIXME: a very ugly hack to wait for stat update #d#
218 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
219 unless ($QUERY_TIMER) {
220 $QUERY_TIMER =
221 Event->timer (
222 after => 1,
223 cb => sub {
224 server_query ($conn, $flags, $prompt, 1);
225 $QUERY_TIMER = undef
226 }
227 );
228 return;
229 }
230 }
231
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame 232 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 233 x => "center",
162 y => "center", 234 y => "center",
163 title => "Server Query", 235 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 236 child => my $vbox = new CFPlus::UI::VBox,
165 ; 237 ;
166 238
167 my @dialog = my $label = new CFPlus::UI::Label 239 my @dialog = my $label = new CFPlus::UI::Label
168 max_w => $::WIDTH * 0.4, 240 max_w => $::WIDTH * 0.8,
169 ellipsise => 0, 241 ellipsise => 0,
170 text => $prompt; 242 text => $prompt;
171 243
172 if ($flags & CS_QUERY_YESNO) { 244 if ($flags & CS_QUERY_YESNO) {
173 push @dialog, my $hbox = new CFPlus::UI::HBox; 245 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
190 ); 262 );
191 263
192 $dialog->grab_focus; 264 $dialog->grab_focus;
193 265
194 } elsif ($flags & CS_QUERY_SINGLECHAR) { 266 } elsif ($flags & CS_QUERY_SINGLECHAR) {
195 $dialog->{tooltip} = "#charcreation_focus";
196
197 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 267 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
198 $MESSAGE_WINDOW->show; 268 $dialog->{tooltip} = "#charcreation_focus";
199 269
200 unshift @dialog, new CFPlus::UI::Label 270 unshift @dialog, new CFPlus::UI::Label
201 max_w => $::WIDTH * 0.4, 271 max_w => $::WIDTH * 0.8,
202 ellipsise => 0, 272 ellipsise => 0,
203 markup => "\nOr use your keyboard and the text entry below:\n"; 273 markup => "\nOr use your keyboard and the text entry below:\n";
204 274
205 unshift @dialog, my $table = new CFPlus::UI::Table; 275 unshift @dialog, my $table = new CFPlus::UI::Table;
206 276
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 => (CFPlus::Pod::section_label ui => "chargen_race"), 320 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
228 ; 321 ;
… …
232 $conn->send ("reply $stat"); 325 $conn->send ("reply $stat");
233 destroy_query_dialog $conn; 326 destroy_query_dialog $conn;
234 return; 327 return;
235 } 328 }
236 329
237 $STATS_PAGE->show;
238 $MESSAGE_WINDOW->hide;
239
240 unshift @dialog, new CFPlus::UI::Label 330 unshift @dialog, new CFPlus::UI::Label
241 max_w => $::WIDTH * 0.4, 331 max_w => $::WIDTH * 0.4,
242 ellipsise => 0, 332 ellipsise => 0,
243 markup => "\nOr use your keyboard and the text entry below:\n"; 333 markup => "\nOr use your keyboard and the text entry below:\n";
244 334
245 unshift @dialog, my $table = new CFPlus::UI::Table; 335 unshift @dialog, my $table = new CFPlus::UI::Table;
246 336
247 # left: re-roll 337 # left: re-roll
248 $table->add (0, 0, new CFPlus::UI::Button 338 $table->add_at (0, 0, new CFPlus::UI::Button
249 text => "Roll Again", 339 text => "Roll Again",
250 on_activate => sub { 340 on_activate => sub {
251 $conn->send ("reply y"); 341 $conn->send ("reply y");
252 destroy_query_dialog $conn; 342 destroy_query_dialog $conn;
253 0 343 0
… …
267 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 357 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
268 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 358 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
269 ], 359 ],
270 ), 1 .. 2; 360 ), 1 .. 2;
271 361
272 $table->add (2, 0, new CFPlus::UI::Button 362 $table->add_at (2, 0, new CFPlus::UI::Button
273 text => "Swap Stats", 363 text => "Swap Stats",
274 on_activate => sub { 364 on_activate => sub {
275 $conn->{stat_change_with} = $sw2->{value}; 365 $conn->{stat_change_with} = $sw2->{value};
276 $conn->send ("reply $sw1->{value}"); 366 $conn->send ("reply $sw1->{value}");
277 destroy_query_dialog $conn; 367 destroy_query_dialog $conn;
278 0 368 0
279 }, 369 },
280 ); 370 );
281 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 371 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
282 372
283 # right: accept 373 # right: accept
284 $table->add (4, 0, new CFPlus::UI::Button 374 $table->add_at (4, 0, new CFPlus::UI::Button
285 text => "Accept", 375 text => "Accept",
286 on_activate => sub { 376 on_activate => sub {
287 $conn->send ("reply n"); 377 $conn->send ("reply n");
288 $STATS_PAGE->hide; 378 $STATS_PAGE->hide;
289 destroy_query_dialog $conn; 379 destroy_query_dialog $conn;
… …
354 $LOGIN_BUTTON->set_text ("Logout"); 444 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 445 $SETUP_DIALOG->hide;
356 446
357 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;
358 448
359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 449 my ($host, $port) = split /:/, $PROFILE->{host};
360 450
361 $MAP = new CFPlus::Map $mapsize, $mapsize; 451 $MAP = new CFPlus::Map;
362 452
363 $CONN = eval { 453 $CONN = eval {
364 new CFPlus::Protocol 454 new CFPlus::Protocol
365 host => $host, 455 host => $host,
366 port => $port || 13327, 456 port => $port || 13327,
367 user => $CFG->{profile}{default}{user}, 457 user => $PROFILE->{user},
368 pass => $CFG->{profile}{default}{password}, 458 pass => $PROFILE->{password},
369 mapw => $mapsize, 459 mapw => $mapsize,
370 maph => $mapsize, 460 maph => $mapsize,
461
462 client => "cfplus $CFPlus::VERSION $] $^O",
371 463
372 map_widget => $MAPWIDGET, 464 map_widget => $MAPWIDGET,
373 logview => $LOGVIEW, 465 logview => $LOGVIEW,
374 statusbox => $STATUSBOX, 466 statusbox => $STATUSBOX,
375 map => $MAP, 467 map => $MAP,
376 mapmap => $MAPMAP, 468 mapmap => $MAPMAP,
377 query => \&server_query, 469 query => \&server_query,
378 470
471 setup_req => {
472 smoothing => $CFG->{map_smoothing}*1,
473 },
474
379 sound_play => sub { 475 sound_play => sub {
380 my ($x, $y, $soundnum, $type) = @_; 476 my ($x, $y, $soundnum, $type) = @_;
381 477
382 $SDL_MIXER 478 $SDL_MIXER
383 or return; 479 or return;
… …
402sub stop_game { 498sub stop_game {
403 $LOGIN_BUTTON->set_text ("Login"); 499 $LOGIN_BUTTON->set_text ("Login");
404 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 500 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
405 $SETUP_DIALOG->show; 501 $SETUP_DIALOG->show;
406 $PL_WINDOW->hide; 502 $PL_WINDOW->hide;
407 $SPELL_PAGE->clear_spells; 503 $SPELL_LIST->clear_spells;
504 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
505
506 &audio_music_set ([]);
408 507
409 return unless $CONN; 508 return unless $CONN;
410 509
411 status "connection closed"; 510 status "connection closed";
412 511
… …
420sub graphics_setup { 519sub graphics_setup {
421 my $vbox = new CFPlus::UI::VBox; 520 my $vbox = new CFPlus::UI::VBox;
422 521
423 $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]);
424 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
425 $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");
426 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 536 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
427 537
538 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
428 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 539 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
429 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 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);
430 544
431 $mode_slider->connect (changed => sub { 545 $mode_slider->connect (changed => sub {
432 my ($self, $value) = @_; 546 my ($self, $value) = @_;
433 547
434 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 548 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
435 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 549 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
436 }); 550 });
437 $mode_slider->emit (changed => $mode_slider->{range}[0]); 551 $mode_slider->emit (changed => $mode_slider->{range}[0]);
438 552
439 my $row = 1;
440
441 $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");
442 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 554 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
443 state => $CFG->{fullscreen}, 555 state => $CFG->{fullscreen},
444 tooltip => "Bring the client into fullscreen mode.", 556 tooltip => "Bring the client into fullscreen mode.",
445 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 557 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
446 ); 558 );
447 559
448 $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");
449 $table->add (1, $row++, new CFPlus::UI::CheckBox 561 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
450 state => $CFG->{fast}, 562 state => $CFG->{fast},
451 tooltip => "Lower the visual quality considerably to speed up rendering.", 563 tooltip => "Lower the visual quality considerably to speed up rendering.",
452 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 564 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
453 ); 565 );
454 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
455 $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");
456 $table->add (1, $row++, new CFPlus::UI::Slider 585 $table->add_at (1, $row++, new CFPlus::UI::Slider
457 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 586 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
458 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 587 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
459 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 }
460 ); 589 );
461 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
462 $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");
463 $table->add (1, $row++, new CFPlus::UI::CheckBox 601 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
464 state => $CFG->{fow_enable}, 602 state => $CFG->{fow_enable},
465 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.",
466 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 604 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
467 ); 605 );
468 606
469 $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");
470 $table->add (1, $row++, new CFPlus::UI::Slider 608 $table->add_at (1, $row++, new CFPlus::UI::Slider
471 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 609 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
472 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.",
473 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 611 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
474 ); 612 );
475 613
476 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
477 $table->add (1, $row++, new CFPlus::UI::CheckBox
478 state => $CFG->{fow_smooth},
479 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
480 on_changed => sub {
481 my ($self, $value) = @_;
482 $CFG->{fow_smooth} = $value;
483 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
484 0
485 }
486 );
487
488 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
489 $table->add (1, $row++, new CFPlus::UI::Slider
490 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
491 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
492 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
493 );
494
495 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 614 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
496 $table->add (1, $row++, new CFPlus::UI::Slider 615 $table->add_at (1, $row++, new CFPlus::UI::Slider
497 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 616 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
498 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 617 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
499 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 618 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
500 ); 619 );
501 620
502 $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");
503 $table->add (1, $row++, new CFPlus::UI::Slider 622 $table->add_at (1, $row++, new CFPlus::UI::Slider
504 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 623 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
505 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.",
506 on_changed => sub { 625 on_changed => sub {
507 $CFG->{gauge_fontsize} = $_[1]; 626 $CFG->{gauge_fontsize} = $_[1];
508 &set_gauge_window_fontsize; 627 &set_gauge_window_fontsize;
509 0 628 0
510 } 629 }
511 ); 630 );
512 631
513 $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");
514 $table->add (1, $row++, new CFPlus::UI::Slider 633 $table->add_at (1, $row++, new CFPlus::UI::Slider
515 range => [$CFG->{gauge_size}, 0.2, 0.8], 634 range => [$CFG->{gauge_size}, 0.2, 0.8],
516 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.",
517 on_changed => sub { 636 on_changed => sub {
518 $CFG->{gauge_size} = $_[1]; 637 $CFG->{gauge_size} = $_[1];
519 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 638 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
520 0 639 0
521 } 640 }
522 ); 641 );
523 642
524 $table->add (1, $row++, new CFPlus::UI::Button
525 expand => 1, align => 0, text => "Apply",
526 tooltip => "Apply the video settings",
527 on_activate => sub {
528 video_shutdown ();
529 video_init ();
530 0
531 }
532 );
533
534 $vbox 643 $vbox
535} 644}
536 645
537sub audio_setup { 646sub audio_setup {
538 my $vbox = new CFPlus::UI::VBox; 647 my $vbox = new CFPlus::UI::VBox;
539 648
540 $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]);
541 650
542 my $row = 0; 651 my $row = 0;
543 652
544 $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");
545 $table->add (1, $row++, new CFPlus::UI::CheckBox 654 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
546 state => $CFG->{audio_enable}, 655 state => $CFG->{audio_enable},
547 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.",
548 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 657 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
549 ); 658 );
550# $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");
551# $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 {
552# $CFG->{effects_volume} = $_[1]; 661# $CFG->{effects_volume} = $_[1];
553# }); 662# });
554 $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");
555 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 664 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
556 $hbox->add (new CFPlus::UI::CheckBox 665 $hbox->add (new CFPlus::UI::CheckBox
557 expand => 1, state => $CFG->{bgm_enable}, 666 expand => 1, state => $CFG->{bgm_enable},
558 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.",
559 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 668 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
560 ); 669 );
… …
562 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 671 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
563 tooltip => "The volume of the background music. Changes are instant.", 672 tooltip => "The volume of the background music. Changes are instant.",
564 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 }
565 ); 674 );
566 675
567 $table->add (1, $row++, new CFPlus::UI::Button 676 $table->add_at (1, $row++, new CFPlus::UI::Button
568 expand => 1, align => 0, text => "Apply", 677 expand => 1, align => 0, text => "Apply",
569 tooltip => "Apply the audio settings", 678 tooltip => "Apply the audio settings",
570 on_activate => sub { 679 on_activate => sub {
571 audio_shutdown (); 680 audio_shutdown ();
572 audio_init (); 681 audio_init ();
… …
631} 740}
632 741
633sub debug_setup { 742sub debug_setup {
634 my $table = new CFPlus::UI::Table; 743 my $table = new CFPlus::UI::Table;
635 744
636 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 745 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
637 $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 });
638 $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");
639 $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 });
640 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 749 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
641 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 750 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
642 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 751 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
643 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 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() } );
644 754
645 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#
646
647 for my $x (0..2) {
648 for my $y (0 .. 2) {
649 $table->add ($x + 3, $y,
650 new CFPlus::UI::Entry
651 text => $default_smooth[$x * 3 + $y],
652 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
653 );
654 }
655 }
656
657 756
658 $table 757 $table
659} 758}
660 759
661sub stats_window { 760sub stats_window {
… …
663 expand => 1, 762 expand => 1,
664 scroll_y => 1 763 scroll_y => 1
665 ); 764 );
666 $r->add (my $vb = new CFPlus::UI::VBox); 765 $r->add (my $vb = new CFPlus::UI::VBox);
667 766
767 $vb->add (new CFPlus::UI::FancyFrame
768 label => "Player",
769 child => (my $pi = new CFPlus::UI::VBox),
770 );
771
668 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 772 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669 can_hover => 1, can_events => 1, 773 can_hover => 1, can_events => 1,
670 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 774 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
671 $vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 775 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672 can_hover => 1, can_events => 1, 776 can_hover => 1, can_events => 1,
673 tooltip => "The map you are currently on (if supported by the server)."); 777 tooltip => "The map you are currently on (if supported by the server).");
674 778
675 $vb->add (my $hb0 = new CFPlus::UI::HBox); 779 $pi->add (my $hb0 = new CFPlus::UI::HBox);
676 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 780 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
677 can_hover => 1, can_events => 1, 781 can_hover => 1, can_events => 1,
678 tooltip => "The weight of the player including all inventory items."); 782 tooltip => "The weight of the player including all inventory items.");
679 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 783 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
680 can_hover => 1, can_events => 1, 784 can_hover => 1, can_events => 1,
681 tooltip => "The weight limit: you cannot carry more than this."); 785 tooltip => "The weight limit: you cannot carry more than this.");
682 786
787 $vb->add (new CFPlus::UI::FancyFrame
788 label => "Primary/Secondary Statistics",
683 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 789 child => (my $hb = new CFPlus::UI::HBox expand => 1),
790 );
684 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 791 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
685 792
686 my $color2 = [1, 1, 0]; 793 my $color2 = [1, 1, 0];
687 794
688 for ( 795 for (
… …
701 [2, 4, st_spd => "Spd", 10.54], 808 [2, 4, st_spd => "Spd", 10.54],
702 [2, 5, st_wspd => "WSp", 10.54], 809 [2, 5, st_wspd => "WSp", 10.54],
703 ) { 810 ) {
704 my ($col, $row, $id, $label, $template) = @$_; 811 my ($col, $row, $id, $label, $template) = @$_;
705 812
706 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 813 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
707 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 814 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
708 align => +1, template => $template, tooltip => "#stat_$label"); 815 align => +1, template => $template, tooltip => "#stat_$label");
709 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 816 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
710 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 817 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
711 align => -1, text => $label, tooltip => "#stat_$label"); 818 align => -1, text => $label, tooltip => "#stat_$label");
712 } 819 }
713 820
821 $vb->add (new CFPlus::UI::FancyFrame
822 label => "Resistancies",
714 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 823 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
824 );
715 825
716 my $row = 0; 826 my $row = 0;
717 my $col = 0; 827 my $col = 0;
718 828
719 my %resist_names = ( 829 my %resist_names = (
… …
752 cold => ["Cold", 862 cold => ["Cold",
753 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 863 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
754 ghit => ["Ghost hit", 864 ghit => ["Ghost hit",
755 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 865 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
756 ); 866 );
867
757 for (qw/slow holyw conf fire depl magic 868 for (qw/slow holyw conf fire depl magic
758 drain acid pois para deat phys 869 drain acid pois para deat phys
759 blind fear tund elec cold ghit/) 870 blind fear tund elec cold ghit/)
760 { 871 {
761 $tbl2->add ($col, $row, 872 $tbl2->add_at ($col, $row,
762 $STATWIDS->{"res_$_"} = 873 $STATWIDS->{"res_$_"} =
763 new CFPlus::UI::Label 874 new CFPlus::UI::Label
764 font => $FONT_FIXED, 875 font => $FONT_FIXED,
765 template => "-100%", 876 template => "-100%",
766 align => +1, 877 align => +1,
767 valign => 0, 878 valign => 0,
768 can_events => 1, 879 can_events => 1,
769 can_hover => 1, 880 can_hover => 1,
770 tooltip => $resist_names{$_}->[1], 881 tooltip => $resist_names{$_}->[1],
771 ); 882 );
772 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 883 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
773 font => $FONT_FIXED, 884 font => $FONT_FIXED,
774 can_hover => 1, 885 can_hover => 1,
775 can_events => 1, 886 can_events => 1,
776 path => "ui/resist/resist_$_.png", 887 path => "ui/resist/resist_$_.png",
777 tooltip => $resist_names{$_}->[1], 888 tooltip => $resist_names{$_}->[1],
778 ); 889 );
779 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 890 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
780 text => $resist_names{$_}->[0], 891 text => $resist_names{$_}->[0],
781 font => $FONT_FIXED, 892 font => $FONT_FIXED,
782 can_hover => 1, 893 can_hover => 1,
783 can_events => 1, 894 can_events => 1,
784 tooltip => $resist_names{$_}->[1], 895 tooltip => $resist_names{$_}->[1],
… …
817 return if $METASERVER_ATIME > time; 928 return if $METASERVER_ATIME > time;
818 $METASERVER_ATIME = time + 60; 929 $METASERVER_ATIME = time + 60;
819 930
820 my $table = $METASERVER->{table}; 931 my $table = $METASERVER->{table};
821 $table->clear; 932 $table->clear;
822 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 933 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
823 934
824 my $buf; 935 my $ok = 0;
825 936
826 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 937 CFPlus::background {
938 my $ua = CFPlus::lwp_useragent;
827 939
828 unless ($fh) { 940 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
829 $label->set_text ("unable to contact metaserver: $!"); 941 } sub {
830 return; 942 my ($msg) = @_;
831 } 943 if ($msg) {
832
833 Event->io (fd => $fh, poll => 'r', cb => sub {
834 my $res = sysread $fh, $buf, 8192, length $buf;
835
836 if (!defined $res) {
837 $_[0]->w->cancel;
838 $label->set_text ("error while retrieving server list: $!");
839 } elsif ($res == 0) {
840 $_[0]->w->cancel;
841 status "server list retrieved";
842
843 utf8::decode $buf if utf8::valid $buf;
844
845 $table->clear; 944 $table->clear;
846 945
847 my @tip = ( 946 my @tip = (
848 "The current number of users logged in on the server.", 947 "The current number of users logged in on the server.",
849 "The hostname of the server.", 948 "The hostname of the server.",
850 "The time this server has been running without being restarted.", 949 "The time this server has been running without being restarted.",
851 "The server software version - a '+' indicates a Crossfire+ server.", 950 "The server software version - a '+' indicates a Crossfire+ server.",
852 "Short information about this server provided by its admins.", 951 "Short information about this server provided by its admins.",
853 ); 952 );
854 my @col = qw(#Users Host Uptime Version Description); 953 my @col = qw(#Users Host Uptime Version Description);
855 $table->add ($_, 0, new CFPlus::UI::Label 954 $table->add_at ($_, 0, new CFPlus::UI::Label
856 can_hover => 1, can_events => 1, 955 can_hover => 1, can_events => 1,
857 align => 0, fg => [1, 1, 0], 956 align => 0, fg => [1, 1, 0],
858 text => $col[$_], tooltip => $tip[$_]) 957 text => $col[$_], tooltip => $tip[$_])
859 for 0 .. $#col; 958 for 0 .. $#col;
860 959
861 my @align = qw(1 0 1 1 -1); 960 my @align = qw(1 0 1 1 -1);
862 961
863 my $y = 0; 962 my $y = 0;
864 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 963 for my $m (@{ $msg->{servers} }) {
865 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 964 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
965 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
866 966
867 for ($desc) { 967 for ($desc) {
868 s/<br>/\n/gi; 968 s/<br>/\n/gi;
869 s/<li>/\n· /gi; 969 s/<li>/\n· /gi;
870 s/<.*?>//sgi; 970 s/<.*?>//sgi;
871 s/&/&amp;/g; 971 s/&amp;/&/g;
872 s/</&lt;/g; 972 s/&lt;/</g;
873 s/>/&gt;/g; 973 s/&gt;/>/g;
874 } 974 }
875 975
876 $uptime = sprintf "%dd %02d:%02d:%02d", 976 $uptime = sprintf "%dd %02d:%02d:%02d",
877 (int $m->[8] / 86400), 977 (int $uptime / 86400),
878 (int $m->[8] / 3600) % 24, 978 (int $uptime / 3600) % 24,
879 (int $m->[8] / 60) % 60, 979 (int $uptime / 60) % 60,
880 $m->[8] % 60; 980 $uptime % 60;
881 981
882 $m = [$users, $host, $uptime, $version, $desc]; 982 $m = [$users, $host, $uptime, $version, $desc];
883 983
884 $y++; 984 $y++;
885 985
886 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 986 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
887 (new CFPlus::UI::Button 987 (new CFPlus::UI::Button
888 text => "Use", 988 text => "Use",
889 tooltip => "Put this server into the <b>Host:Port</b> field", 989 tooltip => "Put this server into the <b>Host:Port</b> field",
890 on_activate => sub { 990 on_activate => sub {
891 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 991 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
894 }, 994 },
895 ), 995 ),
896 (new CFPlus::UI::Empty expand => 1), 996 (new CFPlus::UI::Empty expand => 1),
897 ]); 997 ]);
898 998
899 $table->add ($_, $y, new CFPlus::UI::Label 999 $table->add_at ($_, $y, new CFPlus::UI::Label
1000 max_w => $::WIDTH * 0.4,
900 ellipsise => 0, 1001 ellipsise => 0,
901 align => $align[$_], 1002 align => $align[$_],
902 text => $m->[$_], 1003 text => $m->[$_],
903 tooltip => $tip[$_], 1004 tooltip => $tip[$_],
1005 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
904 can_hover => 1, 1006 can_hover => 1,
905 can_events => 1, 1007 can_events => 1,
906 fontsize => 0.8) 1008 fontsize => 0.8)
907 for 0 .. $#$m; 1009 for 0 .. $#$m;
908 } 1010 }
1011 } else {
1012 $ok or $label->set_text ("error while contacting metaserver");
909 } 1013 }
910 }); 1014 };
1015
911} 1016}
912 1017
913sub metaserver_dialog { 1018sub metaserver_dialog {
914 my $vbox = new CFPlus::UI::VBox; 1019 my $vbox = new CFPlus::UI::VBox;
915 my $table = new CFPlus::UI::Table; 1020 my $table = new CFPlus::UI::Table;
916 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 1021 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
917 1022
918 my $dialog = new CFPlus::UI::FancyFrame 1023 my $dialog = new CFPlus::UI::Toplevel
919 title => "Server List", 1024 title => "Server List",
920 name => 'metaserver_dialog', 1025 name => 'metaserver_dialog',
921 x => 'center', 1026 x => 'center',
922 y => 'center', 1027 y => 'center',
923 z => 3, 1028 z => 3,
1029 force_w => $::WIDTH * 0.9,
924 force_h => $::HEIGHT * 0.4, 1030 force_h => $::HEIGHT * 0.7,
925 child => $vbox, 1031 child => $vbox,
926 has_close_button => 1, 1032 has_close_button => 1,
927 table => $table, 1033 table => $table,
928 on_visibility_change => sub { 1034 on_visibility_change => sub {
929 update_metaserver ($_[0]) if $_[1]; 1035 update_metaserver ($_[0]) if $_[1];
… …
935} 1041}
936 1042
937sub server_setup { 1043sub server_setup {
938 my $vbox = new CFPlus::UI::VBox; 1044 my $vbox = new CFPlus::UI::VBox;
939 1045
1046 $vbox->add (new CFPlus::UI::FancyFrame
1047 label => "Connection Settings",
940 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 1048 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1049 );
941 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1050 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
942 1051
943 { 1052 {
944 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1053 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
945 1054
946 $vbox->add ( 1055 $vbox->add (
947 $HOST_ENTRY = new CFPlus::UI::Entry 1056 $HOST_ENTRY = new CFPlus::UI::Entry
948 expand => 1, 1057 expand => 1,
949 text => $CFG->{profile}{default}{host}, 1058 text => $CFG->{profile}{default}{host},
… …
963 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1072 on_activate => sub { $METASERVER->toggle_visibility; 0 },
964 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1073 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
965 ); 1074 );
966 } 1075 }
967 1076
968 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1077 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
969 $table->add (1, 4, new CFPlus::UI::Entry 1078 $table->add_at (1, 4, new CFPlus::UI::Entry
970 text => $CFG->{profile}{default}{user}, 1079 text => $CFG->{profile}{default}{user},
971 tooltip => "The name of your character on the server", 1080 tooltip => "The name of your character on the server",
972 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1081 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
973 ); 1082 );
974 1083
975 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1084 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
976 $table->add (1, 5, new CFPlus::UI::Entry 1085 $table->add_at (1, 5, new CFPlus::UI::Entry
977 text => $CFG->{profile}{default}{password}, 1086 text => $CFG->{profile}{default}{password},
978 hidden => 1, 1087 hidden => 1,
979 tooltip => "The password for your character", 1088 tooltip => "The password for your character",
980 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1089 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
981 ); 1090 );
982 1091
983 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1092 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
984 $table->add (1, 7, new CFPlus::UI::Slider 1093 $table->add_at (1, 7, new CFPlus::UI::Slider
985 force_w => 100, 1094 force_w => 100,
986 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1095 range => [$CFG->{mapsize}, 10, 100, 0, 1],
987 tooltip => "This is the size of the portion of the map update the server sends you. " 1096 tooltip => "This is the size of the portion of the map update the server sends you. "
988 . "If you set this to a high value you will be able to see further, " 1097 . "If you set this to a high value you will be able to see further, "
989 . "but you also increase bandwidth requirements and latency. " 1098 . "but you also increase bandwidth requirements and latency. "
990 . "This option is only used once at log-in.", 1099 . "This option is only used once at log-in.",
991 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1100 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
992 ); 1101 );
993 1102
994 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1103 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
995 $table->add (1, 8, new CFPlus::UI::CheckBox 1104 $table->add_at (1, 8, new CFPlus::UI::CheckBox
996 state => $CFG->{face_prefetch}, 1105 state => $CFG->{face_prefetch},
997 tooltip => "<b>Background Image Prefetch</b>\n\n" 1106 tooltip => "<b>Background Image Prefetch</b>\n\n"
998 . "If enabled, the client automatically pre-fetches images from the server. " 1107 . "If enabled, the client automatically pre-fetches images from the server. "
999 . "This might increase or create lag, but increases the chances " 1108 . "This might increase or create lag, but increases the chances "
1000 . "of faces being ready for display when you encounter them. " 1109 . "of faces being ready for display when you encounter them. "
… …
1002 . "so only set it if you really need to prefetch images. " 1111 . "so only set it if you really need to prefetch images. "
1003 . "This option can be set and unset any time.", 1112 . "This option can be set and unset any time.",
1004 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1113 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1005 ); 1114 );
1006 1115
1116 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1117 $table->add_at (1, 9, new CFPlus::UI::Entry
1118 text => $CFG->{output_rate},
1119 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1120 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1121 . "default will be used, which is usually around 100kb/s.",
1122 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1123 );
1124
1007 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1125 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1008 $table->add (1, 9, new CFPlus::UI::Entry 1126 $table->add_at (1, 10, new CFPlus::UI::Entry
1009 text => $CFG->{output_count}, 1127 text => $CFG->{output_count},
1010 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1128 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1011 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1129 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1012 ); 1130 );
1013 1131
1014 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1132 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1015 $table->add (1, 10, new CFPlus::UI::Entry 1133 $table->add_at (1, 11, new CFPlus::UI::Entry
1016 text => $CFG->{output_sync}, 1134 text => $CFG->{output_sync},
1017 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1135 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1018 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1136 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1019 ); 1137 );
1020 1138
1021 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1139 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1022 expand => 1, 1140 expand => 1,
1023 align => 0, 1141 align => 0,
1024 text => "Login", 1142 text => "Login",
1025 on_activate => sub { 1143 on_activate => sub {
1026 $CONN ? stop_game 1144 $CONN ? stop_game
1027 : start_game; 1145 : start_game;
1028 0 1146 0
1029 }, 1147 },
1030 ); 1148 );
1031 1149
1150 $vbox->add (new CFPlus::UI::FancyFrame
1151 label => "Server Info",
1152 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1153 );
1154
1155 $vbox
1156}
1157
1158sub client_setup {
1159 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1160
1161 my $row = 0;
1162
1032 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1163 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1033 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1164 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1034 text => $CFG->{say_command}, 1165 text => $CFG->{say_command},
1035 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 1166 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1036 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1167 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1037 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1168 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1038 on_changed => sub { 1169 on_changed => sub {
1039 my ($self, $value) = @_; 1170 my ($self, $value) = @_;
1040 $CFG->{say_command} = $value; 1171 $CFG->{say_command} = $value;
1041 0 1172 0
1042 } 1173 }
1043 ); 1174 );
1044 1175
1045 $vbox->add (new CFPlus::UI::Label 1176 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1046 text => "Server Info", 1177 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1047 fontsize => 1.2, 1178 state => $CFG->{show_tips},
1048 padding_y => 8, 1179 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1049 fg => [1, 1, 0, 1], 1180 on_changed => sub {
1181 my ($self, $value) = @_;
1182 $CFG->{show_tips} = $value;
1183 0
1184 }
1050 ); 1185 );
1051 1186
1052 $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0); 1187 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1188 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1189 text => $CFG->{logview_max_par},
1190 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1191 . "sends more messages than this number, older messages get removed to save memory and "
1192 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1193 on_changed => sub {
1194 my ($self, $value) = @_;
1195 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1196 0
1197 },
1198 );
1053 1199
1054 $vbox 1200 $table
1055} 1201}
1056 1202
1057sub message_window { 1203sub message_window {
1058 my $window = new CFPlus::UI::FancyFrame 1204 my $window = new CFPlus::UI::Toplevel
1059 name => "message_window", 1205 name => "message_window",
1060 title => "Messages", 1206 title => "Messages",
1061 border_bg => [1, 1, 1, 1], 1207 border_bg => [1, 1, 1, 1],
1062 x => "max", 1208 x => "max",
1063 y => 0, 1209 y => 0,
… …
1115 }; 1261 };
1116 1262
1117 $window 1263 $window
1118} 1264}
1119 1265
1120sub open_string_query {
1121 my $cb = $_[1];
1122 my $dialog = new CFPlus::UI::FancyFrame
1123 x => "center",
1124 y => "center",
1125 z => 50,
1126 force_w => $WIDTH * 4/5,
1127 title => $_[0];
1128
1129 $dialog->add (
1130 my $e = new CFPlus::UI::Entry
1131 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1132 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1133 );
1134
1135 $e->grab_focus;
1136 $dialog->show;
1137}
1138
1139sub open_quit_dialog {
1140 unless ($QUIT_DIALOG) {
1141 $QUIT_DIALOG = new CFPlus::UI::FancyFrame
1142 x => "center",
1143 y => "center",
1144 z => 50,
1145 title => "Really Quit?",
1146 on_key_down => sub {
1147 my ($dialog, $ev) = @_;
1148 $ev->{sym} == 27 and $dialog->hide;
1149 }
1150 ;
1151
1152 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1153
1154 $vb->add (new CFPlus::UI::Label
1155 text => "You should find a savebed and apply it first!",
1156 max_w => $WIDTH * 0.25,
1157 ellipsize => 0,
1158 );
1159 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1160 $hb->add (new CFPlus::UI::Button
1161 text => "Ok",
1162 expand => 1,
1163 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1164 );
1165 $hb->add (new CFPlus::UI::Button
1166 text => "Quit anyway",
1167 expand => 1,
1168 on_activate => sub { exit },
1169 );
1170 }
1171
1172 $QUIT_DIALOG->show;
1173 $QUIT_DIALOG->grab_focus;
1174}
1175
1176sub autopickup_setup { 1266sub autopickup_setup {
1267 my $r = new CFPlus::UI::ScrolledWindow (
1268 expand => 1,
1269 scroll_y => 1
1270 );
1177 my $table = new CFPlus::UI::Table; 1271 $r->add (my $table = new CFPlus::UI::Table
1272 row_expand => [0],
1273 col_expand => [0, 1, 0, 1],
1274 );
1178 1275
1179 for ( 1276 for (
1180 ["General", 0, 0, 1277 ["General", 0, 0,
1181 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1278 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1182 ["Inhibit autopickup" => PICKUP_INHIBIT], 1279 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1196 ["Boots" => PICKUP_BOOTS], 1293 ["Boots" => PICKUP_BOOTS],
1197 ["Gloves" => PICKUP_GLOVES], 1294 ["Gloves" => PICKUP_GLOVES],
1198 ["Cloaks" => PICKUP_CLOAK], 1295 ["Cloaks" => PICKUP_CLOAK],
1199 ], 1296 ],
1200 1297
1201 ["Readables", 2, 2, 1298 ["Readables", 2, 0,
1202 ["Spellbooks" => PICKUP_SPELLBOOK], 1299 ["Spellbooks" => PICKUP_SPELLBOOK],
1203 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1300 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1204 ["Normal Books/Scrolls" => PICKUP_READABLES], 1301 ["Normal Books/Scrolls" => PICKUP_READABLES],
1205 ], 1302 ],
1206 ["Misc", 2, 7, 1303 ["Misc", 2, 5,
1207 ["Food" => PICKUP_FOOD], 1304 ["Food" => PICKUP_FOOD],
1208 ["Drinks" => PICKUP_DRINK], 1305 ["Drinks" => PICKUP_DRINK],
1209 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1306 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1210 ["Keys" => PICKUP_KEY], 1307 ["Keys" => PICKUP_KEY],
1211 ["Magical Items" => PICKUP_MAGICAL], 1308 ["Magical Items" => PICKUP_MAGICAL],
1212 ["Potions" => PICKUP_POTION], 1309 ["Potions" => PICKUP_POTION],
1213 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1310 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1214 ["Ignore cursed" => PICKUP_NOT_CURSED], 1311 ["Ignore cursed" => PICKUP_NOT_CURSED],
1215 ["Jewelery" => PICKUP_JEWELS], 1312 ["Jewelery" => PICKUP_JEWELS],
1313 ["Flesh" => PICKUP_FLESH],
1216 ], 1314 ],
1217 ["Weight/Value ratio", 2, 17] 1315 ["Weight/Value ratio", 2, 17]
1218 ) 1316 )
1219 { 1317 {
1220 my ($title, $x, $y, @bits) = @$_; 1318 my ($title, $x, $y, @bits) = @$_;
1221 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1319 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1222 1320
1223 for (@bits) { 1321 for (@bits) {
1224 ++$y; 1322 ++$y;
1225 1323
1226 my $mask = $_->[1]; 1324 my $mask = $_->[1];
1227 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1325 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1228 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1326 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1229 state => $::CFG->{pickup} & $mask, 1327 state => $::CFG->{pickup} & $mask,
1230 on_changed => sub { 1328 on_changed => sub {
1231 my ($box, $value) = @_; 1329 my ($box, $value) = @_;
1232 1330
1233 if ($value) { 1331 if ($value) {
… …
1244 1342
1245 ${$_->[2]} = $checkbox if $_->[2]; 1343 ${$_->[2]} = $checkbox if $_->[2];
1246 } 1344 }
1247 } 1345 }
1248 1346
1249 $table->add (2, 18, new CFPlus::UI::ValSlider 1347 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1250 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1348 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1251 template => ">= 99", 1349 template => ">= 99",
1252 to_value => sub { ">= " . 5 * $_[0] }, 1350 to_value => sub { ">= " . 5 * $_[0] },
1253 on_changed => sub { 1351 on_changed => sub {
1254 my ($slider, $value) = @_; 1352 my ($slider, $value) = @_;
… …
1257 $::CFG->{pickup} |= int $value 1355 $::CFG->{pickup} |= int $value
1258 if $value; 1356 if $value;
1259 1; 1357 1;
1260 }); 1358 });
1261 1359
1262 $table->add (3, 18, new CFPlus::UI::Button 1360 $table->add_at (3, 18, new CFPlus::UI::Button
1263 text => "set", 1361 text => "set",
1264 on_activate => sub { 1362 on_activate => sub {
1265 $::CONN->send_command ("pickup $::CFG->{pickup}") 1363 $::CONN->send_command ("pickup $::CFG->{pickup}")
1266 if defined $::CONN; 1364 if defined $::CONN;
1267 0 1365 0
1268 }); 1366 });
1269 1367
1270 $table 1368 $r
1271} 1369}
1272 1370
1273my %SORT_ORDER = ( 1371my %SORT_ORDER = (
1274 type => undef, 1372 type => undef,
1275 mtime => sub { sort { 1373 mtime => sub {
1374 my $NOW = time;
1375 sort {
1376 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1377 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1378
1276 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1379 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1277 or $b->{mtime} <=> $a->{mtime} 1380 or $btime <=> $atime
1278 or $a->{type} <=> $b->{type} 1381 or $a->{type} <=> $b->{type}
1382 } @_
1279 } @_ }, 1383 },
1280 weight => sub { sort { 1384 weight => sub { sort {
1281 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1385 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1282 or $a->{type} <=> $b->{type} 1386 or $a->{type} <=> $b->{type}
1283 } @_ }, 1387 } @_ },
1284); 1388);
… …
1309 #TODO# update to weigh/maxweight 1413 #TODO# update to weigh/maxweight
1310 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1414 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1311 1415
1312 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1416 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1313 $sw1->add ($INV = new CFPlus::UI::Inventory); 1417 $sw1->add ($INV = new CFPlus::UI::Inventory);
1418 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1314 1419
1315 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1420 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1316 1421
1317 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1422 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1318 1423
… …
1335 $PL_WINDOW->show; 1440 $PL_WINDOW->show;
1336 } 1441 }
1337} 1442}
1338 1443
1339sub player_window { 1444sub player_window {
1340 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1445 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1341 x => "center", 1446 x => "center",
1342 y => "center", 1447 y => "center",
1343 force_w => $WIDTH * 9/10, 1448 force_w => $WIDTH * 9/10,
1344 force_h => $HEIGHT * 9/10, 1449 force_h => $HEIGHT * 9/10,
1345 title => "Player", 1450 title => "Player",
… …
1347 has_close_button => 1 1452 has_close_button => 1
1348 ; 1453 ;
1349 1454
1350 my $ntb = 1455 my $ntb =
1351 $PL_NOTEBOOK = 1456 $PL_NOTEBOOK =
1352 new CFPlus::UI::Notebook expand => 1, debug => 1; 1457 new CFPlus::UI::Notebook expand => 1;
1353 1458
1354 $ntb->add ( 1459 $ntb->add (
1355 "Statistics (F2)" => $STATS_PAGE = stats_window, 1460 "Statistics (F2)" => $STATS_PAGE = stats_window,
1356 "Shows statistics, where all your Stats and Resistances are shown." 1461 "Shows statistics, where all your Stats and Resistances are shown."
1357 ); 1462 );
1358 $ntb->add ( 1463 $ntb->add (
1359 "Skills (F3)" => $SKILL_PAGE = skill_window, 1464 "Skills (F3)" => $SKILL_PAGE = skill_window,
1360 "Shows all your Skills." 1465 "Shows all your Skills."
1361 ); 1466 );
1362 1467
1363 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1468 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1364 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1469 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1365 $ntb->add ( 1470 $ntb->add (
1366 "Spellbook (F4)" => $spellsw, 1471 "Spellbook (F4)" => $spellsw,
1367 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1472 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1368 ); 1473 );
1369 $ntb->add ( 1474 $ntb->add (
1370 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1475 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1371 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1476 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1372 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1477 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1373 ); 1478 );
1479 $ntb->add (Pickup => autopickup_setup,
1480 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1374 1481
1375 $ntb->set_current_page ($INVENTORY_PAGE); 1482 $ntb->set_current_page ($INVENTORY_PAGE);
1376 1483
1377 $plwin->add ($ntb); 1484 $plwin->add ($ntb);
1378 $plwin 1485 $plwin
1379} 1486}
1380 1487
1381sub update_bindings {
1382 $BIND_UPD_CB->() if $BIND_UPD_CB;
1383}
1384
1385sub keyboard_setup { 1488sub keyboard_setup {
1386 my $binding_list = new CFPlus::UI::VBox; 1489 CFPlus::Macro::keyboard_setup
1387
1388 my $refresh;
1389 $refresh = $BIND_UPD_CB = sub {
1390 $binding_list->clear ();
1391
1392 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1393 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1394 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1395 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1396
1397 my $lbl = join "; ", @$cmds;
1398 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1399 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1400 $hb->add (new CFPlus::UI::Button
1401 text => "delete",
1402 tooltip => "Deletes the binding",
1403 on_activate => sub {
1404 $binding_list->remove ($hb);
1405 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1406 0
1407 });
1408
1409 $hb->add (new CFPlus::UI::Button
1410 text => "edit",
1411 tooltip => "Edits the binding",
1412 on_activate => sub {
1413 $::BIND_EDITOR->set_binding (
1414 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1415 sub {
1416 my ($nmod, $nsym, $ncmds) = @_;
1417 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1418 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1419 $refresh->();
1420 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1421 $SETUP_DIALOG->show;
1422 },
1423 sub {
1424 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1425 $SETUP_DIALOG->show;
1426 });
1427 $::BIND_EDITOR->show;
1428 $SETUP_DIALOG->hide;
1429 0
1430 });
1431
1432 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1433 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1434 }
1435 }
1436 };
1437
1438 my $vb = new CFPlus::UI::VBox;
1439 $vb->add (my $hb = new CFPlus::UI::HBox);
1440 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1441 $hb->add (new CFPlus::UI::CheckBox
1442 expand => 1,
1443 state => $CFG->{shift_fire_stop},
1444 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1445 on_changed => sub {
1446 my ($cbox, $value) = @_;
1447 $CFG->{shift_fire_stop} = $value;
1448 0
1449 });
1450
1451 $vb->add ($binding_list);
1452 $vb->add (my $hb = new CFPlus::UI::HBox);
1453
1454 $hb->add (new CFPlus::UI::Button
1455 text => "record new",
1456 expand => 1,
1457 tooltip => "This button opens the binding editor with an empty binding.",
1458 on_activate => sub {
1459 $::BIND_EDITOR->set_binding (undef, undef, [],
1460 sub {
1461 my ($mod, $sym, $cmds) = @_;
1462 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1463 $refresh->();
1464 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1465 $SETUP_DIALOG->show;
1466 },
1467 sub {
1468 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1469 $SETUP_DIALOG->show;
1470 },
1471 );
1472 $SETUP_DIALOG->hide;
1473 $::BIND_EDITOR->show;
1474 0
1475 },
1476 );
1477
1478 $hb->add (new CFPlus::UI::Button
1479 text => "close",
1480 tooltip => "Closes the binding window",
1481 expand => 1,
1482 on_activate => sub {
1483 $SETUP_DIALOG->hide;
1484 0
1485 }
1486 );
1487
1488 $refresh->();
1489
1490 $vb
1491} 1490}
1492 1491
1493sub help_window { 1492sub help_window {
1494 my $win = new CFPlus::UI::FancyFrame 1493 my $win = new CFPlus::UI::Toplevel
1495 x => 'center', 1494 x => 'center',
1496 y => 'center', 1495 y => 'center',
1497 z => 2, 1496 z => 4,
1498 name => 'doc_browser', 1497 name => 'doc_browser',
1499 force_w => int $WIDTH * 7/8, 1498 force_w => int $WIDTH * 7/8,
1500 force_h => int $HEIGHT * 7/8, 1499 force_h => int $HEIGHT * 7/8,
1501 title => "Help Browser", 1500 title => "Help Browser",
1502 has_close_button => 1; 1501 has_close_button => 1;
1503 1502
1504 $win->add (my $vbox = new CFPlus::UI::VBox); 1503 $win->add (my $vbox = new CFPlus::UI::VBox);
1505 1504
1505 $vbox->add (new CFPlus::UI::FancyFrame
1506 label => "Navigation",
1506 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1507 child => (my $buttons = new CFPlus::UI::HBox),
1508 );
1507 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1509 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1508 expand => 1, fontsize => 0.8, padding_x => 4); 1510 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1509 1511
1510 my @history; 1512 my @history;
1511 my @future; 1513 my @future;
1512 my $curnode; 1514 my $curnode;
1513 1515
1514 my $load_node; $load_node = sub { 1516 my $load_node; $load_node = sub {
1515 my ($node) = @_; 1517 my ($node, $para) = @_;
1516 1518
1517 $buttons->clear; 1519 $buttons->clear;
1520
1521 $buttons->add (new CFPlus::UI::Button
1522 text => "⇤",
1523 tooltip => "back to the starting page",
1524 on_activate => sub {
1525 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1526 unshift @future, @history;
1527 @history = ();
1528 $load_node->(@{shift @future});
1529 },
1530 );
1518 1531
1519 if (@history) { 1532 if (@history) {
1520 $buttons->add (new CFPlus::UI::Button 1533 $buttons->add (new CFPlus::UI::Button
1521 text => "<", 1534 text => "⋘",
1522 tooltip => "back to " . CFPlus::Pod::full_path_of $history[-1], 1535 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1523 on_activate => sub { 1536 on_activate => sub {
1524 unshift @future, $curnode if $curnode; 1537 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1525 $load_node->(pop @history); 1538 $load_node->(@{pop @history});
1539 },
1526 }); 1540 );
1527 } 1541 }
1528 1542
1529 if (@future) { 1543 if (@future) {
1530 $buttons->add (new CFPlus::UI::Button 1544 $buttons->add (new CFPlus::UI::Button
1531 text => ">", 1545 text => "⋙",
1532 tooltip => "forward to " . CFPlus::Pod::full_path_of $future[0], 1546 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1533 on_activate => sub { 1547 on_activate => sub {
1534 push @history, $curnode; 1548 push @history, [$curnode, $viewer->current_paragraph];
1535 $load_node->(shift @future); 1549 $load_node->(@{shift @future});
1550 },
1536 }); 1551 );
1537 } 1552 }
1553
1554 $buttons->add (new CFPlus::UI::Label text => " ");
1555
1556 my @path = CFPlus::Pod::full_path_of $node;
1557 pop @path; # drop current node
1558
1559 for my $node (@path) {
1560 $buttons->add (new CFPlus::UI::Button
1561 text => $node->{kw}[0],
1562 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1563 on_activate => sub {
1564 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1565 $load_node->($node);
1566 },
1567 );
1568 $buttons->add (new CFPlus::UI::Label text => "/");
1569 }
1570
1571 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1538 1572
1539 $curnode = $node; 1573 $curnode = $node;
1540 1574
1541 $viewer->clear; 1575 $viewer->clear;
1542 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode); 1576 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1543 $viewer->set_offset (0); 1577 $viewer->scroll_to ($para);
1544 }; 1578 };
1545 1579
1546 $load_node->(CFPlus::Pod::find pod => "mainpage"); 1580 $load_node->(CFPlus::Pod::find pod => "mainpage");
1547 1581
1548 $CFPlus::Pod::on_link = sub { 1582 $CFPlus::Pod::goto_document = sub {
1549 my (@path) = @_; 1583 my (@path) = @_;
1550 1584
1551 push @history, $curnode if $curnode; 1585 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1552 @future = ();
1553 1586
1554 $load_node->(CFPlus::Pod::find @path); 1587 $load_node->((CFPlus::Pod::find @path)[0]);
1555 $win->show; 1588 $win->show;
1556 }; 1589 };
1557 1590
1558 $win 1591 $win
1592}
1593
1594sub open_string_query {
1595 my ($title, $cb, $txt, $tooltip) = @_;
1596 my $dialog = new CFPlus::UI::Toplevel
1597 x => "center",
1598 y => "center",
1599 z => 50,
1600 force_w => $WIDTH * 4/5,
1601 title => $title;
1602
1603 $dialog->add (
1604 my $e = new CFPlus::UI::Entry
1605 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1606 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1607 tooltip => $tooltip
1608 );
1609
1610 $e->grab_focus;
1611 $e->set_text ($txt) if $txt;
1612 $dialog->show;
1613}
1614
1615sub open_quit_dialog {
1616 unless ($QUIT_DIALOG) {
1617 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1618 x => "center",
1619 y => "center",
1620 z => 50,
1621 title => "Really Quit?",
1622 on_key_down => sub {
1623 my ($dialog, $ev) = @_;
1624 $ev->{sym} == 27 and $dialog->hide;
1625 }
1626 ;
1627
1628 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1629
1630 $vb->add (new CFPlus::UI::Label
1631 text => "You should find a savebed and apply it first!",
1632 max_w => $WIDTH * 0.25,
1633 ellipsize => 0,
1634 );
1635 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1636 $hb->add (new CFPlus::UI::Button
1637 text => "Ok",
1638 expand => 1,
1639 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1640 );
1641 $hb->add (new CFPlus::UI::Button
1642 text => "Quit anyway",
1643 expand => 1,
1644 on_activate => sub { exit },
1645 );
1646 }
1647
1648 $QUIT_DIALOG->show;
1649 $QUIT_DIALOG->grab_focus;
1650}
1651
1652sub show_tip_of_the_day {
1653 # find all tips
1654 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1655
1656 CFPlus::DB::get state => "tip_of_the_day", sub {
1657 my ($todindex) = @_;
1658 $todindex = 0 if $todindex >= @tod;
1659 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1660
1661 # create dialog
1662 my $dialog;
1663
1664 my $close = sub {
1665 $dialog->destroy;
1666 };
1667
1668 $dialog = new CFPlus::UI::Toplevel
1669 x => "center",
1670 y => "center",
1671 z => 3,
1672 name => 'tip_of_the_day',
1673 force_w => int $WIDTH * 4/9,
1674 force_h => int $WIDTH * 2/9,
1675 title => "Tip of the day #" . (1 + $todindex),
1676 child => my $vbox = new CFPlus::UI::VBox,
1677 has_close_button => 1,
1678 on_delete => $close,
1679 ;
1680
1681 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1682 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1683 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1684
1685 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1686
1687 $table->add_at (0, 0, new CFPlus::UI::Button
1688 text => "Close",
1689 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>.",
1690 on_activate => $close,
1691 );
1692
1693 $table->add_at (2, 0, new CFPlus::UI::Button
1694 text => "Next",
1695 tooltip => "Show the next <b>Tip of the day</b>.",
1696 on_activate => sub {
1697 $close->();
1698 &show_tip_of_the_day;
1699 },
1700 );
1701
1702 $dialog->show;
1703 };
1559} 1704}
1560 1705
1561sub sdl_init { 1706sub sdl_init {
1562 CFPlus::SDL_Init 1707 CFPlus::SDL_Init
1563 and die "SDL::Init failed!\n"; 1708 and die "SDL::Init failed!\n";
1564} 1709}
1565 1710
1566sub video_init { 1711sub video_init {
1567 sdl_init;
1568
1569 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1712 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1570 1713
1571 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1714 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1572 1715
1573 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1716 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1574 $FULLSCREEN = $CFG->{fullscreen}; 1717 $FULLSCREEN = $CFG->{fullscreen};
1575 $FAST = $CFG->{fast}; 1718 $FAST = $CFG->{fast};
1576 1719
1577 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1720 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1578 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1721 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1579 1722
1580 $SDL_ACTIVE = 1; 1723 $SDL_ACTIVE = 1;
1581 $LAST_REFRESH = time - 0.01; 1724 $LAST_REFRESH = time - 0.01;
1582 1725
… …
1598 z => 100, 1741 z => 100,
1599 force_x => "max", 1742 force_x => "max",
1600 force_y => 0; 1743 force_y => 0;
1601 $DEBUG_STATUS->show; 1744 $DEBUG_STATUS->show;
1602 1745
1603 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1604
1605 $STATUSBOX = new CFPlus::UI::Statusbox; 1746 $STATUSBOX = new CFPlus::UI::Statusbox;
1606 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1747 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1607 1748
1608 (new CFPlus::UI::Frame 1749 (new CFPlus::UI::Frame
1609 bg => [0, 0, 0, 0.4], 1750 bg => [0, 0, 0, 0.4],
1610 force_x => 0, 1751 force_x => 0,
1611 force_y => "max", 1752 force_y => "max",
1612 child => $STATUSBOX, 1753 child => $STATUSBOX,
1613 )->show; 1754 )->show;
1614 1755
1615 CFPlus::UI::FancyFrame->new ( 1756 CFPlus::UI::Toplevel->new (
1616 title => "Map", 1757 title => "Map",
1617 name => "mapmap", 1758 name => "mapmap",
1618 x => 0, 1759 x => 0,
1619 y => $FONTSIZE + 8, 1760 y => $FONTSIZE + 8,
1620 border_bg => [1, 1, 1, 192/255], 1761 border_bg => [1, 1, 1, 192/255],
… …
1645 font => $FONT_FIXED, 1786 font => $FONT_FIXED,
1646 fontsize => $::CFG->{log_fontsize}, 1787 fontsize => $::CFG->{log_fontsize},
1647 indent => -4, 1788 indent => -4,
1648 can_hover => 1, 1789 can_hover => 1,
1649 can_events => 1, 1790 can_events => 1,
1791 max_par => $CFG->{logview_max_par},
1650 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1792 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1651 ; 1793 ;
1652 1794
1653 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1795 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1654 title => "Setup", 1796 title => "Setup",
1655 name => "setup_dialog", 1797 name => "setup_dialog",
1656 x => 'center', 1798 x => 'center',
1657 y => 'center', 1799 y => 'center',
1658 z => 2, 1800 z => 2,
… …
1666 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1808 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1667 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1809 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1668 1810
1669 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1811 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1670 "Configure the server to play on, your username, password and other server-related options."); 1812 "Configure the server to play on, your username, password and other server-related options.");
1671 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1813 $SETUP_NOTEBOOK->add (Client => client_setup,
1672 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1814 "Configure various client-specific settings.");
1673 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1815 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1674 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1816 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1675 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1817 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1676 "Configure the use of audio, sound effects and background music."); 1818 "Configure the use of audio, sound effects and background music.");
1677 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1819 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1709 ); 1851 );
1710 1852
1711 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1853 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1712 tooltip => "View Documentation"); 1854 tooltip => "View Documentation");
1713 1855
1856
1714 $BUTTONBAR->add (new CFPlus::UI::Button 1857 $BUTTONBAR->add (new CFPlus::UI::Button
1715 text => "Quit", 1858 text => "Quit",
1716 tooltip => "Terminates the program", 1859 tooltip => "Terminates the program",
1717 on_activate => sub { 1860 on_activate => sub {
1718 if ($CONN) { 1861 if ($CONN) {
… …
1729 } 1872 }
1730 1873
1731 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1874 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1732} 1875}
1733 1876
1877sub setup_build_button {
1878 my ($enabled) = @_;
1879 if ($enabled) {
1880 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1881 $BUILD_BUTTON ||= new CFPlus::UI::Button
1882 text => "Build",
1883 tooltip => "Opens the ingame builder",
1884 on_activate => sub {
1885 if ($CONN) {
1886 $CONN->send_ext_req (builder_player_items => sub {
1887 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1888 });
1889 }
1890 0
1891 };
1892 $BUTTONBAR->add ($BUILD_BUTTON);
1893 } else {
1894 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1895 }
1896}
1897
1898sub open_ingame_editor {
1899 my ($msg) = @_;
1900
1901 my $win = new CFPlus::UI::Toplevel
1902 x => 0,
1903 y => 'center',
1904 z => 4,
1905 name => 'builder_window',
1906 force_w => int $WIDTH * 1/4,
1907 force_h => int $HEIGHT * 3/4,
1908 title => "In game builder",
1909 has_close_button => 1;
1910
1911 my $r = new CFPlus::UI::ScrolledWindow (
1912 expand => 1,
1913 scroll_y => 1
1914 );
1915 $r->add (my $vb = new CFPlus::UI::VBox);
1916 $win->add ($r);
1917
1918
1919 $vb->add (
1920 new CFPlus::UI::Button
1921 text => "Disable build mode",
1922 on_activate => sub { $::IN_BUILD_MODE = undef }
1923 );
1924 $vb->add (
1925 new CFPlus::UI::Button
1926 text => "ERASE",
1927 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1928 );
1929
1930 for my $itemarchname (
1931 sort {
1932 $msg->{items}->{$a}->{build_arch_name}
1933 cmp $msg->{items}->{$b}->{build_arch_name}
1934 } keys %{$msg->{items}}
1935 ) {
1936 my $info = $msg->{items}->{$itemarchname};
1937 $vb->add (
1938 new CFPlus::UI::Button text => $info->{build_arch_name},
1939 on_activate => sub {
1940 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1941
1942 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1943 build_mode_query_arch_info ();
1944 }
1945 }
1946 );
1947 }
1948
1949 $win->show;
1950}
1951
1952sub build_mode_query_arch_info {
1953 my ($iteminfo) = $::IN_BUILD_MODE;
1954 my $itemarchname = $iteminfo->{item};
1955 my $info = $iteminfo->{info};
1956
1957 my $dialog = new CFPlus::UI::Toplevel
1958 x => "center",
1959 y => "center",
1960 z => 50,
1961 force_w => int $WIDTH * 1/2,
1962 title => "Enter information for placement of '$itemarchname'",
1963 has_close_button => 1;
1964
1965 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1966
1967 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1968 my $row = 0;
1969 if ($info->{has_name}) {
1970 $table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
1971 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1972 }
1973 if ($info->{has_text}) {
1974 $table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
1975 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1976 }
1977 if ($info->{has_connection}) {
1978 $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1979 $table->add_at (1, $row++,
1980 new CFPlus::UI::Entry
1981 expand => 1,
1982 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1983 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1984 );
1985 }
1986
1987 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1988 $hb->add (new CFPlus::UI::Button
1989 text => "Close",
1990 expand => 1,
1991 on_activate => sub { $dialog->hide; 0 },
1992 );
1993 $dialog->show;
1994}
1995
1734sub video_shutdown { 1996sub video_shutdown {
1735 CFPlus::OpenGL::shutdown; 1997 CFPlus::OpenGL::shutdown;
1736 1998
1737 undef $SDL_ACTIVE; 1999 undef $SDL_ACTIVE;
1738} 2000}
1739 2001
1740my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1741my $bgmusic;#TODO#hack#d#
1742
1743sub audio_channel_finished { 2002sub audio_channel_finished {
1744 my ($channel) = @_; 2003 my ($channel) = @_;
1745 2004
1746 #warn "channel $channel finished\n";#d# 2005 #warn "channel $channel finished\n";#d#
1747} 2006}
1748 2007
2008sub audio_music_set {
2009 my ($songs) = @_;
2010
2011 my @want =
2012 grep $_,
2013 map $CONN->{music_meta}{$_},
2014 @$songs;
2015
2016 if (@want) {
2017 @MUSIC_WANT = @want;
2018 &audio_music_changed ();
2019 }
2020}
2021
2022sub audio_music_start {
2023 my $path = $MUSIC_PLAYING->{path}
2024 or return;
2025
2026 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2027 # music might have changed...
2028 $path eq $MUSIC_PLAYING->{path}
2029 or return &audio_music_start ();
2030
2031 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2032
2033 my $NOW = time;
2034
2035 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2036 my $pos = $MUSIC_PLAYING->{stop_pos};
2037 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2038 $MUSIC_START = time - $pos;
2039 } else {
2040 $MUSIC_PLAYER->play (0);
2041 $MUSIC_START = time;
2042 }
2043
2044 delete $MUSIC_PLAYING->{stop_time};
2045 delete $MUSIC_PLAYING->{stop_pos};
2046 }
2047}
2048
2049sub audio_music_changed {
2050 return unless $CFG->{bgm_enable};
2051
2052 # default MUSIC_WANT == MUSIC_DEFAULT
2053 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2054
2055 # if the currently playing song is acceptable, let it continue
2056 return if $MUSIC_PLAYING
2057 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2058
2059 my $NOW = time;
2060
2061 if ($MUSIC_PLAYING) {
2062 $MUSIC_PLAYING->{stop_time} = $NOW;
2063 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2064 CFPlus::MixMusic::fade_out 1000;
2065 } else {
2066 # sort by stop time, oldest first
2067 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2068
2069 # if the most recently-played piece played very recently,
2070 # resume it, else choose the oldest piece for rotation.
2071 $MUSIC_PLAYING =
2072 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2073 ? $MUSIC_WANT[-1]
2074 : $MUSIC_WANT[0];
2075
2076 audio_music_start;
2077 }
2078}
2079
1749sub audio_music_finished { 2080sub audio_music_finished {
1750 return unless $CFG->{bgm_enable}; 2081 $MUSIC_PLAYING = undef;
2082 undef $MUSIC_PLAYER;
1751 2083
1752 # TODO: hack, do play loop and mood music 2084 audio_music_changed;
1753 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1754 $bgmusic->play (0);
1755
1756 push @bgmusic, shift @bgmusic;
1757} 2085}
1758 2086
1759sub audio_init { 2087sub audio_init {
1760 if ($CFG->{audio_enable}) { 2088 if ($CFG->{audio_enable}) {
1761 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2089 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
1769 CFPlus::Mix_AllocateChannels 8; 2097 CFPlus::Mix_AllocateChannels 8;
1770 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 2098 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1771 2099
1772 audio_music_finished; 2100 audio_music_finished;
1773 2101
2102 local $_;
1774 while (<$fh>) { 2103 while (<$fh>) {
1775 next if /^\s*#/; 2104 next if /^\s*#/;
1776 next if /^\s*$/; 2105 next if /^\s*$/;
1777 2106
1778 my ($file, $volume, $event) = split /\s+/, $_, 3; 2107 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1810 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2139 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1811 2140
1812 $CFPlus::UI::ROOT->draw; 2141 $CFPlus::UI::ROOT->draw;
1813 2142
1814 $WANT_REFRESH = 0; 2143 $WANT_REFRESH = 0;
1815 $CAN_REFRESH = 0; 2144 $CAN_REFRESH = 0;
1816 $LAST_REFRESH = $NOW; 2145 $LAST_REFRESH = $NOW;
1817 2146
1818 CFPlus::SDL_GL_SwapBuffers; 2147 CFPlus::SDL_GL_SwapBuffers;
1819} 2148}
1820 2149
1821my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2150my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1822 $NOW = time; 2151 $NOW = time;
1823 2152
1824 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2153 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1825 for CFPlus::SDL_PollEvent; 2154 for CFPlus::poll_events;
1826 2155
1827 if (%animate_object) { 2156 if (%animate_object) {
1828 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2157 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1829 $WANT_REFRESH++; 2158 ++$WANT_REFRESH;
1830 } 2159 }
1831 2160
1832 if ($WANT_REFRESH) { 2161 if ($WANT_REFRESH) {
1833 force_refresh; 2162 force_refresh;
1834 } else { 2163 } else {
… …
1855 if $CONN; 2184 if $CONN;
1856}); 2185});
1857 2186
1858%SDL_CB = ( 2187%SDL_CB = (
1859 CFPlus::SDL_QUIT => sub { 2188 CFPlus::SDL_QUIT => sub {
1860 Event::unloop -1; 2189 exit;
1861 }, 2190 },
1862 CFPlus::SDL_VIDEORESIZE => sub { 2191 CFPlus::SDL_VIDEORESIZE => sub {
1863 }, 2192 },
1864 CFPlus::SDL_VIDEOEXPOSE => sub { 2193 CFPlus::SDL_VIDEOEXPOSE => sub {
1865 CFPlus::UI::full_refresh; 2194 CFPlus::UI::full_refresh;
1866 }, 2195 },
1867 CFPlus::SDL_ACTIVEEVENT => sub { 2196 CFPlus::SDL_ACTIVEEVENT => sub {
1868# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2197# not useful, as APPACTIVE include sonly iconified state, not unmapped
2198# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2199# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2200# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2201# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2202# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1869 }, 2203 },
1870 CFPlus::SDL_KEYDOWN => sub { 2204 CFPlus::SDL_KEYDOWN => sub {
1871 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2205 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1872 # alt-enter 2206 # alt-enter
1873 $FULLSCREEN_ENABLE->toggle; 2207 $FULLSCREEN_ENABLE->toggle;
… …
1894 2228
1895$SIG{INT} = $SIG{TERM} = sub { exit }; 2229$SIG{INT} = $SIG{TERM} = sub { exit };
1896 2230
1897{ 2231{
1898 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2232 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2233 CFPlus::DB::Server::run;
2234
1899 CFPlus::UI::set_layout ($::CFG->{layout}); 2235 CFPlus::UI::set_layout ($::CFG->{layout});
1900 2236
1901 my %DEF_CFG = ( 2237 my %DEF_CFG = (
1902 sdl_mode => 0, 2238 sdl_mode => 0,
1903 width => 640, 2239 width => 640,
1904 height => 480, 2240 height => 480,
1905 fullscreen => 0, 2241 fullscreen => 0,
1906 fast => 0, 2242 fast => 0,
1907 map_scale => 1, 2243 map_scale => 1,
1908 fow_enable => 1, 2244 fow_enable => 1,
1909 fow_intensity => 0.45, 2245 fow_intensity => 0,
1910 fow_smooth => 0, 2246 map_smoothing => 1,
1911 gui_fontsize => 1, 2247 gui_fontsize => 1,
1912 log_fontsize => 0.7, 2248 log_fontsize => 0.7,
1913 gauge_fontsize => 1, 2249 gauge_fontsize => 1,
1914 gauge_size => 0.35, 2250 gauge_size => 0.35,
1915 stat_fontsize => 0.7, 2251 stat_fontsize => 0.7,
1916 mapsize => 100, 2252 mapsize => 100,
1917 say_command => 'say', 2253 say_command => 'chat',
1918 audio_enable => 1, 2254 audio_enable => 1,
1919 bgm_enable => 1, 2255 bgm_enable => 1,
1920 bgm_volume => 0.25, 2256 bgm_volume => 0.25,
1921 face_prefetch => 0, 2257 face_prefetch => 0,
1922 output_sync => 1, 2258 output_sync => 1,
1923 output_count => 1, 2259 output_count => 1,
2260 output_rate => "",
1924 pickup => 0, 2261 pickup => 0,
1925 inv_sort => "mtime", 2262 inv_sort => "mtime",
1926 default => "profile", # default profile 2263 default => "profile", # default profile
2264 show_tips => 1,
2265 logview_max_par => 1000,
1927 ); 2266 );
1928 2267
1929 while (my ($k, $v) = each %DEF_CFG) { 2268 while (my ($k, $v) = each %DEF_CFG) {
1930 $CFG->{$k} = $v unless exists $CFG->{$k}; 2269 $CFG->{$k} = $v unless exists $CFG->{$k};
1931 } 2270 }
1932 2271
1933 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2272 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2273 $PROFILE = $CFG->{profile}{default};
2274
2275 # convert old bindings (only default profile matters)
2276 if (my $bindings = delete $PROFILE->{bindings}) {
2277 while (my ($mod, $syms) = each %$bindings) {
2278 while (my ($sym, $cmds) = each %$syms) {
2279 push @{ $PROFILE->{macro} }, {
2280 accelkey => [$mod*1, $sym*1],
2281 action => $cmds,
2282 };
2283 }
2284 }
2285 }
1934 2286
1935 sdl_init; 2287 sdl_init;
1936 2288
1937 @SDL_MODES = reverse 2289 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1938 grep $_->[0] >= 640 && $_->[1] >= 480, 2290 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1939 CFPlus::SDL_ListModes;
1940
1941 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2291 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2292
2293 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
1942 2294
1943 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2295 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1944 2296
1945 { 2297 {
1946 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2298 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
1975# } 2327# }
1976# my $t2 = Time::HiRes::time; 2328# my $t2 = Time::HiRes::time;
1977# warn $t2-$t1; 2329# warn $t2-$t1;
1978# } 2330# }
1979 2331
2332 $startup_done->();
2333
1980 video_init; 2334 video_init;
1981 audio_init; 2335 audio_init;
1982} 2336}
2337
2338show_tip_of_the_day if $CFG->{show_tips};
1983 2339
1984Event::loop; 2340Event::loop;
1985#CFPlus::SDL_Quit; 2341#CFPlus::SDL_Quit;
1986#CFPlus::_exit 0; 2342#CFPlus::_exit 0;
1987 2343
2344END {
1988END { CFPlus::SDL_Quit } 2345 CFPlus::SDL_Quit;
2346 CFPlus::DB::Server::stop;
2347}
1989 2348
1990=head1 NAME 2349=head1 NAME
1991 2350
1992cfplus - A Crossfire+ and Crossfire game client 2351cfplus - A Crossfire+ and Crossfire game client
1993 2352

Diff Legend

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