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.122 by root, Sun Oct 8 21:22:30 2006 UTC vs.
Revision 1.226 by root, Sat Sep 1 07:22:21 2007 UTC

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

Diff Legend

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