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

Diff Legend

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