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.115 by root, Mon Aug 14 03:41:29 2006 UTC vs.
Revision 1.231 by elmex, Sun Oct 14 10:33:50 2007 UTC

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

Diff Legend

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