ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

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

Diff Legend

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