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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines