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.114 by root, Mon Aug 14 01:21:02 2006 UTC vs.
Revision 1.205 by root, Thu Aug 9 03:40:02 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4our $PANGO = "1.5.0";
5
6# do splash-screen thingy on win32
7BEGIN {
8 if (%PAR::LibCache && $^O eq "MSWin32") {
9 while (my ($filename, $zip) = each %PAR::LibCache) {
10 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
11 }
12
13 require Win32::GUI::SplashScreen;
14
15 Win32::GUI::SplashScreen::Show (
16 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
17 );
18
19 $startup_done = sub {
20 Win32::GUI::SplashScreen::Done (1);
21 };
22 }
23}
2 24
3use strict; 25use strict;
4use utf8; 26use utf8;
27
28use Carp 'verbose';
5 29
6# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
7BEGIN { 31BEGIN {
8 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 34
35 my $tmp = $ENV{PAR_TEMP};
36
11 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 38 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 39 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
16 } 42 }
17 } 43 }
18 44
19 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
20 54
21 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
22 } 67 }
23} 68}
24 69
25# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 72 if %PAR::LibCache;
28 73
29use Time::HiRes 'time'; 74use Time::HiRes 'time';
30use Event; 75use Event;
76use List::Util qw(max min);
31 77
32use Crossfire; 78use Crossfire;
33use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
34 80
35use Compress::LZF; 81use Compress::LZF;
36 82
37use CFPlus; 83use CFPlus;
38use CFPlus::OpenGL (); 84use CFPlus::OpenGL ();
39use CFPlus::Protocol; 85use CFPlus::Protocol;
86use CFPlus::DB;
40use CFPlus::UI; 87use CFPlus::UI;
88use CFPlus::UI::Canvas;
89use CFPlus::UI::Inventory;
90use CFPlus::UI::SpellList;
91use CFPlus::UI::MessageWindow;
41use CFPlus::Pod; 92use CFPlus::Pod;
42use CFPlus::BindingEditor;
43use CFPlus::MapWidget; 93use CFPlus::MapWidget;
94use CFPlus::Macro;
44 95
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 96$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 97$SIG{PIPE} = 'IGNORE';
47 98
48$Event::Eval = 0; 99$Event::Eval = 1;
49$Event::DIED = sub { 100$Event::DIED = sub {
50 # TODO: display dialog box or so 101 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFPlus::error $_[1];
53}; 102};
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 103
66my $MAX_FPS = 60; 104my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 105my $MIN_FPS = 5; # unused as of yet
68 106
69our $META_SERVER = "crossfire.real-time.com:13326"; 107our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 108
71our $LAST_REFRESH; 109our $LAST_REFRESH;
72our $NOW; 110our $NOW;
73 111
74our $CFG; 112our $CFG;
75our $CONN; 113our $CONN;
114our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 115our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 116
78our $WANT_REFRESH; 117our $WANT_REFRESH;
79our $CAN_REFRESH; 118our $CAN_REFRESH;
80 119
89 128
90our $MAP; 129our $MAP;
91our $MAPMAP; 130our $MAPMAP;
92our $MAPWIDGET; 131our $MAPWIDGET;
93our $BUTTONBAR; 132our $BUTTONBAR;
94our $LOGVIEW;
95our $CONSOLE;
96our $METASERVER; 133our $METASERVER;
97our $LOGIN_BUTTON; 134our $LOGIN_BUTTON;
98our $QUIT_DIALOG; 135our $QUIT_DIALOG;
99our $HOST_ENTRY; 136our $HOST_ENTRY;
100our $FULLSCREEN_ENABLE; 137our $FULLSCREEN_ENABLE;
107our $SETUP_KEYBOARD; 144our $SETUP_KEYBOARD;
108 145
109our $PL_NOTEBOOK; 146our $PL_NOTEBOOK;
110our $PL_WINDOW; 147our $PL_WINDOW;
111 148
149our $MUSIC_PLAYING_WIDGET;
150our $LICENSE_WIDGET;
151
112our $INVENTORY_PAGE; 152our $INVENTORY_PAGE;
113our $STATS_PAGE; 153our $STATS_PAGE;
114our $SKILL_PAGE; 154our $SKILL_PAGE;
115our $SPELL_PAGE; 155our $SPELL_PAGE;
156our $SPELL_LIST;
116 157
117our $HELP_WINDOW; 158our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 159our $MESSAGE_WINDOW;
119our $FLOORBOX; 160our $FLOORBOX;
120our $GAUGES; 161our $GAUGES;
121our $STATWIDS; 162our $STATWIDS;
122 163
123our $SDL_ACTIVE; 164our $SDL_ACTIVE;
124our %SDL_CB; 165our %SDL_CB;
125 166
126our $SDL_MIXER;
127our @SOUNDS; # event => file mapping
128our %AUDIO_CHUNKS; # audio files
129
130our $ALT_ENTER_MESSAGE; 167our $ALT_ENTER_MESSAGE;
131our $STATUSBOX; 168our $STATUSBOX;
132our $DEBUG_STATUS; 169our $DEBUG_STATUS;
133 170
134our $INV; 171our $INV;
135our $INVR; 172our $INVR;
136our $INV_RIGHT_HB; 173our $INV_RIGHT_HB;
137 174
138our $BIND_EDITOR;
139our $BIND_UPD_CB;
140
141our $PICKUP_CFG; 175our $PICKUP_CFG;
176
177#############################################################################
142 178
143sub status { 179sub status {
144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 180 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 181}
146 182
147sub debug { 183sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 184 $DEBUG_STATUS->set_text ($_[0]);
149} 185}
186
187sub message {
188 my ($para) = @_;
189 $MESSAGE_WINDOW->message ($para);
190}
191
192#############################################################################
193#TODO: maybe move into own audio module...
194
195our $SDL_MIXER;
196
197our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
198our $MUSIC_WANT; # arryref of ambient music we want to play
199our @MUSIC_HAVE; # ambient music we have on disk
200our $MUSIC_START;
201our @MUSIC_JINGLE; # which jingles to play next
202our $MUSIC_PLAYING_DATA;
203our $MUSIC_PLAYING_META;
204our $MUSIC_PLAYER;
205our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
206
207our %AUDIO_CHUNK; # audio "files"
208our %AUDIO_PLAY; # which audio faces should be played
209
210sub audio_channel_finished {
211 my ($channel) = @_;
212
213# warn "channel $channel finished\n";#d#
214}
215
216sub audio_sound_push($) {
217 my ($face) = @_;
218
219 $CFG->{effects_enable}
220 or return;
221
222 if (my $chunk = $AUDIO_CHUNK{$face}) {
223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
224 my (undef, $dx, $dy, $vol) = @$_;
225
226 my $channel = CFPlus::Channel::find;
227 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
228 $dx = $dx / 10 * 255;
229 $channel->set_panning (255 - $dx, 255 + $dx);
230
231# my $angle = $dx ? : $dx < 0 ?
232# my $distance = -$vol;
233# $channel->set_position ($angle, $distance);
234
235 $chunk->play ($channel);
236 }
237 } else {
238 # sound_meta not set means data is in flight either way
239 my $meta = $CONN->{sound_meta}{$face}
240 or return;
241
242 # if its a jingle, play it as ambient music
243 if ($meta->{meta}{jingle}) {
244 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
245 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
246 &audio_music_push ($face);
247 }
248 } else {
249 # fetch from database
250 CFPlus::DB::get res_data => $meta->{name}, sub {
251 my $rwops = new CFPlus::RW $_[0];
252 my $chunk = new CFPlus::MixChunk $rwops
253 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
254 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
255 $AUDIO_CHUNK{$face} = $chunk;
256
257 audio_sound_push ($face);
258 };
259 }
260 }
261}
262
263sub audio_sound_play {
264 my ($face, $dx, $dy, $vol) = @_;
265
266 $SDL_MIXER
267 or return;
268 $CFG->{effects_enable}
269 or return;
270
271 my $queue = $AUDIO_PLAY{$face} ||= [];
272 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
273 audio_sound_push $face
274 unless @$queue > 1;
275}
276
277sub audio_music_set_meta {
278 my ($meta) = @_;
279
280 $MUSIC_PLAYING_META = $meta;
281 $MUSIC_PLAYING_WIDGET->set_markup (
282 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
283 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
284 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
285 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
286 );
287}
288
289sub audio_music_update_volume {
290 return unless $MUSIC_PLAYING_META;
291 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
292 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
293 CFPlus::MixMusic::volume $base * $volume * 128;
294}
295
296sub audio_music_start {
297 my $meta = $MUSIC_PLAYING_META;
298
299 CFPlus::DB::get res_data => $meta->{name}, sub {
300 return unless $SDL_MIXER;
301
302 # music might have changed...
303 $meta eq $MUSIC_PLAYING_META
304 or return &audio_music_start ();
305
306 audio_music_update_volume;
307
308 $MUSIC_PLAYING_DATA = \$_[0];
309
310 my $rwops = $meta->{path}
311 ? new_from_file CFPlus::RW $meta->{path}
312 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
313
314 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
315 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
316
317 my $NOW = time;
318
319 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
320 my $pos = $MUSIC_PLAYING_META->{stop_pos};
321 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
322 $MUSIC_START = time - $pos;
323 } else {
324 $MUSIC_PLAYER->play (0);
325 $MUSIC_START = time;
326 }
327
328 delete $meta->{stop_time};
329 delete $meta->{stop_pos};
330 }
331}
332
333sub audio_music_push {
334 return unless $SDL_MIXER;
335
336 my $fade_out;
337
338 if (@MUSIC_JINGLE) {
339 @MUSIC_HAVE = $MUSIC_JINGLE[0];
340 $fade_out = 333;
341 } else {
342 return unless $CFG->{bgm_enable};
343
344 my @have =
345 grep $_,
346 map $CONN->{music_meta}{$_},
347 @$MUSIC_WANT;
348
349 @MUSIC_HAVE = @have
350 if @have;
351
352 # default MUSIC_HAVE == MUSIC_DEFAULT
353 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
354 $fade_out = 1000;
355 }
356
357 # if the currently playing song is acceptable, let it continue
358 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
359
360 my $NOW = time;
361
362 if ($MUSIC_PLAYING_META) {
363 $MUSIC_PLAYING_META->{stop_time} = $NOW;
364 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
365 CFPlus::MixMusic::fade_out $fade_out;
366 } else {
367 # sort by stop time, oldest first
368 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
369
370 # if the most recently-played piece played very recently,
371 # resume it, else choose the oldest piece for rotation.
372 audio_music_set_meta
373 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
374 ? $MUSIC_HAVE[-1]
375 : $MUSIC_HAVE[0];
376
377 audio_music_start;
378 }
379}
380
381sub audio_music_set_ambient {
382 my ($songs) = @_;
383
384 $MUSIC_WANT = $songs;
385 audio_music_push;
386}
387
388sub audio_music_finished {
389 # we compress multiple jingles of the same type
390 shift @MUSIC_JINGLE
391 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
392
393 $MUSIC_PLAYING_WIDGET->clear;
394
395 undef $MUSIC_PLAYER;
396 undef $MUSIC_PLAYING_META;
397 undef $MUSIC_PLAYING_DATA;
398
399 audio_music_push;
400}
401
402sub audio_init {
403 if ($CFG->{audio_enable}) {
404 $ENV{MIX_EFFECTSMAXSPEED} = 1;
405 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
406
407 unless ($SDL_MIXER) {
408 status "Unable to open sound device: there will be no sound";
409 return;
410 }
411
412 CFPlus::Mix_AllocateChannels 16;
413
414 audio_music_finished;
415 } else {
416 undef $SDL_MIXER;
417 }
418}
419
420sub audio_shutdown {
421 undef $MUSIC_PLAYER;
422 undef $MUSIC_PLAYING_META;
423 undef $MUSIC_PLAYING_DATA;
424
425 $MUSIC_WANT = [];
426 @MUSIC_JINGLE = ();
427 %AUDIO_PLAY = ();
428 %AUDIO_CHUNK = ();
429
430 CFPlus::Mix_CloseAudio if $SDL_MIXER;
431 undef $SDL_MIXER;
432}
433
434#############################################################################
150 435
151sub destroy_query_dialog { 436sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 437 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 438 if $_[0]{query_dialog};
154} 439}
155 440
441# FIXME: a very ugly hack to wait for stat update look below! #d#
442our $QUERY_TIMER; #d#
443
156# server query dialog 444# server query dialog
157sub server_query { 445sub server_query {
158 my ($conn, $flags, $prompt) = @_; 446 my ($conn, $flags, $prompt) = @_;
447
448 # FIXME: a very ugly hack to wait for stat update #d#
449 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
450 unless ($QUERY_TIMER) {
451 $QUERY_TIMER =
452 Event->timer (
453 after => 1,
454 cb => sub {
455 server_query ($conn, $flags, $prompt, 1);
456 $QUERY_TIMER = undef
457 }
458 );
459 return;
460 }
461 }
159 462
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 463 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 464 x => "center",
162 y => "center", 465 y => "center",
163 title => "Server Query", 466 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 467 child => my $vbox = new CFPlus::UI::VBox,
165 ; 468 ;
166 469
167 my @dialog = my $label = new CFPlus::UI::Label 470 my @dialog = my $label = new CFPlus::UI::Label
168 max_w => $::WIDTH * 0.4, 471 max_w => $::WIDTH * 0.8,
169 ellipsise => 0, 472 ellipsise => 0,
170 text => $prompt; 473 text => $prompt;
171 474
172 if ($flags & CS_QUERY_YESNO) { 475 if ($flags & CS_QUERY_YESNO) {
173 push @dialog, my $hbox = new CFPlus::UI::HBox; 476 push @dialog, my $hbox = new CFPlus::UI::HBox;
190 ); 493 );
191 494
192 $dialog->grab_focus; 495 $dialog->grab_focus;
193 496
194 } elsif ($flags & CS_QUERY_SINGLECHAR) { 497 } 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) { 498 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
198 $MESSAGE_WINDOW->show; 499 $dialog->{tooltip} = "#charcreation_focus";
199 500
200 unshift @dialog, new CFPlus::UI::Label 501 unshift @dialog, new CFPlus::UI::Label
201 max_w => $::WIDTH * 0.4, 502 max_w => $::WIDTH * 0.8,
202 ellipsise => 0, 503 ellipsise => 0,
203 markup => "\nOr use your keyboard and the text entry below:\n"; 504 markup => "\nOr use your keyboard and the text entry below:\n";
204 505
205 unshift @dialog, my $table = new CFPlus::UI::Table; 506 unshift @dialog, my $table = new CFPlus::UI::Table;
206 507
207 $table->add (0, 0, new CFPlus::UI::Button 508 $table->add_at (0, 0, new CFPlus::UI::Button
208 text => "Next Race", 509 text => "Next Race",
209 on_activate => sub { 510 on_activate => sub {
210 $conn->send ("reply n"); 511 $conn->send ("reply n");
211 destroy_query_dialog $conn; 512 destroy_query_dialog $conn;
212 0 513 0
213 }, 514 },
214 ); 515 );
215 $table->add (2, 0, new CFPlus::UI::Button 516 $table->add_at (2, 0, new CFPlus::UI::Button
216 text => "Accept", 517 text => "Accept",
217 on_activate => sub { 518 on_activate => sub {
218 $conn->send ("reply d"); 519 $conn->send ("reply d");
219 destroy_query_dialog $conn; 520 destroy_query_dialog $conn;
220 0 521 0
221 }, 522 },
222 ); 523 );
223 524
525 if ($conn->{chargen_race_description}) {
526 unshift @dialog, new CFPlus::UI::Label
527 max_w => $::WIDTH * 0.8,
528 ellipsise => 0,
529 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
530 ;
531 }
532
533 unshift @dialog, new CFPlus::UI::Face
534 face => $conn->{player}{face},
535 bg => [.2, .2, .2, 1],
536 min_w => 64,
537 min_h => 64,
538 ;
539
540 if ($conn->{chargen_race_title}) {
541 unshift @dialog, new CFPlus::UI::Label
542 allign => 1,
543 ellipsise => 0,
544 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
545 ;
546 }
547
224 unshift @dialog, new CFPlus::UI::Label 548 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4, 549 max_w => $::WIDTH * 0.4,
226 ellipsise => 0, 550 ellipsise => 0,
227 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 551 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
228 ; 552 ;
232 $conn->send ("reply $stat"); 556 $conn->send ("reply $stat");
233 destroy_query_dialog $conn; 557 destroy_query_dialog $conn;
234 return; 558 return;
235 } 559 }
236 560
237 $STATS_PAGE->show;
238 $MESSAGE_WINDOW->hide;
239
240 unshift @dialog, new CFPlus::UI::Label 561 unshift @dialog, new CFPlus::UI::Label
241 max_w => $::WIDTH * 0.4, 562 max_w => $::WIDTH * 0.4,
242 ellipsise => 0, 563 ellipsise => 0,
243 markup => "\nOr use your keyboard and the text entry below:\n"; 564 markup => "\nOr use your keyboard and the text entry below:\n";
244 565
245 unshift @dialog, my $table = new CFPlus::UI::Table; 566 unshift @dialog, my $table = new CFPlus::UI::Table;
246 567
247 # left: re-roll 568 # left: re-roll
248 $table->add (0, 0, new CFPlus::UI::Button 569 $table->add_at (0, 0, new CFPlus::UI::Button
249 text => "Roll Again", 570 text => "Roll Again",
250 on_activate => sub { 571 on_activate => sub {
251 $conn->send ("reply y"); 572 $conn->send ("reply y");
252 destroy_query_dialog $conn; 573 destroy_query_dialog $conn;
253 0 574 0
267 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 588 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
268 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 589 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
269 ], 590 ],
270 ), 1 .. 2; 591 ), 1 .. 2;
271 592
272 $table->add (2, 0, new CFPlus::UI::Button 593 $table->add_at (2, 0, new CFPlus::UI::Button
273 text => "Swap Stats", 594 text => "Swap Stats",
274 on_activate => sub { 595 on_activate => sub {
275 $conn->{stat_change_with} = $sw2->{value}; 596 $conn->{stat_change_with} = $sw2->{value};
276 $conn->send ("reply $sw1->{value}"); 597 $conn->send ("reply $sw1->{value}");
277 destroy_query_dialog $conn; 598 destroy_query_dialog $conn;
278 0 599 0
279 }, 600 },
280 ); 601 );
281 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 602 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
282 603
283 # right: accept 604 # right: accept
284 $table->add (4, 0, new CFPlus::UI::Button 605 $table->add_at (4, 0, new CFPlus::UI::Button
285 text => "Accept", 606 text => "Accept",
286 on_activate => sub { 607 on_activate => sub {
287 $conn->send ("reply n"); 608 $conn->send ("reply n");
288 $STATS_PAGE->hide; 609 $STATS_PAGE->hide;
289 destroy_query_dialog $conn; 610 destroy_query_dialog $conn;
354 $LOGIN_BUTTON->set_text ("Logout"); 675 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 676 $SETUP_DIALOG->hide;
356 677
357 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 678 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
358 679
359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 680 my ($host, $port) = split /:/, $PROFILE->{host};
360 681
361 $MAP = new CFPlus::Map $mapsize, $mapsize; 682 $MAP = new CFPlus::Map;
362 683
363 $CONN = eval { 684 $CONN = eval {
364 new CFPlus::Protocol 685 new CFPlus::Protocol
365 host => $host, 686 host => $host,
366 port => $port || 13327, 687 port => $port || 13327,
367 user => $CFG->{profile}{default}{user}, 688 user => $PROFILE->{user},
368 pass => $CFG->{profile}{default}{password}, 689 pass => $PROFILE->{password},
369 mapw => $mapsize, 690 mapw => $mapsize,
370 maph => $mapsize, 691 maph => $mapsize,
371 692
693 client => "cfplus $CFPlus::VERSION $] $^O",
694
372 map_widget => $MAPWIDGET, 695 map_widget => $MAPWIDGET,
373 logview => $LOGVIEW,
374 statusbox => $STATUSBOX, 696 statusbox => $STATUSBOX,
375 map => $MAP, 697 map => $MAP,
376 mapmap => $MAPMAP, 698 mapmap => $MAPMAP,
377 query => \&server_query, 699 query => \&server_query,
378 700
379 sound_play => sub { 701 setup_req => {
380 my ($x, $y, $soundnum, $type) = @_; 702 smoothing => $CFG->{map_smoothing}*1,
381
382 $SDL_MIXER
383 or return;
384
385 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
386 or return;
387
388 $chunk->play;
389 }, 703 },
390 }; 704 };
391 705
392 if ($CONN) { 706 if ($CONN) {
393 CFPlus::lowdelay fileno $CONN->{fh}; 707 CFPlus::lowdelay fileno $CONN->{fh};
402sub stop_game { 716sub stop_game {
403 $LOGIN_BUTTON->set_text ("Login"); 717 $LOGIN_BUTTON->set_text ("Login");
404 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 718 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
405 $SETUP_DIALOG->show; 719 $SETUP_DIALOG->show;
406 $PL_WINDOW->hide; 720 $PL_WINDOW->hide;
407 $SPELL_PAGE->clear_spells; 721 $SPELL_LIST->clear_spells;
722 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
723
724 &audio_music_set_ambient ([]);
408 725
409 return unless $CONN; 726 return unless $CONN;
410 727
411 status "connection closed"; 728 status "connection closed";
412 729
420sub graphics_setup { 737sub graphics_setup {
421 my $vbox = new CFPlus::UI::VBox; 738 my $vbox = new CFPlus::UI::VBox;
422 739
423 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 740 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
424 741
742 my $row = 0;
743
744 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
745 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
746 can_events => 1,
747 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
748
749 my $vidmode_tooltip =
750 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
751 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
752
425 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 753 $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); 754 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
427 755
756 $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]); 757 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"); 758 tooltip => $vidmode_tooltip);
759 $hbox->add (my $mode_label = new CFPlus::UI::Label
760 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
761 can_events => 1, tooltip => $vidmode_tooltip);
430 762
431 $mode_slider->connect (changed => sub { 763 $mode_slider->connect (changed => sub {
432 my ($self, $value) = @_; 764 my ($self, $value) = @_;
433 765
434 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 766 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
435 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 767 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
436 }); 768 });
437 $mode_slider->emit (changed => $mode_slider->{range}[0]); 769 $mode_slider->emit (changed => $mode_slider->{range}[0]);
438 770
439 my $row = 1;
440
441 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 771 $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 772 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
443 state => $CFG->{fullscreen}, 773 state => $CFG->{fullscreen},
444 tooltip => "Bring the client into fullscreen mode.", 774 tooltip => "Bring the client into fullscreen mode.",
445 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 775 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
446 ); 776 );
447 777
448 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 778 $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 779 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
450 state => $CFG->{fast}, 780 state => $CFG->{fast},
451 tooltip => "Lower the visual quality considerably to speed up rendering.", 781 tooltip => "Lower the visual quality considerably to speed up rendering.",
452 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 782 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
453 ); 783 );
454 784
785 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
786 $table->add_at (1, $row++, new CFPlus::UI::Slider
787 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
788 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
789 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
790 );
791
792 $table->add_at (1, $row++, new CFPlus::UI::Button
793 expand => 1, align => 0, text => "Apply",
794 tooltip => "Apply the video settings above.",
795 on_activate => sub {
796 video_shutdown ();
797 video_init ();
798 0
799 }
800 );
801
455 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 802 $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 803 $table->add_at (1, $row++, new CFPlus::UI::Slider
457 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 804 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
458 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 805 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
459 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 806 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
460 ); 807 );
461 808
809 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
810 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
811 state => $CFG->{map_smoothing},
812 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
813 . "This increases load on the graphics subsystem and works only with 2.x servers. "
814 . "Changes take effect at next connection only.",
815 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
816 );
817
462 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 818 $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 819 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
464 state => $CFG->{fow_enable}, 820 state => $CFG->{fow_enable},
465 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 821 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 } 822 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
467 ); 823 );
468 824
469 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 825 $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 826 $table->add_at (1, $row++, new CFPlus::UI::Slider
471 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 827 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.", 828 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 } 829 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
474 ); 830 );
475 831
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"); 832 $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 833 $table->add_at (1, $row++, new CFPlus::UI::Slider
497 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 834 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.", 835 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 }, 836 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
500 ); 837 );
501 838
502 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 839 $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 840 $table->add_at (1, $row++, new CFPlus::UI::Slider
504 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 841 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.", 842 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
506 on_changed => sub { 843 on_changed => sub {
507 $CFG->{gauge_fontsize} = $_[1]; 844 $CFG->{gauge_fontsize} = $_[1];
508 &set_gauge_window_fontsize; 845 &set_gauge_window_fontsize;
509 0 846 0
510 } 847 }
511 ); 848 );
512 849
513 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 850 $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 851 $table->add_at (1, $row++, new CFPlus::UI::Slider
515 range => [$CFG->{gauge_size}, 0.2, 0.8], 852 range => [$CFG->{gauge_size}, 0.2, 0.8],
516 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 853 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
517 on_changed => sub { 854 on_changed => sub {
518 $CFG->{gauge_size} = $_[1]; 855 $CFG->{gauge_size} = $_[1];
519 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 856 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
520 0 857 0
521 } 858 }
522 ); 859 );
523 860
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 861 $vbox
535} 862}
536 863
537sub audio_setup { 864sub audio_setup {
538 my $vbox = new CFPlus::UI::VBox; 865 my $vbox = new CFPlus::UI::VBox;
539 866
540 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 867 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
541 868
542 my $row = 0; 869 my $row = 0;
543 870
544 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 871 $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 872 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
546 state => $CFG->{audio_enable}, 873 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.", 874 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 } 875 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
549 ); 876 );
550# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 877# $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 { 878# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
552# $CFG->{effects_volume} = $_[1]; 879# $CFG->{effects_volume} = $_[1];
553# }); 880# });
881
882 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
883 $table->add_at (1, $row, new CFPlus::UI::CheckBox
884 expand => 1, state => $CFG->{effects_enable},
885 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
886 on_changed => sub {
887 $CFG->{effects_enable} = $_[1];
888 $CONN->update_fx_want if $CONN;
889 0
890 }
891 );
892 $table->add_at (2, $row++, new CFPlus::UI::Slider
893 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
894 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
895 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
896 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
897 );
898
554 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 899 $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);
556 $hbox->add (new CFPlus::UI::CheckBox 900 $table->add_at (1, $row, new CFPlus::UI::CheckBox
557 expand => 1, state => $CFG->{bgm_enable}, 901 expand => 1, state => $CFG->{bgm_enable},
558 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 902 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 } 903 on_changed => sub {
904 $CFG->{bgm_enable} = $_[1];
905 $CONN->update_fx_want if $CONN;
906 0
907 }
560 ); 908 );
561 $hbox->add (new CFPlus::UI::Slider 909 $table->add_at (2, $row++, new CFPlus::UI::Slider
562 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 910 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
563 tooltip => "The volume of the background music. Changes are instant.", 911 tooltip => "The volume of the background music. Changes are instant.",
564 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 912 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
565 ); 913 );
566 914
567 $table->add (1, $row++, new CFPlus::UI::Button 915 $table->add_at (1, $row++, new CFPlus::UI::Button
568 expand => 1, align => 0, text => "Apply", 916 c_colspan => 2, expand => 1, align => 0, text => "Apply",
569 tooltip => "Apply the audio settings", 917 tooltip => "Apply the audio settings",
570 on_activate => sub { 918 on_activate => sub {
571 audio_shutdown (); 919 audio_shutdown ();
572 audio_init (); 920 audio_init ();
573 0 921 0
631} 979}
632 980
633sub debug_setup { 981sub debug_setup {
634 my $table = new CFPlus::UI::Table; 982 my $table = new CFPlus::UI::Table;
635 983
636 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 984 $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 }); 985 $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"); 986 $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 }); 987 $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"); 988 $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 }); 989 $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"); 990 $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 }); 991 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
992 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
644 993
645 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 994 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
646 995
647 for my $x (0..2) { 996 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
648 for my $y (0 .. 2) { 997 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
649 $table->add ($x + 3, $y, 998 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
650 new CFPlus::UI::Entry 999 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
651 text => $default_smooth[$x * 3 + $y], 1000 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
652 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 1001 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
653 ); 1002
654 } 1003 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1004
1005 $c->add_items ({
1006 type => "line_loop",
1007 color => [0, 1, 0],
1008 width => 9,
1009 coord_mode => "abs",
1010 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
655 } 1011 });
656 1012
1013 $c->add_items ({
1014 type => "lines",
1015 color => [1, 1, 0],
1016 width => 2,
1017 coord_mode => "rel",
1018 coord => [[0,0], [1,1], [1,0], [0,1]],
1019 });
1020
1021 $c->add_items ({
1022 type => "polygon",
1023 color => [0, 0.43, 0],
1024 width => 2,
1025 coord_mode => "rel",
1026 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1027 });
657 1028
658 $table 1029 $table
659} 1030}
660 1031
661sub stats_window { 1032sub stats_window {
709 [2, 4, st_spd => "Spd", 10.54], 1080 [2, 4, st_spd => "Spd", 10.54],
710 [2, 5, st_wspd => "WSp", 10.54], 1081 [2, 5, st_wspd => "WSp", 10.54],
711 ) { 1082 ) {
712 my ($col, $row, $id, $label, $template) = @$_; 1083 my ($col, $row, $id, $label, $template) = @$_;
713 1084
714 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1085 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
715 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1086 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
716 align => +1, template => $template, tooltip => "#stat_$label"); 1087 align => +1, template => $template, tooltip => "#stat_$label");
717 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1088 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
718 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1089 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
719 align => -1, text => $label, tooltip => "#stat_$label"); 1090 align => -1, text => $label, tooltip => "#stat_$label");
720 } 1091 }
721 1092
722 $vb->add (new CFPlus::UI::FancyFrame 1093 $vb->add (new CFPlus::UI::FancyFrame
763 cold => ["Cold", 1134 cold => ["Cold",
764 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1135 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
765 ghit => ["Ghost hit", 1136 ghit => ["Ghost hit",
766 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1137 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
767 ); 1138 );
1139
768 for (qw/slow holyw conf fire depl magic 1140 for (qw/slow holyw conf fire depl magic
769 drain acid pois para deat phys 1141 drain acid pois para deat phys
770 blind fear tund elec cold ghit/) 1142 blind fear tund elec cold ghit/)
771 { 1143 {
772 $tbl2->add ($col, $row, 1144 $tbl2->add_at ($col, $row,
773 $STATWIDS->{"res_$_"} = 1145 $STATWIDS->{"res_$_"} =
774 new CFPlus::UI::Label 1146 new CFPlus::UI::Label
775 font => $FONT_FIXED, 1147 font => $FONT_FIXED,
776 template => "-100%", 1148 template => "-100%",
777 align => +1, 1149 align => +1,
778 valign => 0, 1150 valign => 0,
779 can_events => 1, 1151 can_events => 1,
780 can_hover => 1, 1152 can_hover => 1,
781 tooltip => $resist_names{$_}->[1], 1153 tooltip => $resist_names{$_}->[1],
782 ); 1154 );
783 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1155 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
784 font => $FONT_FIXED, 1156 font => $FONT_FIXED,
785 can_hover => 1, 1157 can_hover => 1,
786 can_events => 1, 1158 can_events => 1,
787 path => "ui/resist/resist_$_.png", 1159 path => "ui/resist/resist_$_.png",
788 tooltip => $resist_names{$_}->[1], 1160 tooltip => $resist_names{$_}->[1],
789 ); 1161 );
790 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1162 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
791 text => $resist_names{$_}->[0], 1163 text => $resist_names{$_}->[0],
792 font => $FONT_FIXED, 1164 font => $FONT_FIXED,
793 can_hover => 1, 1165 can_hover => 1,
794 can_events => 1, 1166 can_events => 1,
795 tooltip => $resist_names{$_}->[1], 1167 tooltip => $resist_names{$_}->[1],
828 return if $METASERVER_ATIME > time; 1200 return if $METASERVER_ATIME > time;
829 $METASERVER_ATIME = time + 60; 1201 $METASERVER_ATIME = time + 60;
830 1202
831 my $table = $METASERVER->{table}; 1203 my $table = $METASERVER->{table};
832 $table->clear; 1204 $table->clear;
833 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1205 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
834 1206
835 my $buf; 1207 my $ok = 0;
836 1208
837 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 1209 CFPlus::background {
1210 my $ua = CFPlus::lwp_useragent;
838 1211
839 unless ($fh) { 1212 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
840 $label->set_text ("unable to contact metaserver: $!"); 1213 } sub {
841 return; 1214 my ($msg) = @_;
842 } 1215 if ($msg) {
843
844 Event->io (fd => $fh, poll => 'r', cb => sub {
845 my $res = sysread $fh, $buf, 8192, length $buf;
846
847 if (!defined $res) {
848 $_[0]->w->cancel;
849 $label->set_text ("error while retrieving server list: $!");
850 } elsif ($res == 0) {
851 $_[0]->w->cancel;
852 status "server list retrieved";
853
854 utf8::decode $buf if utf8::valid $buf;
855
856 $table->clear; 1216 $table->clear;
857 1217
858 my @tip = ( 1218 my @tip = (
859 "The current number of users logged in on the server.", 1219 "The current number of users logged in on the server.",
860 "The hostname of the server.", 1220 "The hostname of the server.",
861 "The time this server has been running without being restarted.", 1221 "The time this server has been running without being restarted.",
862 "The server software version - a '+' indicates a Crossfire+ server.", 1222 "The server software version - a '+' indicates a Crossfire+ server.",
863 "Short information about this server provided by its admins.", 1223 "Short information about this server provided by its admins.",
864 ); 1224 );
865 my @col = qw(#Users Host Uptime Version Description); 1225 my @col = qw(#Users Host Uptime Version Description);
866 $table->add ($_, 0, new CFPlus::UI::Label 1226 $table->add_at ($_, 0, new CFPlus::UI::Label
867 can_hover => 1, can_events => 1, 1227 can_hover => 1, can_events => 1,
868 align => 0, fg => [1, 1, 0], 1228 align => 0, fg => [1, 1, 0],
869 text => $col[$_], tooltip => $tip[$_]) 1229 text => $col[$_], tooltip => $tip[$_])
870 for 0 .. $#col; 1230 for 0 .. $#col;
871 1231
872 my @align = qw(1 0 1 1 -1); 1232 my @align = qw(1 0 1 1 -1);
873 1233
874 my $y = 0; 1234 my $y = 0;
875 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 1235 for my $m (@{ $msg->{servers} }) {
876 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 1236 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1237 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
877 1238
878 for ($desc) { 1239 for ($desc) {
879 s/<br>/\n/gi; 1240 s/<br>/\n/gi;
880 s/<li>/\n· /gi; 1241 s/<li>/\n· /gi;
881 s/<.*?>//sgi; 1242 s/<.*?>//sgi;
882 s/&/&amp;/g; 1243 s/&amp;/&/g;
883 s/</&lt;/g; 1244 s/&lt;/</g;
884 s/>/&gt;/g; 1245 s/&gt;/>/g;
885 } 1246 }
886 1247
887 $uptime = sprintf "%dd %02d:%02d:%02d", 1248 $uptime = sprintf "%dd %02d:%02d:%02d",
888 (int $m->[8] / 86400), 1249 (int $uptime / 86400),
889 (int $m->[8] / 3600) % 24, 1250 (int $uptime / 3600) % 24,
890 (int $m->[8] / 60) % 60, 1251 (int $uptime / 60) % 60,
891 $m->[8] % 60; 1252 $uptime % 60;
892 1253
893 $m = [$users, $host, $uptime, $version, $desc]; 1254 $m = [$users, $host, $uptime, $version, $desc];
894 1255
895 $y++; 1256 $y++;
896 1257
897 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1258 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
898 (new CFPlus::UI::Button 1259 (new CFPlus::UI::Button
899 text => "Use", 1260 text => "Use",
900 tooltip => "Put this server into the <b>Host:Port</b> field", 1261 tooltip => "Put this server into the <b>Host:Port</b> field",
901 on_activate => sub { 1262 on_activate => sub {
902 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1263 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
905 }, 1266 },
906 ), 1267 ),
907 (new CFPlus::UI::Empty expand => 1), 1268 (new CFPlus::UI::Empty expand => 1),
908 ]); 1269 ]);
909 1270
910 $table->add ($_, $y, new CFPlus::UI::Label 1271 $table->add_at ($_, $y, new CFPlus::UI::Label
1272 max_w => $::WIDTH * 0.4,
911 ellipsise => 0, 1273 ellipsise => 0,
912 align => $align[$_], 1274 align => $align[$_],
913 text => $m->[$_], 1275 text => $m->[$_],
914 tooltip => $tip[$_], 1276 tooltip => $tip[$_],
1277 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
915 can_hover => 1, 1278 can_hover => 1,
916 can_events => 1, 1279 can_events => 1,
917 fontsize => 0.8) 1280 fontsize => 0.8)
918 for 0 .. $#$m; 1281 for 0 .. $#$m;
919 } 1282 }
1283 } else {
1284 $ok or $label->set_text ("error while contacting metaserver");
920 } 1285 }
921 }); 1286 };
1287
922} 1288}
923 1289
924sub metaserver_dialog { 1290sub metaserver_dialog {
925 my $vbox = new CFPlus::UI::VBox; 1291 my $vbox = new CFPlus::UI::VBox;
926 my $table = new CFPlus::UI::Table; 1292 my $table = new CFPlus::UI::Table;
930 title => "Server List", 1296 title => "Server List",
931 name => 'metaserver_dialog', 1297 name => 'metaserver_dialog',
932 x => 'center', 1298 x => 'center',
933 y => 'center', 1299 y => 'center',
934 z => 3, 1300 z => 3,
1301 force_w => $::WIDTH * 0.9,
935 force_h => $::HEIGHT * 0.4, 1302 force_h => $::HEIGHT * 0.7,
936 child => $vbox, 1303 child => $vbox,
937 has_close_button => 1, 1304 has_close_button => 1,
938 table => $table, 1305 table => $table,
939 on_visibility_change => sub { 1306 on_visibility_change => sub {
940 update_metaserver ($_[0]) if $_[1]; 1307 update_metaserver ($_[0]) if $_[1];
950 1317
951 $vbox->add (new CFPlus::UI::FancyFrame 1318 $vbox->add (new CFPlus::UI::FancyFrame
952 label => "Connection Settings", 1319 label => "Connection Settings",
953 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1320 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
954 ); 1321 );
955 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1322 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
956 1323
957 { 1324 {
958 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1325 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
959 1326
960 $vbox->add ( 1327 $vbox->add (
961 $HOST_ENTRY = new CFPlus::UI::Entry 1328 $HOST_ENTRY = new CFPlus::UI::Entry
962 expand => 1, 1329 expand => 1,
963 text => $CFG->{profile}{default}{host}, 1330 text => $CFG->{profile}{default}{host},
964 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1331 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
965 on_changed => sub { 1332 on_changed => sub {
966 my ($self, $value) = @_; 1333 my ($self, $value) = @_;
967 $CFG->{profile}{default}{host} = $value; 1334 $CFG->{profile}{default}{host} = $value;
968 0 1335 1
969 } 1336 }
970 ); 1337 );
971 1338
972 $vbox->add (new CFPlus::UI::Button 1339 $vbox->add (new CFPlus::UI::Button
973 expand => 1, 1340 expand => 1,
974 text => "Server List", 1341 text => "Server List",
975 other => $METASERVER, 1342 other => $METASERVER,
976 tooltip => "Show a list of available crossfire servers", 1343 tooltip => "Show a list of available crossfire servers",
977 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1344 on_activate => sub { $METASERVER->toggle_visibility; 0 },
978 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1345 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
979 ); 1346 );
980 } 1347 }
981 1348
982 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1349 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
983 $table->add (1, 4, new CFPlus::UI::Entry 1350 $table->add_at (1, 4, new CFPlus::UI::Entry
984 text => $CFG->{profile}{default}{user}, 1351 text => $CFG->{profile}{default}{user},
985 tooltip => "The name of your character on the server", 1352 tooltip => "The name of your character on the server",
986 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1353 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
987 ); 1354 );
988 1355
989 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1356 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
990 $table->add (1, 5, new CFPlus::UI::Entry 1357 $table->add_at (1, 5, new CFPlus::UI::Entry
991 text => $CFG->{profile}{default}{password}, 1358 text => $CFG->{profile}{default}{password},
992 hidden => 1, 1359 hidden => 1,
993 tooltip => "The password for your character", 1360 tooltip => "The password for your character",
994 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1361 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
995 ); 1362 );
996 1363
997 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1364 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
998 $table->add (1, 7, new CFPlus::UI::Slider 1365 $table->add_at (1, 7, new CFPlus::UI::Slider
999 force_w => 100, 1366 force_w => 100,
1000 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1367 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1001 tooltip => "This is the size of the portion of the map update the server sends you. " 1368 tooltip => "This is the size of the portion of the map update the server sends you. "
1002 . "If you set this to a high value you will be able to see further, " 1369 . "If you set this to a high value you will be able to see further, "
1003 . "but you also increase bandwidth requirements and latency. " 1370 . "but you also increase bandwidth requirements and latency. "
1004 . "This option is only used once at log-in.", 1371 . "This option is only used once at log-in.",
1005 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1372 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1006 ); 1373 );
1007 1374
1008 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1375 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1009 $table->add (1, 8, new CFPlus::UI::CheckBox 1376 $table->add_at (1, 8, new CFPlus::UI::Entry
1010 state => $CFG->{face_prefetch}, 1377 text => $CFG->{output_rate},
1011 tooltip => "<b>Background Image Prefetch</b>\n\n" 1378 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1012 . "If enabled, the client automatically pre-fetches images from the server. " 1379 . "when sending data. When 0 or unset, the server "
1013 . "This might increase or create lag, but increases the chances " 1380 . "default will be used, which is usually around 100kb/s. Most servers will "
1014 . "of faces being ready for display when you encounter them. " 1381 . "dynamically find an optimal rate, so adjust this only when necessary.",
1015 . "It also uses up server bandwidth on every connect, "
1016 . "so only set it if you really need to prefetch images. "
1017 . "This option can be set and unset any time.",
1018 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1382 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1019 ); 1383 );
1020 1384
1021 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1385 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1022 $table->add (1, 9, new CFPlus::UI::Entry 1386 $table->add_at (1, 9, new CFPlus::UI::Entry
1023 text => $CFG->{output_count}, 1387 text => $CFG->{output_count},
1024 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1388 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1025 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1389 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1026 ); 1390 );
1027 1391
1028 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1392 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1029 $table->add (1, 10, new CFPlus::UI::Entry 1393 $table->add_at (1, 10, new CFPlus::UI::Entry
1030 text => $CFG->{output_sync}, 1394 text => $CFG->{output_sync},
1031 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1395 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1032 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1396 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1033 ); 1397 );
1034 1398
1035 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1399 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1036 expand => 1, 1400 expand => 1,
1037 align => 0, 1401 align => 0,
1038 text => "Login", 1402 text => "Login",
1039 on_activate => sub { 1403 on_activate => sub {
1040 $CONN ? stop_game 1404 $CONN ? stop_game
1041 : start_game; 1405 : start_game;
1042 0 1406 1
1043 }, 1407 },
1044 );
1045
1046 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1047 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1048 text => $CFG->{say_command},
1049 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. "
1050 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1051 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1052 on_changed => sub {
1053 my ($self, $value) = @_;
1054 $CFG->{say_command} = $value;
1055 0
1056 }
1057 ); 1408 );
1058 1409
1059 $vbox->add (new CFPlus::UI::FancyFrame 1410 $vbox->add (new CFPlus::UI::FancyFrame
1060 label => "Server Info", 1411 label => "Server Info",
1061 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1412 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1062 ); 1413 );
1063 1414
1064 $vbox 1415 $vbox
1065} 1416}
1066 1417
1067sub message_window { 1418sub client_setup {
1068 my $window = new CFPlus::UI::Toplevel 1419 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1069 name => "message_window",
1070 title => "Messages",
1071 border_bg => [1, 1, 1, 1],
1072 x => "max",
1073 y => 0,
1074 force_w => $::WIDTH * 0.4,
1075 force_h => $::HEIGHT * 0.5,
1076 child => (my $vbox = new CFPlus::UI::VBox),
1077 has_close_button => 1;
1078 1420
1079 $vbox->add ($LOGVIEW); 1421 my $row = 0;
1080 1422
1081 $vbox->add (my $input = new CFPlus::UI::Entry 1423 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1082 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1424 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1083 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1425 state => $CFG->{show_tips},
1084 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1426 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1085 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1086 on_focus_in => sub { 1427 on_changed => sub {
1087 my ($input, $prev_focus) = @_; 1428 my ($self, $value) = @_;
1088 1429 $CFG->{show_tips} = $value;
1089 delete $input->{refocus_map};
1090
1091 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1092 $input->{refocus_map} = 1;
1093 } 1430 0
1094 delete $input->{auto_activated}; 1431 }
1432 );
1095 1433
1434 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1435 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1436 text => $CFG->{logview_max_par},
1437 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1438 . "sends more messages than this number, older messages get removed to save memory and "
1439 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1440 on_changed => sub {
1441 my ($self, $value) = @_;
1442 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1096 0 1443 0
1097 }, 1444 },
1098 on_activate => sub {
1099 my ($input, $text) = @_;
1100 $input->set_text ('');
1101
1102 if ($text =~ /^\/(.*)/) {
1103 $::CONN->user_send ($1);
1104 } else {
1105 my $say_cmd = $::CFG->{say_command} || 'say';
1106 $::CONN->user_send ("$say_cmd $text");
1107 }
1108 if ($input->{refocus_map}) {
1109 delete $input->{refocus_map};
1110 $MAPWIDGET->focus_in
1111 }
1112
1113 0
1114 },
1115 on_escape => sub {
1116 $MAPWIDGET->grab_focus;
1117
1118 0
1119 },
1120 );
1121
1122 $CONSOLE = {
1123 window => $window,
1124 input => $input,
1125 }; 1445 );
1126 1446
1127 $window 1447 $table
1128}
1129
1130sub open_string_query {
1131 my $cb = $_[1];
1132 my $dialog = new CFPlus::UI::Toplevel
1133 x => "center",
1134 y => "center",
1135 z => 50,
1136 force_w => $WIDTH * 4/5,
1137 title => $_[0];
1138
1139 $dialog->add (
1140 my $e = new CFPlus::UI::Entry
1141 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1142 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1143 );
1144
1145 $e->grab_focus;
1146 $dialog->show;
1147}
1148
1149sub open_quit_dialog {
1150 unless ($QUIT_DIALOG) {
1151 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1152 x => "center",
1153 y => "center",
1154 z => 50,
1155 title => "Really Quit?",
1156 on_key_down => sub {
1157 my ($dialog, $ev) = @_;
1158 $ev->{sym} == 27 and $dialog->hide;
1159 }
1160 ;
1161
1162 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1163
1164 $vb->add (new CFPlus::UI::Label
1165 text => "You should find a savebed and apply it first!",
1166 max_w => $WIDTH * 0.25,
1167 ellipsize => 0,
1168 );
1169 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1170 $hb->add (new CFPlus::UI::Button
1171 text => "Ok",
1172 expand => 1,
1173 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1174 );
1175 $hb->add (new CFPlus::UI::Button
1176 text => "Quit anyway",
1177 expand => 1,
1178 on_activate => sub { exit },
1179 );
1180 }
1181
1182 $QUIT_DIALOG->show;
1183 $QUIT_DIALOG->grab_focus;
1184} 1448}
1185 1449
1186sub autopickup_setup { 1450sub autopickup_setup {
1451 my $r = new CFPlus::UI::ScrolledWindow (
1452 expand => 1,
1453 scroll_y => 1
1454 );
1187 my $table = new CFPlus::UI::Table; 1455 $r->add (my $table = new CFPlus::UI::Table
1456 row_expand => [0],
1457 col_expand => [0, 1, 0, 1],
1458 );
1188 1459
1189 for ( 1460 for (
1190 ["General", 0, 0, 1461 ["General", 0, 0,
1191 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1462 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1192 ["Inhibit autopickup" => PICKUP_INHIBIT], 1463 ["Inhibit autopickup" => PICKUP_INHIBIT],
1206 ["Boots" => PICKUP_BOOTS], 1477 ["Boots" => PICKUP_BOOTS],
1207 ["Gloves" => PICKUP_GLOVES], 1478 ["Gloves" => PICKUP_GLOVES],
1208 ["Cloaks" => PICKUP_CLOAK], 1479 ["Cloaks" => PICKUP_CLOAK],
1209 ], 1480 ],
1210 1481
1211 ["Readables", 2, 2, 1482 ["Readables", 2, 0,
1212 ["Spellbooks" => PICKUP_SPELLBOOK], 1483 ["Spellbooks" => PICKUP_SPELLBOOK],
1213 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1484 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1214 ["Normal Books/Scrolls" => PICKUP_READABLES], 1485 ["Normal Books/Scrolls" => PICKUP_READABLES],
1215 ], 1486 ],
1216 ["Misc", 2, 7, 1487 ["Misc", 2, 5,
1217 ["Food" => PICKUP_FOOD], 1488 ["Food" => PICKUP_FOOD],
1218 ["Drinks" => PICKUP_DRINK], 1489 ["Drinks" => PICKUP_DRINK],
1219 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1490 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1220 ["Keys" => PICKUP_KEY], 1491 ["Keys" => PICKUP_KEY],
1221 ["Magical Items" => PICKUP_MAGICAL], 1492 ["Magical Items" => PICKUP_MAGICAL],
1222 ["Potions" => PICKUP_POTION], 1493 ["Potions" => PICKUP_POTION],
1223 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1494 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1224 ["Ignore cursed" => PICKUP_NOT_CURSED], 1495 ["Ignore cursed" => PICKUP_NOT_CURSED],
1225 ["Jewelery" => PICKUP_JEWELS], 1496 ["Jewelery" => PICKUP_JEWELS],
1497 ["Flesh" => PICKUP_FLESH],
1226 ], 1498 ],
1227 ["Weight/Value ratio", 2, 17] 1499 ["Weight/Value ratio", 2, 17]
1228 ) 1500 )
1229 { 1501 {
1230 my ($title, $x, $y, @bits) = @$_; 1502 my ($title, $x, $y, @bits) = @$_;
1231 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1503 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1232 1504
1233 for (@bits) { 1505 for (@bits) {
1234 ++$y; 1506 ++$y;
1235 1507
1236 my $mask = $_->[1]; 1508 my $mask = $_->[1];
1237 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1509 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1238 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1510 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1239 state => $::CFG->{pickup} & $mask, 1511 state => $::CFG->{pickup} & $mask,
1240 on_changed => sub { 1512 on_changed => sub {
1241 my ($box, $value) = @_; 1513 my ($box, $value) = @_;
1242 1514
1243 if ($value) { 1515 if ($value) {
1254 1526
1255 ${$_->[2]} = $checkbox if $_->[2]; 1527 ${$_->[2]} = $checkbox if $_->[2];
1256 } 1528 }
1257 } 1529 }
1258 1530
1259 $table->add (2, 18, new CFPlus::UI::ValSlider 1531 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1260 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1532 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1261 template => ">= 99", 1533 template => ">= 99",
1262 to_value => sub { ">= " . 5 * $_[0] }, 1534 to_value => sub { ">= " . 5 * $_[0] },
1263 on_changed => sub { 1535 on_changed => sub {
1264 my ($slider, $value) = @_; 1536 my ($slider, $value) = @_;
1267 $::CFG->{pickup} |= int $value 1539 $::CFG->{pickup} |= int $value
1268 if $value; 1540 if $value;
1269 1; 1541 1;
1270 }); 1542 });
1271 1543
1272 $table->add (3, 18, new CFPlus::UI::Button 1544 $table->add_at (3, 18, new CFPlus::UI::Button
1273 text => "set", 1545 text => "set",
1274 on_activate => sub { 1546 on_activate => sub {
1275 $::CONN->send_command ("pickup $::CFG->{pickup}") 1547 $::CONN->send_command ("pickup $::CFG->{pickup}")
1276 if defined $::CONN; 1548 if defined $::CONN;
1277 0 1549 0
1278 }); 1550 });
1279 1551
1280 $table 1552 $r
1281} 1553}
1282 1554
1283my %SORT_ORDER = ( 1555my %SORT_ORDER = (
1284 type => undef, 1556 type => undef,
1285 mtime => sub { sort { 1557 mtime => sub {
1558 my $NOW = time;
1559 sort {
1560 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1561 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1562
1286 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1563 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1287 or $b->{mtime} <=> $a->{mtime} 1564 or $btime <=> $atime
1288 or $a->{type} <=> $b->{type} 1565 or $a->{type} <=> $b->{type}
1566 } @_
1289 } @_ }, 1567 },
1290 weight => sub { sort { 1568 weight => sub { sort {
1291 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1569 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1292 or $a->{type} <=> $b->{type} 1570 or $a->{type} <=> $b->{type}
1293 } @_ }, 1571 } @_ },
1294); 1572);
1319 #TODO# update to weigh/maxweight 1597 #TODO# update to weigh/maxweight
1320 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1598 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1321 1599
1322 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1600 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1323 $sw1->add ($INV = new CFPlus::UI::Inventory); 1601 $sw1->add ($INV = new CFPlus::UI::Inventory);
1602 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1324 1603
1325 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1604 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1326 1605
1327 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1606 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1328 1607
1331 1610
1332 # XXX: Call after $INVR = ... because set_opencont sets the items 1611 # XXX: Call after $INVR = ... because set_opencont sets the items
1333 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1612 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1334 1613
1335 $hb 1614 $hb
1615}
1616
1617sub media_window {
1618 my $vb = new CFPlus::UI::VBox;
1619
1620 $vb->add (new CFPlus::UI::FancyFrame
1621 label => "Currently playing music",
1622 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1623 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1624 );
1625
1626 $vb->add (new CFPlus::UI::FancyFrame
1627 label => "Other media used in this session",
1628 expand => 1,
1629 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1630 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1631 );
1632
1633 $vb
1634}
1635
1636sub add_license {
1637 my ($meta) = @_;
1638
1639 $meta = $meta->{meta}
1640 or return;
1641
1642 $meta->{license} || $meta->{author} || $meta->{source}
1643 or return;
1644
1645 $LICENSE_WIDGET->add_paragraph ({
1646 fg => [1, 1, 1, 1],
1647 markup => "<small>"
1648 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1649 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1650 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1651 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1652 . "</small>",
1653 });
1654 $LICENSE_WIDGET->scroll_to_bottom;
1336} 1655}
1337 1656
1338sub toggle_player_page { 1657sub toggle_player_page {
1339 my ($widget) = @_; 1658 my ($widget) = @_;
1340 1659
1357 has_close_button => 1 1676 has_close_button => 1
1358 ; 1677 ;
1359 1678
1360 my $ntb = 1679 my $ntb =
1361 $PL_NOTEBOOK = 1680 $PL_NOTEBOOK =
1362 new CFPlus::UI::Notebook expand => 1, debug => 1; 1681 new CFPlus::UI::Notebook expand => 1;
1363 1682
1364 $ntb->add ( 1683 $ntb->add_tab (
1365 "Statistics (F2)" => $STATS_PAGE = stats_window, 1684 "Statistics (F2)" => $STATS_PAGE = stats_window,
1366 "Shows statistics, where all your Stats and Resistances are shown." 1685 "Shows statistics, where all your Stats and Resistances are shown."
1367 ); 1686 );
1368 $ntb->add ( 1687 $ntb->add_tab (
1369 "Skills (F3)" => $SKILL_PAGE = skill_window, 1688 "Skills (F3)" => $SKILL_PAGE = skill_window,
1370 "Shows all your Skills." 1689 "Shows all your Skills."
1371 ); 1690 );
1372 1691
1373 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1692 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1374 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1693 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1375 $ntb->add ( 1694 $ntb->add_tab (
1376 "Spellbook (F4)" => $spellsw, 1695 "Spellbook (F4)" => $spellsw,
1377 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1696 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1378 ); 1697 );
1379 $ntb->add ( 1698 $ntb->add_tab (
1380 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1699 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1381 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1700 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1382 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1701 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1383 ); 1702 );
1703 $ntb->add_tab (Pickup => autopickup_setup,
1704 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1705
1706 $ntb->add_tab (Media => media_window,
1707 "License, Author and Source info for media sent by the server.");
1384 1708
1385 $ntb->set_current_page ($INVENTORY_PAGE); 1709 $ntb->set_current_page ($INVENTORY_PAGE);
1386 1710
1387 $plwin->add ($ntb); 1711 $plwin->add ($ntb);
1388 $plwin 1712 $plwin
1389} 1713}
1390 1714
1391sub update_bindings {
1392 $BIND_UPD_CB->() if $BIND_UPD_CB;
1393}
1394
1395sub keyboard_setup { 1715sub keyboard_setup {
1396 my $binding_list = new CFPlus::UI::VBox; 1716 CFPlus::Macro::keyboard_setup
1397
1398 my $refresh;
1399 $refresh = $BIND_UPD_CB = sub {
1400 $binding_list->clear ();
1401
1402 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1403 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1404 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1405 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1406
1407 my $lbl = join "; ", @$cmds;
1408 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1409 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1410 $hb->add (new CFPlus::UI::Button
1411 text => "delete",
1412 tooltip => "Deletes the binding",
1413 on_activate => sub {
1414 $binding_list->remove ($hb);
1415 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1416 0
1417 });
1418
1419 $hb->add (new CFPlus::UI::Button
1420 text => "edit",
1421 tooltip => "Edits the binding",
1422 on_activate => sub {
1423 $::BIND_EDITOR->set_binding (
1424 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1425 sub {
1426 my ($nmod, $nsym, $ncmds) = @_;
1427 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1428 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1429 $refresh->();
1430 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1431 $SETUP_DIALOG->show;
1432 },
1433 sub {
1434 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1435 $SETUP_DIALOG->show;
1436 });
1437 $::BIND_EDITOR->show;
1438 $SETUP_DIALOG->hide;
1439 0
1440 });
1441
1442 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1443 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1444 }
1445 }
1446 };
1447
1448 my $vb = new CFPlus::UI::VBox;
1449 $vb->add (new CFPlus::UI::FancyFrame
1450 label => "Options",
1451 child => (my $hb = new CFPlus::UI::HBox),
1452 );
1453 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1454 $hb->add (new CFPlus::UI::CheckBox
1455 expand => 1,
1456 state => $CFG->{shift_fire_stop},
1457 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1458 on_changed => sub {
1459 my ($cbox, $value) = @_;
1460 $CFG->{shift_fire_stop} = $value;
1461 0
1462 });
1463
1464 $vb->add (new CFPlus::UI::FancyFrame
1465 label => "Bindings",
1466 child => $binding_list);
1467 $vb->add (my $hb = new CFPlus::UI::HBox);
1468
1469 $hb->add (new CFPlus::UI::Button
1470 text => "record new",
1471 expand => 1,
1472 tooltip => "This button opens the binding editor with an empty binding.",
1473 on_activate => sub {
1474 $::BIND_EDITOR->set_binding (undef, undef, [],
1475 sub {
1476 my ($mod, $sym, $cmds) = @_;
1477 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1478 $refresh->();
1479 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1480 $SETUP_DIALOG->show;
1481 },
1482 sub {
1483 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1484 $SETUP_DIALOG->show;
1485 },
1486 );
1487 $SETUP_DIALOG->hide;
1488 $::BIND_EDITOR->show;
1489 0
1490 },
1491 );
1492
1493 $hb->add (new CFPlus::UI::Button
1494 text => "close",
1495 tooltip => "Closes the binding window",
1496 expand => 1,
1497 on_activate => sub {
1498 $SETUP_DIALOG->hide;
1499 0
1500 }
1501 );
1502
1503 $refresh->();
1504
1505 $vb
1506} 1717}
1507 1718
1508sub help_window { 1719sub help_window {
1509 my $win = new CFPlus::UI::Toplevel 1720 my $win = new CFPlus::UI::Toplevel
1510 x => 'center', 1721 x => 'center',
1511 y => 'center', 1722 y => 'center',
1512 z => 2, 1723 z => 4,
1513 name => 'doc_browser', 1724 name => 'doc_browser',
1514 force_w => int $WIDTH * 7/8, 1725 force_w => int $WIDTH * 7/8,
1515 force_h => int $HEIGHT * 7/8, 1726 force_h => int $HEIGHT * 7/8,
1516 title => "Help Browser", 1727 title => "Help Browser",
1517 has_close_button => 1; 1728 has_close_button => 1;
1528 my @history; 1739 my @history;
1529 my @future; 1740 my @future;
1530 my $curnode; 1741 my $curnode;
1531 1742
1532 my $load_node; $load_node = sub { 1743 my $load_node; $load_node = sub {
1533 my ($node) = @_; 1744 my ($node, $para) = @_;
1534 1745
1535 $buttons->clear; 1746 $buttons->clear;
1747
1748 $buttons->add (new CFPlus::UI::Button
1749 text => "⇤",
1750 tooltip => "back to the starting page",
1751 on_activate => sub {
1752 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1753 unshift @future, @history;
1754 @history = ();
1755 $load_node->(@{shift @future});
1756 },
1757 );
1536 1758
1537 if (@history) { 1759 if (@history) {
1538 $buttons->add (new CFPlus::UI::Button 1760 $buttons->add (new CFPlus::UI::Button
1539 text => "⋘", 1761 text => "⋘",
1540 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1]) . "</i>", 1762 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1541 on_activate => sub { 1763 on_activate => sub {
1542 unshift @future, $curnode if $curnode; 1764 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1543 $load_node->(pop @history); 1765 $load_node->(@{pop @history});
1544 }, 1766 },
1545 ); 1767 );
1546 } 1768 }
1547 1769
1548 if (@future) { 1770 if (@future) {
1549 $buttons->add (new CFPlus::UI::Button 1771 $buttons->add (new CFPlus::UI::Button
1550 text => "â‹™", 1772 text => "â‹™",
1551 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0]) . "</i>", 1773 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1552 on_activate => sub { 1774 on_activate => sub {
1553 push @history, $curnode; 1775 push @history, [$curnode, $viewer->current_paragraph];
1554 $load_node->(shift @future); 1776 $load_node->(@{shift @future});
1555 }, 1777 },
1556 ); 1778 );
1557 } 1779 }
1558 1780
1559 $buttons->add (new CFPlus::UI::Label text => " "); 1781 $buttons->add (new CFPlus::UI::Label text => " ");
1564 for my $node (@path) { 1786 for my $node (@path) {
1565 $buttons->add (new CFPlus::UI::Button 1787 $buttons->add (new CFPlus::UI::Button
1566 text => $node->{kw}[0], 1788 text => $node->{kw}[0],
1567 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>", 1789 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1568 on_activate => sub { 1790 on_activate => sub {
1569 push @history, $curnode if $curnode; @future = (); 1791 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1570 $load_node->($node); 1792 $load_node->($node);
1571 }, 1793 },
1572 ); 1794 );
1573 $buttons->add (new CFPlus::UI::Label text => "/"); 1795 $buttons->add (new CFPlus::UI::Label text => "/");
1574 } 1796 }
1577 1799
1578 $curnode = $node; 1800 $curnode = $node;
1579 1801
1580 $viewer->clear; 1802 $viewer->clear;
1581 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode); 1803 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1582 $viewer->set_offset (0); 1804 $viewer->scroll_to ($para);
1583 }; 1805 };
1584 1806
1585 $load_node->(CFPlus::Pod::find pod => "mainpage"); 1807 $load_node->(CFPlus::Pod::find pod => "mainpage");
1586 1808
1587 $CFPlus::Pod::goto_document = sub { 1809 $CFPlus::Pod::goto_document = sub {
1588 my (@path) = @_; 1810 my (@path) = @_;
1589 1811
1590 push @history, $curnode if $curnode; @future = (); 1812 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1591 1813
1592 $load_node->(CFPlus::Pod::find @path); 1814 $load_node->((CFPlus::Pod::find @path)[0]);
1593 $win->show; 1815 $win->show;
1594 }; 1816 };
1595 1817
1596 $win 1818 $win
1819}
1820
1821sub open_string_query {
1822 my ($title, $cb, $txt, $tooltip) = @_;
1823 my $dialog = new CFPlus::UI::Toplevel
1824 x => "center",
1825 y => "center",
1826 z => 50,
1827 force_w => $WIDTH * 4/5,
1828 title => $title;
1829
1830 $dialog->add (
1831 my $e = new CFPlus::UI::Entry
1832 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1833 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1834 tooltip => $tooltip
1835 );
1836
1837 $e->grab_focus;
1838 $e->set_text ($txt) if $txt;
1839 $dialog->show;
1840}
1841
1842sub open_quit_dialog {
1843 unless ($QUIT_DIALOG) {
1844 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1845 x => "center",
1846 y => "center",
1847 z => 50,
1848 title => "Really Quit?",
1849 on_key_down => sub {
1850 my ($dialog, $ev) = @_;
1851 $ev->{sym} == 27 and $dialog->hide;
1852 }
1853 ;
1854
1855 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1856
1857 $vb->add (new CFPlus::UI::Label
1858 text => "You should find a savebed and apply it first!",
1859 max_w => $WIDTH * 0.25,
1860 ellipsize => 0,
1861 );
1862 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1863 $hb->add (new CFPlus::UI::Button
1864 text => "Ok",
1865 expand => 1,
1866 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1867 );
1868 $hb->add (new CFPlus::UI::Button
1869 text => "Quit anyway",
1870 expand => 1,
1871 on_activate => sub { exit },
1872 );
1873 }
1874
1875 $QUIT_DIALOG->show;
1876 $QUIT_DIALOG->grab_focus;
1877}
1878
1879sub show_tip_of_the_day {
1880 # find all tips
1881 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1882
1883 CFPlus::DB::get state => "tip_of_the_day", sub {
1884 my ($todindex) = @_;
1885 $todindex = 0 if $todindex >= @tod;
1886 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1887
1888 # create dialog
1889 my $dialog;
1890
1891 my $close = sub {
1892 $dialog->destroy;
1893 };
1894
1895 $dialog = new CFPlus::UI::Toplevel
1896 x => "center",
1897 y => "center",
1898 z => 3,
1899 name => 'tip_of_the_day',
1900 force_w => int $WIDTH * 4/9,
1901 force_h => int $WIDTH * 2/9,
1902 title => "Tip of the day #" . (1 + $todindex),
1903 child => my $vbox = new CFPlus::UI::VBox,
1904 has_close_button => 1,
1905 on_delete => $close,
1906 ;
1907
1908 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1909 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1910 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1911
1912 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1913
1914 $table->add_at (0, 0, new CFPlus::UI::Button
1915 text => "Close",
1916 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>.",
1917 on_activate => $close,
1918 );
1919
1920 $table->add_at (2, 0, new CFPlus::UI::Button
1921 text => "Next",
1922 tooltip => "Show the next <b>Tip of the day</b>.",
1923 on_activate => sub {
1924 $close->();
1925 &show_tip_of_the_day;
1926 },
1927 );
1928
1929 $dialog->show;
1930 };
1597} 1931}
1598 1932
1599sub sdl_init { 1933sub sdl_init {
1600 CFPlus::SDL_Init 1934 CFPlus::SDL_Init
1601 and die "SDL::Init failed!\n"; 1935 and die "SDL::Init failed!\n";
1602} 1936}
1603 1937
1604sub video_init { 1938sub video_init {
1605 sdl_init;
1606
1607 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1939 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1608 1940
1609 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1941 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1610 1942
1611 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1943 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1612 $FULLSCREEN = $CFG->{fullscreen}; 1944 $FULLSCREEN = $CFG->{fullscreen};
1613 $FAST = $CFG->{fast}; 1945 $FAST = $CFG->{fast};
1614 1946
1615 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1947 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1616 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1948 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1617 1949
1618 $SDL_ACTIVE = 1; 1950 $SDL_ACTIVE = 1;
1619 $LAST_REFRESH = time - 0.01; 1951 $LAST_REFRESH = time - 0.01;
1620 1952
1635 padding => 0, 1967 padding => 0,
1636 z => 100, 1968 z => 100,
1637 force_x => "max", 1969 force_x => "max",
1638 force_y => 0; 1970 force_y => 0;
1639 $DEBUG_STATUS->show; 1971 $DEBUG_STATUS->show;
1640
1641 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1642 1972
1643 $STATUSBOX = new CFPlus::UI::Statusbox; 1973 $STATUSBOX = new CFPlus::UI::Statusbox;
1644 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1974 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1645 1975
1646 (new CFPlus::UI::Frame 1976 (new CFPlus::UI::Frame
1664 1994
1665 $MAPWIDGET = new CFPlus::MapWidget; 1995 $MAPWIDGET = new CFPlus::MapWidget;
1666 $MAPWIDGET->connect (activate_console => sub { 1996 $MAPWIDGET->connect (activate_console => sub {
1667 my ($mapwidget, $preset) = @_; 1997 my ($mapwidget, $preset) = @_;
1668 1998
1669 if ($CONSOLE) { 1999 $MESSAGE_WINDOW->activate_console ($preset)
1670 $CONSOLE->{input}->{auto_activated} = 1; 2000 if $MESSAGE_WINDOW;
1671 $CONSOLE->{input}->grab_focus;
1672
1673 if ($preset && $CONSOLE->{input}->get_text eq '') {
1674 $CONSOLE->{input}->set_text ($preset);
1675 }
1676 }
1677 }); 2001 });
1678 $MAPWIDGET->show; 2002 $MAPWIDGET->show;
1679 $MAPWIDGET->grab_focus; 2003 $MAPWIDGET->grab_focus;
1680
1681 $LOGVIEW = new CFPlus::UI::TextScroller
1682 expand => 1,
1683 font => $FONT_FIXED,
1684 fontsize => $::CFG->{log_fontsize},
1685 indent => -4,
1686 can_hover => 1,
1687 can_events => 1,
1688 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1689 ;
1690 2004
1691 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2005 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1692 title => "Setup", 2006 title => "Setup",
1693 name => "setup_dialog", 2007 name => "setup_dialog",
1694 x => 'center', 2008 x => 'center',
1698 force_h => $::HEIGHT * 0.6, 2012 force_h => $::HEIGHT * 0.6,
1699 has_close_button => 1, 2013 has_close_button => 1,
1700 ; 2014 ;
1701 2015
1702 $METASERVER = metaserver_dialog; 2016 $METASERVER = metaserver_dialog;
2017 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1703 2018
1704 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2019 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1705 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2020 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1706 2021
1707 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2022 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1708 "Configure the server to play on, your username, password and other server-related options."); 2023 "Configure the server to play on, your username, password and other server-related options.");
1709 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 2024 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1710 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 2025 "Configure various client-specific settings.");
1711 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2026 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1712 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2027 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1713 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2028 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1714 "Configure the use of audio, sound effects and background music."); 2029 "Configure the use of audio, sound effects and background music.");
1715 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2030 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1716 "Lets you define, edit and delete key bindings." 2031 "Lets you define, edit and delete key bindings."
1717 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2032 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1718 . "with nothing set and the recording started. After doing the actions you " 2033 . "with nothing set and the recording started. After doing the actions you "
1719 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2034 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1720 . "After pressing the combo the binding will be saved automatically and the " 2035 . "After pressing the combo the binding will be saved automatically and the "
1721 . "binding editor closes"); 2036 . "binding editor closes");
1722 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2037 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1723 "Some debuggin' options. Do not ask."); 2038 "Some debuggin' options. Do not ask.");
1724 2039
1725 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2040 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1726 2041
1727 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2042 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1728 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2043 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1729 2044
1730 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2045 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1731 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2046 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1732 2047
1733 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 2048 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1734 2049
1735 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2050 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1746 }, 2061 },
1747 ); 2062 );
1748 2063
1749 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2064 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1750 tooltip => "View Documentation"); 2065 tooltip => "View Documentation");
2066
1751 2067
1752 $BUTTONBAR->add (new CFPlus::UI::Button 2068 $BUTTONBAR->add (new CFPlus::UI::Button
1753 text => "Quit", 2069 text => "Quit",
1754 tooltip => "Terminates the program", 2070 tooltip => "Terminates the program",
1755 on_activate => sub { 2071 on_activate => sub {
1773 CFPlus::OpenGL::shutdown; 2089 CFPlus::OpenGL::shutdown;
1774 2090
1775 undef $SDL_ACTIVE; 2091 undef $SDL_ACTIVE;
1776} 2092}
1777 2093
1778my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1779my $bgmusic;#TODO#hack#d#
1780
1781sub audio_channel_finished {
1782 my ($channel) = @_;
1783
1784 #warn "channel $channel finished\n";#d#
1785}
1786
1787sub audio_music_finished {
1788 return unless $CFG->{bgm_enable};
1789
1790 # TODO: hack, do play loop and mood music
1791 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1792 $bgmusic->play (0);
1793
1794 push @bgmusic, shift @bgmusic;
1795}
1796
1797sub audio_init {
1798 if ($CFG->{audio_enable}) {
1799 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1800 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1801
1802 unless ($SDL_MIXER) {
1803 status "Unable to open sound device: there will be no sound";
1804 return;
1805 }
1806
1807 CFPlus::Mix_AllocateChannels 8;
1808 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1809
1810 audio_music_finished;
1811
1812 while (<$fh>) {
1813 next if /^\s*#/;
1814 next if /^\s*$/;
1815
1816 my ($file, $volume, $event) = split /\s+/, $_, 3;
1817
1818 push @SOUNDS, "$volume,$file";
1819
1820 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1821 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1822 $chunk->volume ($volume * 128 / 100);
1823 $chunk
1824 };
1825 }
1826 } else {
1827 status "unable to open sound config: $!";
1828 }
1829 }
1830}
1831
1832sub audio_shutdown {
1833 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1834 undef $SDL_MIXER;
1835 @SOUNDS = ();
1836 %AUDIO_CHUNKS = ();
1837}
1838
1839my %animate_object; 2094my %animate_object;
1840my $animate_timer; 2095my $animate_timer;
1841 2096
1842my $fps = 9; 2097my $fps = 9;
1843
1844my %demo;#d#
1845 2098
1846sub force_refresh { 2099sub force_refresh {
1847 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2100 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1848 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2101 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1849 2102
1850 $CFPlus::UI::ROOT->draw; 2103 $CFPlus::UI::ROOT->draw;
1851 2104
1852 $WANT_REFRESH = 0; 2105 $WANT_REFRESH = 0;
1853 $CAN_REFRESH = 0; 2106 $CAN_REFRESH = 0;
1854 $LAST_REFRESH = $NOW; 2107 $LAST_REFRESH = $NOW;
1855 2108
1856 CFPlus::SDL_GL_SwapBuffers; 2109 CFPlus::SDL_GL_SwapBuffers;
1857} 2110}
1858 2111
1859my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2112my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1860 $NOW = time; 2113 $NOW = time;
1861 2114
1862 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2115 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1863 for CFPlus::SDL_PollEvent; 2116 for CFPlus::poll_events;
1864 2117
1865 if (%animate_object) { 2118 if (%animate_object) {
1866 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2119 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1867 $WANT_REFRESH++; 2120 ++$WANT_REFRESH;
1868 } 2121 }
1869 2122
1870 if ($WANT_REFRESH) { 2123 if ($WANT_REFRESH) {
1871 force_refresh; 2124 force_refresh;
1872 } else { 2125 } else {
1882sub animation_stop { 2135sub animation_stop {
1883 my ($widget) = @_; 2136 my ($widget) = @_;
1884 delete $animate_object{$widget}; 2137 delete $animate_object{$widget};
1885} 2138}
1886 2139
1887# check once/second for faces that need to be prefetched
1888# this should, of course, only run on demand, but
1889# SDL forces worse things on us....
1890
1891Event->timer (after => 1, interval => 0.25, cb => sub {
1892 $CONN->face_prefetch
1893 if $CONN;
1894});
1895
1896%SDL_CB = ( 2140%SDL_CB = (
1897 CFPlus::SDL_QUIT => sub { 2141 CFPlus::SDL_QUIT => sub {
1898 Event::unloop -1; 2142 exit;
1899 }, 2143 },
1900 CFPlus::SDL_VIDEORESIZE => sub { 2144 CFPlus::SDL_VIDEORESIZE => sub {
1901 }, 2145 },
1902 CFPlus::SDL_VIDEOEXPOSE => sub { 2146 CFPlus::SDL_VIDEOEXPOSE => sub {
1903 CFPlus::UI::full_refresh; 2147 CFPlus::UI::full_refresh;
1904 }, 2148 },
1905 CFPlus::SDL_ACTIVEEVENT => sub { 2149 CFPlus::SDL_ACTIVEEVENT => sub {
1906# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2150# not useful, as APPACTIVE include sonly iconified state, not unmapped
2151# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2152# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2153# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2154# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2155# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1907 }, 2156 },
1908 CFPlus::SDL_KEYDOWN => sub { 2157 CFPlus::SDL_KEYDOWN => sub {
1909 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2158 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1910 # alt-enter 2159 # alt-enter
1911 $FULLSCREEN_ENABLE->toggle; 2160 $FULLSCREEN_ENABLE->toggle;
1932 2181
1933$SIG{INT} = $SIG{TERM} = sub { exit }; 2182$SIG{INT} = $SIG{TERM} = sub { exit };
1934 2183
1935{ 2184{
1936 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2185 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2186 CFPlus::DB::Server::run;
2187
1937 CFPlus::UI::set_layout ($::CFG->{layout}); 2188 CFPlus::UI::set_layout ($::CFG->{layout});
1938 2189
1939 my %DEF_CFG = ( 2190 my %DEF_CFG = (
1940 sdl_mode => 0, 2191 sdl_mode => 0,
1941 width => 640,
1942 height => 480,
1943 fullscreen => 0, 2192 fullscreen => 0,
1944 fast => 0, 2193 fast => 0,
1945 map_scale => 1, 2194 map_scale => 1,
1946 fow_enable => 1, 2195 fow_enable => 1,
1947 fow_intensity => 0.45, 2196 fow_intensity => 0,
1948 fow_smooth => 0, 2197 map_smoothing => 1,
1949 gui_fontsize => 1, 2198 gui_fontsize => 1,
1950 log_fontsize => 0.7, 2199 log_fontsize => 0.7,
1951 gauge_fontsize => 1, 2200 gauge_fontsize => 1,
1952 gauge_size => 0.35, 2201 gauge_size => 0.35,
1953 stat_fontsize => 0.7, 2202 stat_fontsize => 0.7,
1954 mapsize => 100, 2203 mapsize => 100,
1955 say_command => 'say',
1956 audio_enable => 1, 2204 audio_enable => 1,
2205 effects_enable => 1,
2206 effects_volume => 1,
1957 bgm_enable => 1, 2207 bgm_enable => 1,
1958 bgm_volume => 0.25, 2208 bgm_volume => 0.5,
1959 face_prefetch => 0,
1960 output_sync => 1, 2209 output_sync => 1,
1961 output_count => 1, 2210 output_count => 1,
2211 output_rate => "",
1962 pickup => 0, 2212 pickup => 0,
1963 inv_sort => "mtime", 2213 inv_sort => "mtime",
1964 default => "profile", # default profile 2214 default => "profile", # default profile
2215 show_tips => 1,
2216 logview_max_par => 1000,
1965 ); 2217 );
1966 2218
1967 while (my ($k, $v) = each %DEF_CFG) { 2219 while (my ($k, $v) = each %DEF_CFG) {
1968 $CFG->{$k} = $v unless exists $CFG->{$k}; 2220 $CFG->{$k} = $v unless exists $CFG->{$k};
1969 } 2221 }
1970 2222
1971 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2223 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2224 $PROFILE = $CFG->{profile}{default};
2225
2226 # convert old bindings (only default profile matters)
2227 if (my $bindings = delete $PROFILE->{bindings}) {
2228 while (my ($mod, $syms) = each %$bindings) {
2229 while (my ($sym, $cmds) = each %$syms) {
2230 push @{ $PROFILE->{macro} }, {
2231 accelkey => [$mod*1, $sym*1],
2232 action => $cmds,
2233 };
2234 }
2235 }
2236 }
1972 2237
1973 sdl_init; 2238 sdl_init;
1974 2239
1975 @SDL_MODES = reverse 2240 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1976 grep $_->[0] >= 640 && $_->[1] >= 480, 2241 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1977 CFPlus::SDL_ListModes;
1978
1979 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2242 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2243
2244 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
1980 2245
1981 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2246 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1982 2247
1983 { 2248 {
1984 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2249 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2013# } 2278# }
2014# my $t2 = Time::HiRes::time; 2279# my $t2 = Time::HiRes::time;
2015# warn $t2-$t1; 2280# warn $t2-$t1;
2016# } 2281# }
2017 2282
2283 $startup_done->();
2284
2018 video_init; 2285 video_init;
2019 audio_init; 2286 audio_init;
2020} 2287}
2288
2289show_tip_of_the_day if $CFG->{show_tips};
2021 2290
2022Event::loop; 2291Event::loop;
2023#CFPlus::SDL_Quit; 2292#CFPlus::SDL_Quit;
2024#CFPlus::_exit 0; 2293#CFPlus::_exit 0;
2025 2294
2295END {
2296 video_shutdown;
2297 audio_shutdown;
2026END { CFPlus::SDL_Quit } 2298 CFPlus::SDL_Quit;
2299 CFPlus::DB::Server::stop;
2300}
2027 2301
2028=head1 NAME 2302=head1 NAME
2029 2303
2030cfplus - A Crossfire+ and Crossfire game client 2304cfplus - A Crossfire TRT and Crossfire game client
2031 2305
2032=head1 SYNOPSIS 2306=head1 SYNOPSIS
2033 2307
2034Just run it - no commandline arguments are supported. 2308Just run it - no commandline arguments are supported.
2035 2309
2036=head1 USAGE 2310=head1 USAGE
2037 2311
2038cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2312cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2039fullscreen and interactively. 2313be used in fullscreen mode and interactively.
2040 2314
2041=head1 DEBUGGING 2315=head1 DEBUGGING
2042 2316
2043 2317
2044CFPLUS_DEBUG - environment variable 2318CFPLUS_DEBUG - environment variable

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines