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.113 by root, Sun Aug 13 21:46:10 2006 UTC vs.
Revision 1.224 by root, Thu Aug 30 07:57:59 2007 UTC

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

Diff Legend

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