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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines