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.120 by root, Sun Oct 1 14:48:51 2006 UTC vs.
Revision 1.230 by root, Mon Oct 8 17:05:29 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines