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.112 by root, Sun Aug 13 20:01:14 2006 UTC vs.
Revision 1.209 by root, Sat Aug 11 14:41:38 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;
… …
89 127
90our $MAP; 128our $MAP;
91our $MAPMAP; 129our $MAPMAP;
92our $MAPWIDGET; 130our $MAPWIDGET;
93our $BUTTONBAR; 131our $BUTTONBAR;
94our $LOGVIEW;
95our $CONSOLE;
96our $METASERVER; 132our $METASERVER;
97our $LOGIN_BUTTON; 133our $LOGIN_BUTTON;
98our $QUIT_DIALOG; 134our $QUIT_DIALOG;
99our $HOST_ENTRY; 135our $HOST_ENTRY;
100our $FULLSCREEN_ENABLE; 136our $FULLSCREEN_ENABLE;
… …
107our $SETUP_KEYBOARD; 143our $SETUP_KEYBOARD;
108 144
109our $PL_NOTEBOOK; 145our $PL_NOTEBOOK;
110our $PL_WINDOW; 146our $PL_WINDOW;
111 147
148our $MUSIC_PLAYING_WIDGET;
149our $LICENSE_WIDGET;
150
112our $INVENTORY_PAGE; 151our $INVENTORY_PAGE;
113our $STATS_PAGE; 152our $STATS_PAGE;
114our $SKILL_PAGE; 153our $SKILL_PAGE;
115our $SPELL_PAGE; 154our $SPELL_PAGE;
155our $SPELL_LIST;
116 156
117our $HELP_WINDOW; 157our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 158our $MESSAGE_WINDOW;
119our $FLOORBOX; 159our $FLOORBOX;
120our $GAUGES; 160our $GAUGES;
121our $STATWIDS; 161our $STATWIDS;
122 162
123our $SDL_ACTIVE; 163our $SDL_ACTIVE;
124our %SDL_CB; 164our %SDL_CB;
125 165
126our $SDL_MIXER;
127our @SOUNDS; # event => file mapping
128our %AUDIO_CHUNKS; # audio files
129
130our $ALT_ENTER_MESSAGE; 166our $ALT_ENTER_MESSAGE;
131our $STATUSBOX; 167our $STATUSBOX;
132our $DEBUG_STATUS; 168our $DEBUG_STATUS;
133 169
134our $INV; 170our $INV;
135our $INVR; 171our $INVR;
136our $INV_RIGHT_HB; 172our $INV_RIGHT_HB;
137 173
138our $BIND_EDITOR;
139our $BIND_UPD_CB;
140
141our $PICKUP_CFG; 174our $PICKUP_CFG;
175
176#############################################################################
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->{sound_meta}{$face}
236 or return;
237
238 # if its a jingle, play it as ambient music
239 if ($meta->{meta}{jingle}) {
240 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
241 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
242 &audio_music_push ($face);
243 }
244 } else {
245 # fetch from database
246 CFPlus::DB::get res_data => $meta->{name}, sub {
247 my $rwops = new CFPlus::RW $_[0];
248 my $chunk = new CFPlus::MixChunk $rwops
249 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
250 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
251 $AUDIO_CHUNK{$face} = $chunk;
252
253 audio_sound_push ($face);
254 };
255 }
256 }
257}
258
259sub audio_sound_play {
260 my ($face, $dx, $dy, $vol) = @_;
261
262 $SDL_MIXER
263 or return;
264 $CFG->{effects_enable}
265 or return;
266
267 my $queue = $AUDIO_PLAY{$face} ||= [];
268 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
269 audio_sound_push $face
270 unless @$queue > 1;
271}
272
273sub audio_music_set_meta {
274 my ($meta) = @_;
275
276 $MUSIC_PLAYING_META = $meta;
277 $MUSIC_PLAYING_WIDGET->set_markup (
278 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
279 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
280 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
281 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
282 );
283}
284
285sub audio_music_update_volume {
286 return unless $MUSIC_PLAYING_META;
287 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
288 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
289 CFPlus::MixMusic::volume $base * $volume * 128;
290}
291
292sub audio_music_start {
293 my $meta = $MUSIC_PLAYING_META;
294
295 CFPlus::DB::get res_data => $meta->{name}, sub {
296 return unless $SDL_MIXER;
297
298 # music might have changed...
299 $meta eq $MUSIC_PLAYING_META
300 or return &audio_music_start ();
301
302 audio_music_update_volume;
303
304 $MUSIC_PLAYING_DATA = \$_[0];
305
306 my $rwops = $meta->{path}
307 ? new_from_file CFPlus::RW $meta->{path}
308 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
309
310 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
311 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
312
313 my $NOW = time;
314
315 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
316 my $pos = $MUSIC_PLAYING_META->{stop_pos};
317 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
318 $MUSIC_START = time - $pos;
319 } else {
320 $MUSIC_PLAYER->play (0);
321 $MUSIC_START = time;
322 }
323
324 delete $meta->{stop_time};
325 delete $meta->{stop_pos};
326 }
327}
328
329sub audio_music_push {
330 return unless $SDL_MIXER;
331
332 my $fade_out;
333
334 if (@MUSIC_JINGLE) {
335 @MUSIC_HAVE = $MUSIC_JINGLE[0];
336 $fade_out = 333;
337 } else {
338 return unless $CFG->{bgm_enable};
339
340 my @have =
341 grep $_,
342 map $CONN->{music_meta}{$_},
343 @$MUSIC_WANT;
344
345 @MUSIC_HAVE = @have
346 if @have;
347
348 # default MUSIC_HAVE == MUSIC_DEFAULT
349 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
350 $fade_out = 1000;
351 }
352
353 # if the currently playing song is acceptable, let it continue
354 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
355
356 my $NOW = time;
357
358 if ($MUSIC_PLAYING_META) {
359 $MUSIC_PLAYING_META->{stop_time} = $NOW;
360 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
361 CFPlus::MixMusic::fade_out $fade_out;
362 } else {
363 # sort by stop time, oldest first
364 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
365
366 # if the most recently-played piece played very recently,
367 # resume it, else choose the oldest piece for rotation.
368 audio_music_set_meta
369 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
370 ? $MUSIC_HAVE[-1]
371 : $MUSIC_HAVE[0];
372
373 audio_music_start;
374 }
375}
376
377sub audio_music_set_ambient {
378 my ($songs) = @_;
379
380 $MUSIC_WANT = $songs;
381 audio_music_push;
382}
383
384sub audio_music_finished {
385 # we compress multiple jingles of the same type
386 shift @MUSIC_JINGLE
387 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
388
389 $MUSIC_PLAYING_WIDGET->clear;
390
391 undef $MUSIC_PLAYER;
392 undef $MUSIC_PLAYING_META;
393 undef $MUSIC_PLAYING_DATA;
394
395 audio_music_push;
396}
397
398sub audio_init {
399 if ($CFG->{audio_enable}) {
400 $ENV{MIX_EFFECTSMAXSPEED} = 1;
401 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
402
403 unless ($SDL_MIXER) {
404 status "Unable to open sound device: there will be no sound";
405 return;
406 }
407
408 CFPlus::Mix_AllocateChannels 16;
409
410 audio_music_finished;
411 } else {
412 undef $SDL_MIXER;
413 }
414}
415
416sub audio_shutdown {
417 undef $MUSIC_PLAYER;
418 undef $MUSIC_PLAYING_META;
419 undef $MUSIC_PLAYING_DATA;
420
421 $MUSIC_WANT = [];
422 @MUSIC_JINGLE = ();
423 %AUDIO_PLAY = ();
424 %AUDIO_CHUNK = ();
425
426 CFPlus::Mix_CloseAudio if $SDL_MIXER;
427 undef $SDL_MIXER;
428}
429
430#############################################################################
150 431
151sub destroy_query_dialog { 432sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 433 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 434 if $_[0]{query_dialog};
154} 435}
155 436
437# FIXME: a very ugly hack to wait for stat update look below! #d#
438our $QUERY_TIMER; #d#
439
156# server query dialog 440# server query dialog
157sub server_query { 441sub server_query {
158 my ($conn, $flags, $prompt) = @_; 442 my ($conn, $flags, $prompt) = @_;
159 443
444 # FIXME: a very ugly hack to wait for stat update #d#
445 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
446 unless ($QUERY_TIMER) {
447 $QUERY_TIMER =
448 Event->timer (
449 after => 1,
450 cb => sub {
451 server_query ($conn, $flags, $prompt, 1);
452 $QUERY_TIMER = undef
453 }
454 );
455 return;
456 }
457 }
458
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame 459 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 460 x => "center",
162 y => "center", 461 y => "center",
163 title => "Server Query", 462 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 463 child => my $vbox = new CFPlus::UI::VBox,
165 ; 464 ;
166 465
167 my @dialog = my $label = new CFPlus::UI::Label 466 my @dialog = my $label = new CFPlus::UI::Label
168 max_w => $::WIDTH * 0.4, 467 max_w => $::WIDTH * 0.8,
169 ellipsise => 0, 468 ellipsise => 0,
170 text => $prompt; 469 text => $prompt;
171 470
172 if ($flags & CS_QUERY_YESNO) { 471 if ($flags & CS_QUERY_YESNO) {
173 push @dialog, my $hbox = new CFPlus::UI::HBox; 472 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
190 ); 489 );
191 490
192 $dialog->grab_focus; 491 $dialog->grab_focus;
193 492
194 } elsif ($flags & CS_QUERY_SINGLECHAR) { 493 } 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) { 494 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
198 $MESSAGE_WINDOW->show; 495 $dialog->{tooltip} = "#charcreation_focus";
199 496
200 unshift @dialog, new CFPlus::UI::Label 497 unshift @dialog, new CFPlus::UI::Label
201 max_w => $::WIDTH * 0.4, 498 max_w => $::WIDTH * 0.8,
202 ellipsise => 0, 499 ellipsise => 0,
203 markup => "\nOr use your keyboard and the text entry below:\n"; 500 markup => "\nOr use your keyboard and the text entry below:\n";
204 501
205 unshift @dialog, my $table = new CFPlus::UI::Table; 502 unshift @dialog, my $table = new CFPlus::UI::Table;
206 503
207 $table->add (0, 0, new CFPlus::UI::Button 504 $table->add_at (0, 0, new CFPlus::UI::Button
208 text => "Next Race", 505 text => "Next Race",
209 on_activate => sub { 506 on_activate => sub {
210 $conn->send ("reply n"); 507 $conn->send ("reply n");
211 destroy_query_dialog $conn; 508 destroy_query_dialog $conn;
212 0 509 0
213 }, 510 },
214 ); 511 );
215 $table->add (2, 0, new CFPlus::UI::Button 512 $table->add_at (2, 0, new CFPlus::UI::Button
216 text => "Accept", 513 text => "Accept",
217 on_activate => sub { 514 on_activate => sub {
218 $conn->send ("reply d"); 515 $conn->send ("reply d");
219 destroy_query_dialog $conn; 516 destroy_query_dialog $conn;
220 0 517 0
221 }, 518 },
222 ); 519 );
223 520
521 if ($conn->{chargen_race_description}) {
522 unshift @dialog, new CFPlus::UI::Label
523 max_w => $::WIDTH * 0.8,
524 ellipsise => 0,
525 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
526 ;
527 }
528
529 unshift @dialog, new CFPlus::UI::Face
530 face => $conn->{player}{face},
531 bg => [.2, .2, .2, 1],
532 min_w => 64,
533 min_h => 64,
534 ;
535
536 if ($conn->{chargen_race_title}) {
537 unshift @dialog, new CFPlus::UI::Label
538 allign => 1,
539 ellipsise => 0,
540 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
541 ;
542 }
543
224 unshift @dialog, new CFPlus::UI::Label 544 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4, 545 max_w => $::WIDTH * 0.4,
226 ellipsise => 0, 546 ellipsise => 0,
227 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 547 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
228 ; 548 ;
… …
232 $conn->send ("reply $stat"); 552 $conn->send ("reply $stat");
233 destroy_query_dialog $conn; 553 destroy_query_dialog $conn;
234 return; 554 return;
235 } 555 }
236 556
237 $STATS_PAGE->show;
238 $MESSAGE_WINDOW->hide;
239
240 unshift @dialog, new CFPlus::UI::Label 557 unshift @dialog, new CFPlus::UI::Label
241 max_w => $::WIDTH * 0.4, 558 max_w => $::WIDTH * 0.4,
242 ellipsise => 0, 559 ellipsise => 0,
243 markup => "\nOr use your keyboard and the text entry below:\n"; 560 markup => "\nOr use your keyboard and the text entry below:\n";
244 561
245 unshift @dialog, my $table = new CFPlus::UI::Table; 562 unshift @dialog, my $table = new CFPlus::UI::Table;
246 563
247 # left: re-roll 564 # left: re-roll
248 $table->add (0, 0, new CFPlus::UI::Button 565 $table->add_at (0, 0, new CFPlus::UI::Button
249 text => "Roll Again", 566 text => "Roll Again",
250 on_activate => sub { 567 on_activate => sub {
251 $conn->send ("reply y"); 568 $conn->send ("reply y");
252 destroy_query_dialog $conn; 569 destroy_query_dialog $conn;
253 0 570 0
… …
267 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 584 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
268 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 585 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
269 ], 586 ],
270 ), 1 .. 2; 587 ), 1 .. 2;
271 588
272 $table->add (2, 0, new CFPlus::UI::Button 589 $table->add_at (2, 0, new CFPlus::UI::Button
273 text => "Swap Stats", 590 text => "Swap Stats",
274 on_activate => sub { 591 on_activate => sub {
275 $conn->{stat_change_with} = $sw2->{value}; 592 $conn->{stat_change_with} = $sw2->{value};
276 $conn->send ("reply $sw1->{value}"); 593 $conn->send ("reply $sw1->{value}");
277 destroy_query_dialog $conn; 594 destroy_query_dialog $conn;
278 0 595 0
279 }, 596 },
280 ); 597 );
281 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 598 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
282 599
283 # right: accept 600 # right: accept
284 $table->add (4, 0, new CFPlus::UI::Button 601 $table->add_at (4, 0, new CFPlus::UI::Button
285 text => "Accept", 602 text => "Accept",
286 on_activate => sub { 603 on_activate => sub {
287 $conn->send ("reply n"); 604 $conn->send ("reply n");
288 $STATS_PAGE->hide; 605 $STATS_PAGE->hide;
289 destroy_query_dialog $conn; 606 destroy_query_dialog $conn;
… …
354 $LOGIN_BUTTON->set_text ("Logout"); 671 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 672 $SETUP_DIALOG->hide;
356 673
357 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 674 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
358 675
359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 676 my ($host, $port) = split /:/, $PROFILE->{host};
360 677
361 $MAP = new CFPlus::Map $mapsize, $mapsize; 678 $MAP = new CFPlus::Map;
362 679
363 $CONN = eval { 680 $CONN = eval {
364 new CFPlus::Protocol 681 new CFPlus::Protocol
365 host => $host, 682 host => $host,
366 port => $port || 13327, 683 port => $port || 13327,
367 user => $CFG->{profile}{default}{user}, 684 user => $PROFILE->{user},
368 pass => $CFG->{profile}{default}{password}, 685 pass => $PROFILE->{password},
369 mapw => $mapsize, 686 mapw => $mapsize,
370 maph => $mapsize, 687 maph => $mapsize,
371 688
689 client => "cfplus $CFPlus::VERSION $] $^O",
690
372 map_widget => $MAPWIDGET, 691 map_widget => $MAPWIDGET,
373 logview => $LOGVIEW,
374 statusbox => $STATUSBOX, 692 statusbox => $STATUSBOX,
375 map => $MAP, 693 map => $MAP,
376 mapmap => $MAPMAP, 694 mapmap => $MAPMAP,
377 query => \&server_query, 695 query => \&server_query,
378 696
379 sound_play => sub { 697 setup_req => {
380 my ($x, $y, $soundnum, $type) = @_; 698 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 }, 699 },
390 }; 700 };
391 701
392 if ($CONN) { 702 if ($CONN) {
393 CFPlus::lowdelay fileno $CONN->{fh}; 703 CFPlus::lowdelay fileno $CONN->{fh};
… …
402sub stop_game { 712sub stop_game {
403 $LOGIN_BUTTON->set_text ("Login"); 713 $LOGIN_BUTTON->set_text ("Login");
404 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 714 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
405 $SETUP_DIALOG->show; 715 $SETUP_DIALOG->show;
406 $PL_WINDOW->hide; 716 $PL_WINDOW->hide;
407 $SPELL_PAGE->clear_spells; 717 $SPELL_LIST->clear_spells;
718 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
719
720 &audio_music_set_ambient ([]);
408 721
409 return unless $CONN; 722 return unless $CONN;
410 723
411 status "connection closed"; 724 status "connection closed";
412 725
… …
420sub graphics_setup { 733sub graphics_setup {
421 my $vbox = new CFPlus::UI::VBox; 734 my $vbox = new CFPlus::UI::VBox;
422 735
423 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 736 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
424 737
738 my $row = 0;
739
740 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
741 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
742 can_events => 1,
743 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
744
745 my $vidmode_tooltip =
746 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
747 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
748
425 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 749 $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); 750 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
427 751
752 $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]); 753 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"); 754 tooltip => $vidmode_tooltip);
755 $hbox->add (my $mode_label = new CFPlus::UI::Label
756 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
757 can_events => 1, tooltip => $vidmode_tooltip);
430 758
431 $mode_slider->connect (changed => sub { 759 $mode_slider->connect (changed => sub {
432 my ($self, $value) = @_; 760 my ($self, $value) = @_;
433 761
434 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 762 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
435 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 763 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
436 }); 764 });
437 $mode_slider->emit (changed => $mode_slider->{range}[0]); 765 $mode_slider->emit (changed => $mode_slider->{range}[0]);
438 766
439 my $row = 1;
440
441 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 767 $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 768 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
443 state => $CFG->{fullscreen}, 769 state => $CFG->{fullscreen},
444 tooltip => "Bring the client into fullscreen mode.", 770 tooltip => "Bring the client into fullscreen mode.",
445 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 771 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
446 ); 772 );
447 773
448 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 774 $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 775 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
450 state => $CFG->{fast}, 776 state => $CFG->{fast},
451 tooltip => "Lower the visual quality considerably to speed up rendering.", 777 tooltip => "Lower the visual quality considerably to speed up rendering.",
452 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 778 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
453 ); 779 );
454 780
781 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
782 $table->add_at (1, $row++, new CFPlus::UI::Slider
783 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
784 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
785 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
786 );
787
788 $table->add_at (1, $row++, new CFPlus::UI::Button
789 expand => 1, align => 0, text => "Apply",
790 tooltip => "Apply the video settings above.",
791 on_activate => sub {
792 video_shutdown ();
793 video_init ();
794 0
795 }
796 );
797
455 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 798 $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 799 $table->add_at (1, $row++, new CFPlus::UI::Slider
457 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 800 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
458 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 801 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
459 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 802 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
460 ); 803 );
461 804
805 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
806 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
807 state => $CFG->{map_smoothing},
808 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
809 . "This increases load on the graphics subsystem and works only with TRT servers. "
810 . "Changes take effect at next connection only.",
811 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
812 );
813
462 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 814 $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 815 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
464 state => $CFG->{fow_enable}, 816 state => $CFG->{fow_enable},
465 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 817 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 } 818 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
467 ); 819 );
468 820
469 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 821 $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 822 $table->add_at (1, $row++, new CFPlus::UI::Slider
471 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 823 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.", 824 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 } 825 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
474 ); 826 );
475 827
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"); 828 $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 829 $table->add_at (1, $row++, new CFPlus::UI::Slider
497 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 830 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.", 831 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
499 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 832 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
500 ); 833 );
501 834
502 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 835 $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 836 $table->add_at (1, $row++, new CFPlus::UI::Slider
504 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 837 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.", 838 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
506 on_changed => sub { 839 on_changed => sub {
507 $CFG->{gauge_fontsize} = $_[1]; 840 $CFG->{gauge_fontsize} = $_[1];
508 &set_gauge_window_fontsize; 841 &set_gauge_window_fontsize;
509 0 842 0
510 } 843 }
511 ); 844 );
512 845
513 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 846 $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 847 $table->add_at (1, $row++, new CFPlus::UI::Slider
515 range => [$CFG->{gauge_size}, 0.2, 0.8], 848 range => [$CFG->{gauge_size}, 0.2, 0.8],
516 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 849 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
517 on_changed => sub { 850 on_changed => sub {
518 $CFG->{gauge_size} = $_[1]; 851 $CFG->{gauge_size} = $_[1];
519 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 852 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
520 0 853 0
521 } 854 }
522 ); 855 );
523 856
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 857 $vbox
535} 858}
536 859
537sub audio_setup { 860sub audio_setup {
538 my $vbox = new CFPlus::UI::VBox; 861 my $vbox = new CFPlus::UI::VBox;
539 862
540 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 863 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
541 864
542 my $row = 0; 865 my $row = 0;
543 866
544 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 867 $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 868 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
546 state => $CFG->{audio_enable}, 869 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.", 870 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 } 871 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
549 ); 872 );
550# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 873# $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 { 874# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
552# $CFG->{effects_volume} = $_[1]; 875# $CFG->{effects_volume} = $_[1];
553# }); 876# });
877
878 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
879 $table->add_at (1, $row, new CFPlus::UI::CheckBox
880 expand => 1, state => $CFG->{effects_enable},
881 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
882 on_changed => sub {
883 $CFG->{effects_enable} = $_[1];
884 $CONN->update_fx_want if $CONN;
885 0
886 }
887 );
888 $table->add_at (2, $row++, new CFPlus::UI::Slider
889 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
890 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
891 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
892 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
893 );
894
554 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 895 $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 896 $table->add_at (1, $row, new CFPlus::UI::CheckBox
557 expand => 1, state => $CFG->{bgm_enable}, 897 expand => 1, state => $CFG->{bgm_enable},
558 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 898 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 } 899 on_changed => sub {
900 $CFG->{bgm_enable} = $_[1];
901 $CONN->update_fx_want if $CONN;
902 0
903 }
560 ); 904 );
561 $hbox->add (new CFPlus::UI::Slider 905 $table->add_at (2, $row++, new CFPlus::UI::Slider
562 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 906 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
563 tooltip => "The volume of the background music. Changes are instant.", 907 tooltip => "The volume of the background music. Changes are instant.",
564 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 908 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
565 ); 909 );
566 910
567 $table->add (1, $row++, new CFPlus::UI::Button 911 $table->add_at (1, $row++, new CFPlus::UI::Button
568 expand => 1, align => 0, text => "Apply", 912 c_colspan => 2, expand => 1, align => 0, text => "Apply",
569 tooltip => "Apply the audio settings", 913 tooltip => "Apply the audio settings",
570 on_activate => sub { 914 on_activate => sub {
571 audio_shutdown (); 915 audio_shutdown ();
572 audio_init (); 916 audio_init ();
573 0 917 0
… …
631} 975}
632 976
633sub debug_setup { 977sub debug_setup {
634 my $table = new CFPlus::UI::Table; 978 my $table = new CFPlus::UI::Table;
635 979
636 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 980 $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 }); 981 $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"); 982 $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 }); 983 $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"); 984 $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 }); 985 $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"); 986 $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 }); 987 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
988 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
644 989
645 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 990 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
646 991
647 for my $x (0..2) { 992 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
648 for my $y (0 .. 2) { 993 $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, 994 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
650 new CFPlus::UI::Entry 995 $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], 996 $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 }, 997 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
653 ); 998
654 } 999 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1000
1001 $c->add_items ({
1002 type => "line_loop",
1003 color => [0, 1, 0],
1004 width => 9,
1005 coord_mode => "abs",
1006 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
655 } 1007 });
656 1008
1009 $c->add_items ({
1010 type => "lines",
1011 color => [1, 1, 0],
1012 width => 2,
1013 coord_mode => "rel",
1014 coord => [[0,0], [1,1], [1,0], [0,1]],
1015 });
1016
1017 $c->add_items ({
1018 type => "polygon",
1019 color => [0, 0.43, 0],
1020 width => 2,
1021 coord_mode => "rel",
1022 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1023 });
657 1024
658 $table 1025 $table
659} 1026}
660 1027
661sub stats_window { 1028sub stats_window {
… …
663 expand => 1, 1030 expand => 1,
664 scroll_y => 1 1031 scroll_y => 1
665 ); 1032 );
666 $r->add (my $vb = new CFPlus::UI::VBox); 1033 $r->add (my $vb = new CFPlus::UI::VBox);
667 1034
1035 $vb->add (new CFPlus::UI::FancyFrame
1036 label => "Player",
1037 child => (my $pi = new CFPlus::UI::VBox),
1038 );
1039
668 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1040 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669 can_hover => 1, can_events => 1, 1041 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."); 1042 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, 1043 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672 can_hover => 1, can_events => 1, 1044 can_hover => 1, can_events => 1,
673 tooltip => "The map you are currently on (if supported by the server)."); 1045 tooltip => "The map you are currently on (if supported by the server).");
674 1046
675 $vb->add (my $hb0 = new CFPlus::UI::HBox); 1047 $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, 1048 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
677 can_hover => 1, can_events => 1, 1049 can_hover => 1, can_events => 1,
678 tooltip => "The weight of the player including all inventory items."); 1050 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, 1051 $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, 1052 can_hover => 1, can_events => 1,
681 tooltip => "The weight limit: you cannot carry more than this."); 1053 tooltip => "The weight limit: you cannot carry more than this.");
682 1054
1055 $vb->add (new CFPlus::UI::FancyFrame
1056 label => "Primary/Secondary Statistics",
683 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 1057 child => (my $hb = new CFPlus::UI::HBox expand => 1),
1058 );
684 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 1059 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
685 1060
686 my $color2 = [1, 1, 0]; 1061 my $color2 = [1, 1, 0];
687 1062
688 for ( 1063 for (
… …
701 [2, 4, st_spd => "Spd", 10.54], 1076 [2, 4, st_spd => "Spd", 10.54],
702 [2, 5, st_wspd => "WSp", 10.54], 1077 [2, 5, st_wspd => "WSp", 10.54],
703 ) { 1078 ) {
704 my ($col, $row, $id, $label, $template) = @$_; 1079 my ($col, $row, $id, $label, $template) = @$_;
705 1080
706 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1081 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
707 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1082 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
708 align => +1, template => $template, tooltip => "#stat_$label"); 1083 align => +1, template => $template, tooltip => "#stat_$label");
709 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1084 $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, 1085 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
711 align => -1, text => $label, tooltip => "#stat_$label"); 1086 align => -1, text => $label, tooltip => "#stat_$label");
712 } 1087 }
713 1088
1089 $vb->add (new CFPlus::UI::FancyFrame
1090 label => "Resistancies",
714 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 1091 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
1092 );
715 1093
716 my $row = 0; 1094 my $row = 0;
717 my $col = 0; 1095 my $col = 0;
718 1096
719 my %resist_names = ( 1097 my %resist_names = (
… …
752 cold => ["Cold", 1130 cold => ["Cold",
753 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1131 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
754 ghit => ["Ghost hit", 1132 ghit => ["Ghost hit",
755 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1133 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
756 ); 1134 );
1135
757 for (qw/slow holyw conf fire depl magic 1136 for (qw/slow holyw conf fire depl magic
758 drain acid pois para deat phys 1137 drain acid pois para deat phys
759 blind fear tund elec cold ghit/) 1138 blind fear tund elec cold ghit/)
760 { 1139 {
761 $tbl2->add ($col, $row, 1140 $tbl2->add_at ($col, $row,
762 $STATWIDS->{"res_$_"} = 1141 $STATWIDS->{"res_$_"} =
763 new CFPlus::UI::Label 1142 new CFPlus::UI::Label
764 font => $FONT_FIXED, 1143 font => $FONT_FIXED,
765 template => "-100%", 1144 template => "-100%",
766 align => +1, 1145 align => +1,
767 valign => 0, 1146 valign => 0,
768 can_events => 1, 1147 can_events => 1,
769 can_hover => 1, 1148 can_hover => 1,
770 tooltip => $resist_names{$_}->[1], 1149 tooltip => $resist_names{$_}->[1],
771 ); 1150 );
772 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1151 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
773 font => $FONT_FIXED, 1152 font => $FONT_FIXED,
774 can_hover => 1, 1153 can_hover => 1,
775 can_events => 1, 1154 can_events => 1,
776 path => "ui/resist/resist_$_.png", 1155 path => "ui/resist/resist_$_.png",
777 tooltip => $resist_names{$_}->[1], 1156 tooltip => $resist_names{$_}->[1],
778 ); 1157 );
779 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1158 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
780 text => $resist_names{$_}->[0], 1159 text => $resist_names{$_}->[0],
781 font => $FONT_FIXED, 1160 font => $FONT_FIXED,
782 can_hover => 1, 1161 can_hover => 1,
783 can_events => 1, 1162 can_events => 1,
784 tooltip => $resist_names{$_}->[1], 1163 tooltip => $resist_names{$_}->[1],
… …
817 return if $METASERVER_ATIME > time; 1196 return if $METASERVER_ATIME > time;
818 $METASERVER_ATIME = time + 60; 1197 $METASERVER_ATIME = time + 60;
819 1198
820 my $table = $METASERVER->{table}; 1199 my $table = $METASERVER->{table};
821 $table->clear; 1200 $table->clear;
822 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1201 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
823 1202
824 my $buf; 1203 my $ok = 0;
825 1204
826 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 1205 CFPlus::background {
1206 my $ua = CFPlus::lwp_useragent;
827 1207
828 unless ($fh) { 1208 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
829 $label->set_text ("unable to contact metaserver: $!"); 1209 } sub {
830 return; 1210 my ($msg) = @_;
831 } 1211 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; 1212 $table->clear;
846 1213
847 my @tip = ( 1214 my @tip = (
848 "The current number of users logged in on the server.", 1215 "The current number of users logged in on the server.",
849 "The hostname of the server.", 1216 "The hostname of the server.",
850 "The time this server has been running without being restarted.", 1217 "The time this server has been running without being restarted.",
851 "The server software version - a '+' indicates a Crossfire+ server.", 1218 "The server software version - a '+' indicates a Crossfire+ server.",
852 "Short information about this server provided by its admins.", 1219 "Short information about this server provided by its admins.",
853 ); 1220 );
854 my @col = qw(#Users Host Uptime Version Description); 1221 my @col = qw(#Users Host Uptime Version Description);
855 $table->add ($_, 0, new CFPlus::UI::Label 1222 $table->add_at ($_, 0, new CFPlus::UI::Label
856 can_hover => 1, can_events => 1, 1223 can_hover => 1, can_events => 1,
857 align => 0, fg => [1, 1, 0], 1224 align => 0, fg => [1, 1, 0],
858 text => $col[$_], tooltip => $tip[$_]) 1225 text => $col[$_], tooltip => $tip[$_])
859 for 0 .. $#col; 1226 for 0 .. $#col;
860 1227
861 my @align = qw(1 0 1 1 -1); 1228 my @align = qw(1 0 1 1 -1);
862 1229
863 my $y = 0; 1230 my $y = 0;
864 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 1231 for my $m (@{ $msg->{servers} }) {
865 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 1232 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1233 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
866 1234
867 for ($desc) { 1235 for ($desc) {
868 s/<br>/\n/gi; 1236 s/<br>/\n/gi;
869 s/<li>/\n· /gi; 1237 s/<li>/\n· /gi;
870 s/<.*?>//sgi; 1238 s/<.*?>//sgi;
871 s/&/&amp;/g; 1239 s/&amp;/&/g;
872 s/</&lt;/g; 1240 s/&lt;/</g;
873 s/>/&gt;/g; 1241 s/&gt;/>/g;
874 } 1242 }
875 1243
876 $uptime = sprintf "%dd %02d:%02d:%02d", 1244 $uptime = sprintf "%dd %02d:%02d:%02d",
877 (int $m->[8] / 86400), 1245 (int $uptime / 86400),
878 (int $m->[8] / 3600) % 24, 1246 (int $uptime / 3600) % 24,
879 (int $m->[8] / 60) % 60, 1247 (int $uptime / 60) % 60,
880 $m->[8] % 60; 1248 $uptime % 60;
881 1249
882 $m = [$users, $host, $uptime, $version, $desc]; 1250 $m = [$users, $host, $uptime, $version, $desc];
883 1251
884 $y++; 1252 $y++;
885 1253
886 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1254 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
887 (new CFPlus::UI::Button 1255 (new CFPlus::UI::Button
888 text => "Use", 1256 text => "Use",
889 tooltip => "Put this server into the <b>Host:Port</b> field", 1257 tooltip => "Put this server into the <b>Host:Port</b> field",
890 on_activate => sub { 1258 on_activate => sub {
891 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1259 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
894 }, 1262 },
895 ), 1263 ),
896 (new CFPlus::UI::Empty expand => 1), 1264 (new CFPlus::UI::Empty expand => 1),
897 ]); 1265 ]);
898 1266
899 $table->add ($_, $y, new CFPlus::UI::Label 1267 $table->add_at ($_, $y, new CFPlus::UI::Label
1268 max_w => $::WIDTH * 0.4,
900 ellipsise => 0, 1269 ellipsise => 0,
901 align => $align[$_], 1270 align => $align[$_],
902 text => $m->[$_], 1271 text => $m->[$_],
903 tooltip => $tip[$_], 1272 tooltip => $tip[$_],
1273 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
904 can_hover => 1, 1274 can_hover => 1,
905 can_events => 1, 1275 can_events => 1,
906 fontsize => 0.8) 1276 fontsize => 0.8)
907 for 0 .. $#$m; 1277 for 0 .. $#$m;
908 } 1278 }
1279 } else {
1280 $ok or $label->set_text ("error while contacting metaserver");
909 } 1281 }
910 }); 1282 };
1283
911} 1284}
912 1285
913sub metaserver_dialog { 1286sub metaserver_dialog {
914 my $vbox = new CFPlus::UI::VBox; 1287 my $vbox = new CFPlus::UI::VBox;
915 my $table = new CFPlus::UI::Table; 1288 my $table = new CFPlus::UI::Table;
916 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 1289 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
917 1290
918 my $dialog = new CFPlus::UI::FancyFrame 1291 my $dialog = new CFPlus::UI::Toplevel
919 title => "Server List", 1292 title => "Server List",
920 name => 'metaserver_dialog', 1293 name => 'metaserver_dialog',
921 x => 'center', 1294 x => 'center',
922 y => 'center', 1295 y => 'center',
923 z => 3, 1296 z => 3,
1297 force_w => $::WIDTH * 0.9,
924 force_h => $::HEIGHT * 0.4, 1298 force_h => $::HEIGHT * 0.7,
925 child => $vbox, 1299 child => $vbox,
926 has_close_button => 1, 1300 has_close_button => 1,
927 table => $table, 1301 table => $table,
928 on_visibility_change => sub { 1302 on_visibility_change => sub {
929 update_metaserver ($_[0]) if $_[1]; 1303 update_metaserver ($_[0]) if $_[1];
… …
935} 1309}
936 1310
937sub server_setup { 1311sub server_setup {
938 my $vbox = new CFPlus::UI::VBox; 1312 my $vbox = new CFPlus::UI::VBox;
939 1313
1314 $vbox->add (new CFPlus::UI::FancyFrame
1315 label => "Connection Settings",
940 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 1316 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1317 );
941 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1318 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
942 1319
943 { 1320 {
944 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1321 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
945 1322
946 $vbox->add ( 1323 $vbox->add (
947 $HOST_ENTRY = new CFPlus::UI::Entry 1324 $HOST_ENTRY = new CFPlus::UI::Entry
948 expand => 1, 1325 expand => 1,
949 text => $CFG->{profile}{default}{host}, 1326 text => $CFG->{profile}{default}{host},
950 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1327 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
951 on_changed => sub { 1328 on_changed => sub {
952 my ($self, $value) = @_; 1329 my ($self, $value) = @_;
953 $CFG->{profile}{default}{host} = $value; 1330 $CFG->{profile}{default}{host} = $value;
954 0 1331 1
955 } 1332 }
956 ); 1333 );
957 1334
958 $vbox->add (new CFPlus::UI::Button 1335 $vbox->add (new CFPlus::UI::Button
959 expand => 1, 1336 expand => 1,
960 text => "Server List", 1337 text => "Server List",
961 other => $METASERVER, 1338 other => $METASERVER,
962 tooltip => "Show a list of available crossfire servers", 1339 tooltip => "Show a list of available crossfire servers",
963 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1340 on_activate => sub { $METASERVER->toggle_visibility; 0 },
964 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1341 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
965 ); 1342 );
966 } 1343 }
967 1344
968 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1345 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
969 $table->add (1, 4, new CFPlus::UI::Entry 1346 $table->add_at (1, 4, new CFPlus::UI::Entry
970 text => $CFG->{profile}{default}{user}, 1347 text => $CFG->{profile}{default}{user},
971 tooltip => "The name of your character on the server", 1348 tooltip => "The name of your character on the server",
972 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1349 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
973 ); 1350 );
974 1351
975 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1352 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
976 $table->add (1, 5, new CFPlus::UI::Entry 1353 $table->add_at (1, 5, new CFPlus::UI::Entry
977 text => $CFG->{profile}{default}{password}, 1354 text => $CFG->{profile}{default}{password},
978 hidden => 1, 1355 hidden => 1,
979 tooltip => "The password for your character", 1356 tooltip => "The password for your character",
980 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1357 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
981 ); 1358 );
982 1359
983 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1360 $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 1361 $table->add_at (1, 7, new CFPlus::UI::Slider
985 force_w => 100, 1362 force_w => 100,
986 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1363 range => [$CFG->{mapsize}, 10, 100, 0, 1],
987 tooltip => "This is the size of the portion of the map update the server sends you. " 1364 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, " 1365 . "If you set this to a high value you will be able to see further, "
989 . "but you also increase bandwidth requirements and latency. " 1366 . "but you also increase bandwidth requirements and latency. "
990 . "This option is only used once at log-in.", 1367 . "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 }, 1368 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
992 ); 1369 );
993 1370
994 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1371 $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 1372 $table->add_at (1, 8, new CFPlus::UI::Entry
996 state => $CFG->{face_prefetch}, 1373 text => $CFG->{output_rate},
997 tooltip => "<b>Background Image Prefetch</b>\n\n" 1374 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. " 1375 . "when sending data. When 0 or unset, the server "
999 . "This might increase or create lag, but increases the chances " 1376 . "default will be used, which is usually around 100kb/s. Most servers will "
1000 . "of faces being ready for display when you encounter them. " 1377 . "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 }, 1378 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1005 ); 1379 );
1006 1380
1007 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1381 $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 1382 $table->add_at (1, 9, new CFPlus::UI::Entry
1009 text => $CFG->{output_count}, 1383 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.", 1384 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 }, 1385 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1012 ); 1386 );
1013 1387
1014 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1388 $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 1389 $table->add_at (1, 10, new CFPlus::UI::Entry
1016 text => $CFG->{output_sync}, 1390 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.", 1391 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 }, 1392 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1019 ); 1393 );
1020 1394
1021 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1395 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1022 expand => 1, 1396 expand => 1,
1023 align => 0, 1397 align => 0,
1024 text => "Login", 1398 text => "Login",
1025 on_activate => sub { 1399 on_activate => sub {
1026 $CONN ? stop_game 1400 $CONN ? stop_game
1027 : start_game; 1401 : start_game;
1402 1
1403 },
1404 );
1405
1406 $vbox->add (new CFPlus::UI::FancyFrame
1407 label => "Server Info",
1408 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1409 );
1410
1411 $vbox
1412}
1413
1414sub client_setup {
1415 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1416
1417 my $row = 0;
1418
1419 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1420 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1421 state => $CFG->{show_tips},
1422 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1423 on_changed => sub {
1424 my ($self, $value) = @_;
1425 $CFG->{show_tips} = $value;
1426 0
1427 }
1428 );
1429
1430 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1431 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1432 text => $CFG->{logview_max_par},
1433 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1434 . "sends more messages than this number, older messages get removed to save memory and "
1435 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1436 on_changed => sub {
1437 my ($self, $value) = @_;
1438 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1028 0 1439 0
1029 }, 1440 },
1030 ); 1441 );
1031 1442
1032 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1443 $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} 1444}
1175 1445
1176sub autopickup_setup { 1446sub autopickup_setup {
1447 my $r = new CFPlus::UI::ScrolledWindow (
1448 expand => 1,
1449 scroll_y => 1
1450 );
1177 my $table = new CFPlus::UI::Table; 1451 $r->add (my $table = new CFPlus::UI::Table
1452 row_expand => [0],
1453 col_expand => [0, 1, 0, 1],
1454 );
1178 1455
1179 for ( 1456 for (
1180 ["General", 0, 0, 1457 ["General", 0, 0,
1181 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1458 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1182 ["Inhibit autopickup" => PICKUP_INHIBIT], 1459 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1196 ["Boots" => PICKUP_BOOTS], 1473 ["Boots" => PICKUP_BOOTS],
1197 ["Gloves" => PICKUP_GLOVES], 1474 ["Gloves" => PICKUP_GLOVES],
1198 ["Cloaks" => PICKUP_CLOAK], 1475 ["Cloaks" => PICKUP_CLOAK],
1199 ], 1476 ],
1200 1477
1201 ["Readables", 2, 2, 1478 ["Readables", 2, 0,
1202 ["Spellbooks" => PICKUP_SPELLBOOK], 1479 ["Spellbooks" => PICKUP_SPELLBOOK],
1203 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1480 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1204 ["Normal Books/Scrolls" => PICKUP_READABLES], 1481 ["Normal Books/Scrolls" => PICKUP_READABLES],
1205 ], 1482 ],
1206 ["Misc", 2, 7, 1483 ["Misc", 2, 5,
1207 ["Food" => PICKUP_FOOD], 1484 ["Food" => PICKUP_FOOD],
1208 ["Drinks" => PICKUP_DRINK], 1485 ["Drinks" => PICKUP_DRINK],
1209 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1486 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1210 ["Keys" => PICKUP_KEY], 1487 ["Keys" => PICKUP_KEY],
1211 ["Magical Items" => PICKUP_MAGICAL], 1488 ["Magical Items" => PICKUP_MAGICAL],
1212 ["Potions" => PICKUP_POTION], 1489 ["Potions" => PICKUP_POTION],
1213 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1490 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1214 ["Ignore cursed" => PICKUP_NOT_CURSED], 1491 ["Ignore cursed" => PICKUP_NOT_CURSED],
1215 ["Jewelery" => PICKUP_JEWELS], 1492 ["Jewelery" => PICKUP_JEWELS],
1493 ["Flesh" => PICKUP_FLESH],
1216 ], 1494 ],
1217 ["Weight/Value ratio", 2, 17] 1495 ["Weight/Value ratio", 2, 17]
1218 ) 1496 )
1219 { 1497 {
1220 my ($title, $x, $y, @bits) = @$_; 1498 my ($title, $x, $y, @bits) = @$_;
1221 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1499 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1222 1500
1223 for (@bits) { 1501 for (@bits) {
1224 ++$y; 1502 ++$y;
1225 1503
1226 my $mask = $_->[1]; 1504 my $mask = $_->[1];
1227 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1505 $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 1506 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1229 state => $::CFG->{pickup} & $mask, 1507 state => $::CFG->{pickup} & $mask,
1230 on_changed => sub { 1508 on_changed => sub {
1231 my ($box, $value) = @_; 1509 my ($box, $value) = @_;
1232 1510
1233 if ($value) { 1511 if ($value) {
… …
1244 1522
1245 ${$_->[2]} = $checkbox if $_->[2]; 1523 ${$_->[2]} = $checkbox if $_->[2];
1246 } 1524 }
1247 } 1525 }
1248 1526
1249 $table->add (2, 18, new CFPlus::UI::ValSlider 1527 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1250 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1528 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1251 template => ">= 99", 1529 template => ">= 99",
1252 to_value => sub { ">= " . 5 * $_[0] }, 1530 to_value => sub { ">= " . 5 * $_[0] },
1253 on_changed => sub { 1531 on_changed => sub {
1254 my ($slider, $value) = @_; 1532 my ($slider, $value) = @_;
… …
1257 $::CFG->{pickup} |= int $value 1535 $::CFG->{pickup} |= int $value
1258 if $value; 1536 if $value;
1259 1; 1537 1;
1260 }); 1538 });
1261 1539
1262 $table->add (3, 18, new CFPlus::UI::Button 1540 $table->add_at (3, 18, new CFPlus::UI::Button
1263 text => "set", 1541 text => "set",
1264 on_activate => sub { 1542 on_activate => sub {
1265 $::CONN->send_command ("pickup $::CFG->{pickup}") 1543 $::CONN->send_command ("pickup $::CFG->{pickup}")
1266 if defined $::CONN; 1544 if defined $::CONN;
1267 0 1545 0
1268 }); 1546 });
1269 1547
1270 $table 1548 $r
1271} 1549}
1272 1550
1273my %SORT_ORDER = ( 1551my %SORT_ORDER = (
1274 type => undef, 1552 type => undef,
1275 mtime => sub { sort { 1553 mtime => sub {
1554 my $NOW = time;
1555 sort {
1556 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1557 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1558
1276 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1559 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1277 or $b->{mtime} <=> $a->{mtime} 1560 or $btime <=> $atime
1278 or $a->{type} <=> $b->{type} 1561 or $a->{type} <=> $b->{type}
1562 } @_
1279 } @_ }, 1563 },
1280 weight => sub { sort { 1564 weight => sub { sort {
1281 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1565 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1282 or $a->{type} <=> $b->{type} 1566 or $a->{type} <=> $b->{type}
1283 } @_ }, 1567 } @_ },
1284); 1568);
… …
1309 #TODO# update to weigh/maxweight 1593 #TODO# update to weigh/maxweight
1310 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1594 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1311 1595
1312 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1596 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1313 $sw1->add ($INV = new CFPlus::UI::Inventory); 1597 $sw1->add ($INV = new CFPlus::UI::Inventory);
1598 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1314 1599
1315 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1600 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1316 1601
1317 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1602 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1318 1603
… …
1321 1606
1322 # XXX: Call after $INVR = ... because set_opencont sets the items 1607 # XXX: Call after $INVR = ... because set_opencont sets the items
1323 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1608 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1324 1609
1325 $hb 1610 $hb
1611}
1612
1613sub media_window {
1614 my $vb = new CFPlus::UI::VBox;
1615
1616 $vb->add (new CFPlus::UI::FancyFrame
1617 label => "Currently playing music",
1618 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1619 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1620 );
1621
1622 $vb->add (new CFPlus::UI::FancyFrame
1623 label => "Other media used in this session",
1624 expand => 1,
1625 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1626 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1627 );
1628
1629 $vb
1630}
1631
1632sub add_license {
1633 my ($meta) = @_;
1634
1635 $meta = $meta->{meta}
1636 or return;
1637
1638 $meta->{license} || $meta->{author} || $meta->{source}
1639 or return;
1640
1641 $LICENSE_WIDGET->add_paragraph ({
1642 fg => [1, 1, 1, 1],
1643 markup => "<small>"
1644 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1645 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1646 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1647 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1648 . "</small>",
1649 });
1650 $LICENSE_WIDGET->scroll_to_bottom;
1326} 1651}
1327 1652
1328sub toggle_player_page { 1653sub toggle_player_page {
1329 my ($widget) = @_; 1654 my ($widget) = @_;
1330 1655
… …
1335 $PL_WINDOW->show; 1660 $PL_WINDOW->show;
1336 } 1661 }
1337} 1662}
1338 1663
1339sub player_window { 1664sub player_window {
1340 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1665 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1341 x => "center", 1666 x => "center",
1342 y => "center", 1667 y => "center",
1343 force_w => $WIDTH * 9/10, 1668 force_w => $WIDTH * 9/10,
1344 force_h => $HEIGHT * 9/10, 1669 force_h => $HEIGHT * 9/10,
1345 title => "Player", 1670 title => "Player",
… …
1347 has_close_button => 1 1672 has_close_button => 1
1348 ; 1673 ;
1349 1674
1350 my $ntb = 1675 my $ntb =
1351 $PL_NOTEBOOK = 1676 $PL_NOTEBOOK =
1352 new CFPlus::UI::Notebook expand => 1, debug => 1; 1677 new CFPlus::UI::Notebook expand => 1;
1353 1678
1354 $ntb->add ( 1679 $ntb->add_tab (
1355 "Statistics (F2)" => $STATS_PAGE = stats_window, 1680 "Statistics (F2)" => $STATS_PAGE = stats_window,
1356 "Shows statistics, where all your Stats and Resistances are shown." 1681 "Shows statistics, where all your Stats and Resistances are shown."
1357 ); 1682 );
1358 $ntb->add ( 1683 $ntb->add_tab (
1359 "Skills (F3)" => $SKILL_PAGE = skill_window, 1684 "Skills (F3)" => $SKILL_PAGE = skill_window,
1360 "Shows all your Skills." 1685 "Shows all your Skills."
1361 ); 1686 );
1362 1687
1363 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1688 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1364 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1689 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1365 $ntb->add ( 1690 $ntb->add_tab (
1366 "Spellbook (F4)" => $spellsw, 1691 "Spellbook (F4)" => $spellsw,
1367 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1692 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1368 ); 1693 );
1369 $ntb->add ( 1694 $ntb->add_tab (
1370 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1695 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1371 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1696 "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." 1697 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1373 ); 1698 );
1699 $ntb->add_tab (Pickup => autopickup_setup,
1700 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1701
1702 $ntb->add_tab (Media => media_window,
1703 "License, Author and Source info for media sent by the server.");
1374 1704
1375 $ntb->set_current_page ($INVENTORY_PAGE); 1705 $ntb->set_current_page ($INVENTORY_PAGE);
1376 1706
1377 $plwin->add ($ntb); 1707 $plwin->add ($ntb);
1378 $plwin 1708 $plwin
1379} 1709}
1380 1710
1381sub update_bindings {
1382 $BIND_UPD_CB->() if $BIND_UPD_CB;
1383}
1384
1385sub keyboard_setup { 1711sub keyboard_setup {
1386 my $binding_list = new CFPlus::UI::VBox; 1712 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} 1713}
1492 1714
1493sub help_window { 1715sub help_window {
1494 my $win = new CFPlus::UI::FancyFrame 1716 my $win = new CFPlus::UI::Toplevel
1495 x => 'center', 1717 x => 'center',
1496 y => 'center', 1718 y => 'center',
1497 z => 2, 1719 z => 4,
1498 name => 'doc_browser', 1720 name => 'doc_browser',
1499 force_w => int $WIDTH * 7/8, 1721 force_w => int $WIDTH * 7/8,
1500 force_h => int $HEIGHT * 7/8, 1722 force_h => int $HEIGHT * 7/8,
1501 title => "Help Browser", 1723 title => "Help Browser",
1502 has_close_button => 1; 1724 has_close_button => 1;
1503 1725
1504 $win->add (my $vbox = new CFPlus::UI::VBox); 1726 $win->add (my $vbox = new CFPlus::UI::VBox);
1505 1727
1728 $vbox->add (new CFPlus::UI::FancyFrame
1729 label => "Navigation",
1506 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1730 child => (my $buttons = new CFPlus::UI::HBox),
1731 );
1507 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1732 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1508 expand => 1, fontsize => 0.8, padding_x => 4); 1733 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1509 1734
1510 my @history; 1735 my @history;
1511 my @future; 1736 my @future;
1512 my $curnode; 1737 my $curnode;
1513 1738
1514 my $load_node; $load_node = sub { 1739 my $load_node; $load_node = sub {
1515 my ($node) = @_; 1740 my ($node, $para) = @_;
1516 1741
1517 $buttons->clear; 1742 $buttons->clear;
1743
1744 $buttons->add (new CFPlus::UI::Button
1745 text => "⇤",
1746 tooltip => "back to the starting page",
1747 on_activate => sub {
1748 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1749 unshift @future, @history;
1750 @history = ();
1751 $load_node->(@{shift @future});
1752 },
1753 );
1518 1754
1519 if (@history) { 1755 if (@history) {
1520 $buttons->add (new CFPlus::UI::Button 1756 $buttons->add (new CFPlus::UI::Button
1521 text => "<", 1757 text => "⋘",
1522 tooltip => "back to " . CFPlus::Pod::full_path_of $history[-1], 1758 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1523 on_activate => sub { 1759 on_activate => sub {
1524 unshift @future, $curnode if $curnode; 1760 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1525 $load_node->(pop @history); 1761 $load_node->(@{pop @history});
1762 },
1526 }); 1763 );
1527 } 1764 }
1528 1765
1529 if (@future) { 1766 if (@future) {
1530 $buttons->add (new CFPlus::UI::Button 1767 $buttons->add (new CFPlus::UI::Button
1531 text => ">", 1768 text => "â‹™",
1532 tooltip => "forward to " . CFPlus::Pod::full_path_of $future[0], 1769 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1533 on_activate => sub { 1770 on_activate => sub {
1534 push @history, $curnode; 1771 push @history, [$curnode, $viewer->current_paragraph];
1535 $load_node->(shift @future); 1772 $load_node->(@{shift @future});
1773 },
1536 }); 1774 );
1537 } 1775 }
1776
1777 $buttons->add (new CFPlus::UI::Label text => " ");
1778
1779 my @path = CFPlus::Pod::full_path_of $node;
1780 pop @path; # drop current node
1781
1782 for my $node (@path) {
1783 $buttons->add (new CFPlus::UI::Button
1784 text => $node->{kw}[0],
1785 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1786 on_activate => sub {
1787 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1788 $load_node->($node);
1789 },
1790 );
1791 $buttons->add (new CFPlus::UI::Label text => "/");
1792 }
1793
1794 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1538 1795
1539 $curnode = $node; 1796 $curnode = $node;
1540 1797
1541 $viewer->clear; 1798 $viewer->clear;
1542 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode); 1799 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1543 $viewer->set_offset (0); 1800 $viewer->scroll_to ($para);
1544 }; 1801 };
1545 1802
1546 $load_node->(CFPlus::Pod::find pod => "mainpage"); 1803 $load_node->(CFPlus::Pod::find pod => "mainpage");
1547 1804
1548 $CFPlus::Pod::on_link = sub { 1805 $CFPlus::Pod::goto_document = sub {
1549 my (@path) = @_; 1806 my (@path) = @_;
1550 1807
1551 push @history, $curnode if $curnode; 1808 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1552 @future = ();
1553 1809
1554 $load_node->(CFPlus::Pod::find @path); 1810 $load_node->((CFPlus::Pod::find @path)[0]);
1555 $win->show; 1811 $win->show;
1556 }; 1812 };
1557 1813
1558 $win 1814 $win
1815}
1816
1817sub open_string_query {
1818 my ($title, $cb, $txt, $tooltip) = @_;
1819 my $dialog = new CFPlus::UI::Toplevel
1820 x => "center",
1821 y => "center",
1822 z => 50,
1823 force_w => $WIDTH * 4/5,
1824 title => $title;
1825
1826 $dialog->add (
1827 my $e = new CFPlus::UI::Entry
1828 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1829 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1830 tooltip => $tooltip
1831 );
1832
1833 $e->grab_focus;
1834 $e->set_text ($txt) if $txt;
1835 $dialog->show;
1836}
1837
1838sub open_quit_dialog {
1839 unless ($QUIT_DIALOG) {
1840 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1841 x => "center",
1842 y => "center",
1843 z => 50,
1844 title => "Really Quit?",
1845 on_key_down => sub {
1846 my ($dialog, $ev) = @_;
1847 $ev->{sym} == 27 and $dialog->hide;
1848 }
1849 ;
1850
1851 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1852
1853 $vb->add (new CFPlus::UI::Label
1854 text => "You should find a savebed and apply it first!",
1855 max_w => $WIDTH * 0.25,
1856 ellipsize => 0,
1857 );
1858 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1859 $hb->add (new CFPlus::UI::Button
1860 text => "Ok",
1861 expand => 1,
1862 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1863 );
1864 $hb->add (new CFPlus::UI::Button
1865 text => "Quit anyway",
1866 expand => 1,
1867 on_activate => sub { exit },
1868 );
1869 }
1870
1871 $QUIT_DIALOG->show;
1872 $QUIT_DIALOG->grab_focus;
1873}
1874
1875sub show_tip_of_the_day {
1876 # find all tips
1877 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1878
1879 CFPlus::DB::get state => "tip_of_the_day", sub {
1880 my ($todindex) = @_;
1881 $todindex = 0 if $todindex >= @tod;
1882 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1883
1884 # create dialog
1885 my $dialog;
1886
1887 my $close = sub {
1888 $dialog->destroy;
1889 };
1890
1891 $dialog = new CFPlus::UI::Toplevel
1892 x => "center",
1893 y => "center",
1894 z => 3,
1895 name => 'tip_of_the_day',
1896 force_w => int $WIDTH * 4/9,
1897 force_h => int $WIDTH * 2/9,
1898 title => "Tip of the day #" . (1 + $todindex),
1899 child => my $vbox = new CFPlus::UI::VBox,
1900 has_close_button => 1,
1901 on_delete => $close,
1902 ;
1903
1904 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1905 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1906 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1907
1908 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1909
1910 $table->add_at (0, 0, new CFPlus::UI::Button
1911 text => "Close",
1912 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>.",
1913 on_activate => $close,
1914 );
1915
1916 $table->add_at (2, 0, new CFPlus::UI::Button
1917 text => "Next",
1918 tooltip => "Show the next <b>Tip of the day</b>.",
1919 on_activate => sub {
1920 $close->();
1921 &show_tip_of_the_day;
1922 },
1923 );
1924
1925 $dialog->show;
1926 };
1559} 1927}
1560 1928
1561sub sdl_init { 1929sub sdl_init {
1562 CFPlus::SDL_Init 1930 CFPlus::SDL_Init
1563 and die "SDL::Init failed!\n"; 1931 and die "SDL::Init failed!\n";
1564} 1932}
1565 1933
1566sub video_init { 1934sub video_init {
1567 sdl_init;
1568
1569 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1935 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1570 1936
1571 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1937 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1572 1938
1573 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1939 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1574 $FULLSCREEN = $CFG->{fullscreen}; 1940 $FULLSCREEN = $CFG->{fullscreen};
1575 $FAST = $CFG->{fast}; 1941 $FAST = $CFG->{fast};
1576 1942
1577 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1943 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1578 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1944 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1579 1945
1580 $SDL_ACTIVE = 1; 1946 $SDL_ACTIVE = 1;
1581 $LAST_REFRESH = time - 0.01; 1947 $LAST_REFRESH = time - 0.01;
1582 1948
… …
1598 z => 100, 1964 z => 100,
1599 force_x => "max", 1965 force_x => "max",
1600 force_y => 0; 1966 force_y => 0;
1601 $DEBUG_STATUS->show; 1967 $DEBUG_STATUS->show;
1602 1968
1603 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1604
1605 $STATUSBOX = new CFPlus::UI::Statusbox; 1969 $STATUSBOX = new CFPlus::UI::Statusbox;
1606 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1970 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1607 1971
1608 (new CFPlus::UI::Frame 1972 (new CFPlus::UI::Frame
1609 bg => [0, 0, 0, 0.4], 1973 bg => [0, 0, 0, 0.4],
1610 force_x => 0, 1974 force_x => 0,
1611 force_y => "max", 1975 force_y => "max",
1612 child => $STATUSBOX, 1976 child => $STATUSBOX,
1613 )->show; 1977 )->show;
1614 1978
1615 CFPlus::UI::FancyFrame->new ( 1979 CFPlus::UI::Toplevel->new (
1616 title => "Map", 1980 title => "Map",
1617 name => "mapmap", 1981 name => "mapmap",
1618 x => 0, 1982 x => 0,
1619 y => $FONTSIZE + 8, 1983 y => $FONTSIZE + 8,
1620 border_bg => [1, 1, 1, 192/255], 1984 border_bg => [1, 1, 1, 192/255],
… …
1626 1990
1627 $MAPWIDGET = new CFPlus::MapWidget; 1991 $MAPWIDGET = new CFPlus::MapWidget;
1628 $MAPWIDGET->connect (activate_console => sub { 1992 $MAPWIDGET->connect (activate_console => sub {
1629 my ($mapwidget, $preset) = @_; 1993 my ($mapwidget, $preset) = @_;
1630 1994
1631 if ($CONSOLE) { 1995 $MESSAGE_WINDOW->activate_console ($preset)
1632 $CONSOLE->{input}->{auto_activated} = 1; 1996 if $MESSAGE_WINDOW;
1633 $CONSOLE->{input}->grab_focus;
1634
1635 if ($preset && $CONSOLE->{input}->get_text eq '') {
1636 $CONSOLE->{input}->set_text ($preset);
1637 }
1638 }
1639 }); 1997 });
1640 $MAPWIDGET->show; 1998 $MAPWIDGET->show;
1641 $MAPWIDGET->grab_focus; 1999 $MAPWIDGET->grab_focus;
1642 2000
1643 $LOGVIEW = new CFPlus::UI::TextScroller
1644 expand => 1,
1645 font => $FONT_FIXED,
1646 fontsize => $::CFG->{log_fontsize},
1647 indent => -4,
1648 can_hover => 1,
1649 can_events => 1,
1650 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1651 ;
1652
1653 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 2001 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1654 title => "Setup", 2002 title => "Setup",
1655 name => "setup_dialog", 2003 name => "setup_dialog",
1656 x => 'center', 2004 x => 'center',
1657 y => 'center', 2005 y => 'center',
1658 z => 2, 2006 z => 2,
… …
1660 force_h => $::HEIGHT * 0.6, 2008 force_h => $::HEIGHT * 0.6,
1661 has_close_button => 1, 2009 has_close_button => 1,
1662 ; 2010 ;
1663 2011
1664 $METASERVER = metaserver_dialog; 2012 $METASERVER = metaserver_dialog;
2013 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1665 2014
1666 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2015 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1667 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2016 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1668 2017
1669 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2018 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1670 "Configure the server to play on, your username, password and other server-related options."); 2019 "Configure the server to play on, your username, password and other server-related options.");
1671 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 2020 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1672 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 2021 "Configure various client-specific settings.");
1673 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2022 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1674 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2023 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1675 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2024 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1676 "Configure the use of audio, sound effects and background music."); 2025 "Configure the use of audio, sound effects and background music.");
1677 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2026 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1678 "Lets you define, edit and delete key bindings." 2027 "Lets you define, edit and delete key bindings."
1679 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2028 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1680 . "with nothing set and the recording started. After doing the actions you " 2029 . "with nothing set and the recording started. After doing the actions you "
1681 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2030 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1682 . "After pressing the combo the binding will be saved automatically and the " 2031 . "After pressing the combo the binding will be saved automatically and the "
1683 . "binding editor closes"); 2032 . "binding editor closes");
1684 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2033 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1685 "Some debuggin' options. Do not ask."); 2034 "Some debuggin' options. Do not ask.");
1686 2035
1687 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2036 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1688 2037
1689 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2038 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1690 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2039 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1691 2040
1692 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2041 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1693 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2042 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1694 2043
1695 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 2044 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
1696 2045
1697 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2046 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1708 }, 2057 },
1709 ); 2058 );
1710 2059
1711 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2060 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1712 tooltip => "View Documentation"); 2061 tooltip => "View Documentation");
2062
1713 2063
1714 $BUTTONBAR->add (new CFPlus::UI::Button 2064 $BUTTONBAR->add (new CFPlus::UI::Button
1715 text => "Quit", 2065 text => "Quit",
1716 tooltip => "Terminates the program", 2066 tooltip => "Terminates the program",
1717 on_activate => sub { 2067 on_activate => sub {
… …
1735 CFPlus::OpenGL::shutdown; 2085 CFPlus::OpenGL::shutdown;
1736 2086
1737 undef $SDL_ACTIVE; 2087 undef $SDL_ACTIVE;
1738} 2088}
1739 2089
1740my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1741my $bgmusic;#TODO#hack#d#
1742
1743sub audio_channel_finished {
1744 my ($channel) = @_;
1745
1746 #warn "channel $channel finished\n";#d#
1747}
1748
1749sub audio_music_finished {
1750 return unless $CFG->{bgm_enable};
1751
1752 # TODO: hack, do play loop and mood music
1753 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1754 $bgmusic->play (0);
1755
1756 push @bgmusic, shift @bgmusic;
1757}
1758
1759sub audio_init {
1760 if ($CFG->{audio_enable}) {
1761 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1762 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1763
1764 unless ($SDL_MIXER) {
1765 status "Unable to open sound device: there will be no sound";
1766 return;
1767 }
1768
1769 CFPlus::Mix_AllocateChannels 8;
1770 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1771
1772 audio_music_finished;
1773
1774 while (<$fh>) {
1775 next if /^\s*#/;
1776 next if /^\s*$/;
1777
1778 my ($file, $volume, $event) = split /\s+/, $_, 3;
1779
1780 push @SOUNDS, "$volume,$file";
1781
1782 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1783 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1784 $chunk->volume ($volume * 128 / 100);
1785 $chunk
1786 };
1787 }
1788 } else {
1789 status "unable to open sound config: $!";
1790 }
1791 }
1792}
1793
1794sub audio_shutdown {
1795 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1796 undef $SDL_MIXER;
1797 @SOUNDS = ();
1798 %AUDIO_CHUNKS = ();
1799}
1800
1801my %animate_object; 2090my %animate_object;
1802my $animate_timer; 2091my $animate_timer;
1803 2092
1804my $fps = 9; 2093my $fps = 9;
1805 2094
1806my %demo;#d#
1807
1808sub force_refresh { 2095sub force_refresh {
2096 if ($ENV{CFPLUS_DEBUG} & 4) {
1809 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2097 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
1810 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2098 debug sprintf "%3.2f", $fps;
2099 }
1811 2100
1812 $CFPlus::UI::ROOT->draw; 2101 $CFPlus::UI::ROOT->draw;
1813 2102 CFPlus::SDL_GL_SwapBuffers;
1814 $WANT_REFRESH = 0;
1815 $CAN_REFRESH = 0;
1816 $LAST_REFRESH = $NOW; 2103 $LAST_REFRESH = $NOW;
1817 2104 $WANT_REFRESH->stop;
1818 CFPlus::SDL_GL_SwapBuffers;
1819} 2105}
1820 2106
2107$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2108
1821my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2109my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
1822 $NOW = time; 2110 $NOW = time;
1823 2111
1824 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2112 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1825 for CFPlus::SDL_PollEvent; 2113 for CFPlus::poll_events;
1826 2114
1827 if (%animate_object) { 2115 if (%animate_object) {
1828 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2116 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1829 $WANT_REFRESH++; 2117 $WANT_REFRESH->start;
1830 }
1831
1832 if ($WANT_REFRESH) {
1833 force_refresh;
1834 } else {
1835 $CAN_REFRESH = 1;
1836 } 2118 }
1837}); 2119});
1838 2120
1839sub animation_start { 2121sub animation_start {
1840 my ($widget) = @_; 2122 my ($widget) = @_;
… …
1844sub animation_stop { 2126sub animation_stop {
1845 my ($widget) = @_; 2127 my ($widget) = @_;
1846 delete $animate_object{$widget}; 2128 delete $animate_object{$widget};
1847} 2129}
1848 2130
1849# check once/second for faces that need to be prefetched
1850# this should, of course, only run on demand, but
1851# SDL forces worse things on us....
1852
1853Event->timer (after => 1, interval => 0.25, cb => sub {
1854 $CONN->face_prefetch
1855 if $CONN;
1856});
1857
1858%SDL_CB = ( 2131%SDL_CB = (
1859 CFPlus::SDL_QUIT => sub { 2132 CFPlus::SDL_QUIT => sub {
1860 Event::unloop -1; 2133 exit;
1861 }, 2134 },
1862 CFPlus::SDL_VIDEORESIZE => sub { 2135 CFPlus::SDL_VIDEORESIZE => sub {
1863 }, 2136 },
1864 CFPlus::SDL_VIDEOEXPOSE => sub { 2137 CFPlus::SDL_VIDEOEXPOSE => sub {
1865 CFPlus::UI::full_refresh; 2138 CFPlus::UI::full_refresh;
1866 }, 2139 },
1867 CFPlus::SDL_ACTIVEEVENT => sub { 2140 CFPlus::SDL_ACTIVEEVENT => sub {
1868# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2141# not useful, as APPACTIVE include sonly iconified state, not unmapped
2142# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2143# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2144# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2145# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2146# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1869 }, 2147 },
1870 CFPlus::SDL_KEYDOWN => sub { 2148 CFPlus::SDL_KEYDOWN => sub {
1871 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2149 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1872 # alt-enter 2150 # alt-enter
1873 $FULLSCREEN_ENABLE->toggle; 2151 $FULLSCREEN_ENABLE->toggle;
… …
1894 2172
1895$SIG{INT} = $SIG{TERM} = sub { exit }; 2173$SIG{INT} = $SIG{TERM} = sub { exit };
1896 2174
1897{ 2175{
1898 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2176 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2177 CFPlus::DB::Server::run;
2178
1899 CFPlus::UI::set_layout ($::CFG->{layout}); 2179 CFPlus::UI::set_layout ($::CFG->{layout});
1900 2180
1901 my %DEF_CFG = ( 2181 my %DEF_CFG = (
1902 sdl_mode => 0, 2182 sdl_mode => 0,
1903 width => 640,
1904 height => 480,
1905 fullscreen => 0, 2183 fullscreen => 0,
1906 fast => 0, 2184 fast => 0,
1907 map_scale => 1, 2185 map_scale => 1,
1908 fow_enable => 1, 2186 fow_enable => 1,
1909 fow_intensity => 0.45, 2187 fow_intensity => 0,
1910 fow_smooth => 0, 2188 map_smoothing => 1,
1911 gui_fontsize => 1, 2189 gui_fontsize => 1,
1912 log_fontsize => 0.7, 2190 log_fontsize => 0.7,
1913 gauge_fontsize => 1, 2191 gauge_fontsize => 1,
1914 gauge_size => 0.35, 2192 gauge_size => 0.35,
1915 stat_fontsize => 0.7, 2193 stat_fontsize => 0.7,
1916 mapsize => 100, 2194 mapsize => 100,
1917 say_command => 'say',
1918 audio_enable => 1, 2195 audio_enable => 1,
2196 effects_enable => 1,
2197 effects_volume => 1,
1919 bgm_enable => 1, 2198 bgm_enable => 1,
1920 bgm_volume => 0.25, 2199 bgm_volume => 0.5,
1921 face_prefetch => 0,
1922 output_sync => 1, 2200 output_sync => 1,
1923 output_count => 1, 2201 output_count => 1,
2202 output_rate => "",
1924 pickup => 0, 2203 pickup => 0,
1925 inv_sort => "mtime", 2204 inv_sort => "mtime",
1926 default => "profile", # default profile 2205 default => "profile", # default profile
2206 show_tips => 1,
2207 logview_max_par => 1000,
1927 ); 2208 );
1928 2209
1929 while (my ($k, $v) = each %DEF_CFG) { 2210 while (my ($k, $v) = each %DEF_CFG) {
1930 $CFG->{$k} = $v unless exists $CFG->{$k}; 2211 $CFG->{$k} = $v unless exists $CFG->{$k};
1931 } 2212 }
1932 2213
1933 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2214 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2215 $PROFILE = $CFG->{profile}{default};
2216
2217 # convert old bindings (only default profile matters)
2218 if (my $bindings = delete $PROFILE->{bindings}) {
2219 while (my ($mod, $syms) = each %$bindings) {
2220 while (my ($sym, $cmds) = each %$syms) {
2221 push @{ $PROFILE->{macro} }, {
2222 accelkey => [$mod*1, $sym*1],
2223 action => $cmds,
2224 };
2225 }
2226 }
2227 }
1934 2228
1935 sdl_init; 2229 sdl_init;
1936 2230
1937 @SDL_MODES = reverse 2231 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1938 grep $_->[0] >= 640 && $_->[1] >= 480, 2232 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1939 CFPlus::SDL_ListModes;
1940
1941 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2233 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2234
2235 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
1942 2236
1943 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2237 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1944 2238
1945 { 2239 {
1946 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2240 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
1975# } 2269# }
1976# my $t2 = Time::HiRes::time; 2270# my $t2 = Time::HiRes::time;
1977# warn $t2-$t1; 2271# warn $t2-$t1;
1978# } 2272# }
1979 2273
2274 $startup_done->();
2275
1980 video_init; 2276 video_init;
1981 audio_init; 2277 audio_init;
1982} 2278}
2279
2280show_tip_of_the_day if $CFG->{show_tips};
1983 2281
1984Event::loop; 2282Event::loop;
1985#CFPlus::SDL_Quit; 2283#CFPlus::SDL_Quit;
1986#CFPlus::_exit 0; 2284#CFPlus::_exit 0;
1987 2285
2286END {
2287 video_shutdown;
2288 audio_shutdown;
1988END { CFPlus::SDL_Quit } 2289 CFPlus::SDL_Quit;
2290 CFPlus::DB::Server::stop;
2291}
1989 2292
1990=head1 NAME 2293=head1 NAME
1991 2294
1992cfplus - A Crossfire+ and Crossfire game client 2295cfplus - A Crossfire TRT and Crossfire game client
1993 2296
1994=head1 SYNOPSIS 2297=head1 SYNOPSIS
1995 2298
1996Just run it - no commandline arguments are supported. 2299Just run it - no commandline arguments are supported.
1997 2300
1998=head1 USAGE 2301=head1 USAGE
1999 2302
2000cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2303cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2001fullscreen and interactively. 2304be used in fullscreen mode and interactively.
2002 2305
2003=head1 DEBUGGING 2306=head1 DEBUGGING
2004 2307
2005 2308
2006CFPLUS_DEBUG - environment variable 2309CFPLUS_DEBUG - environment variable

Diff Legend

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