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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines