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.75 by root, Sun Jun 18 17:23:36 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;
95use CFPlus::Pod;
41use CFClient::MapWidget; 96use CFPlus::MapWidget;
97use CFPlus::Macro;
42 98
43$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 99$SIG{QUIT} = sub { Carp::cluck "QUIT" };
100$SIG{PIPE} = 'IGNORE';
44 101
102$Event::Eval = 1;
45$Event::DIED = sub { 103$Event::DIED = sub {
46 # TODO: display dialog box or so 104 CFPlus::fatal Carp::longmess $_[1]
47 Carp::confess $_[1];#d#TODO: remove when stable
48 CFClient::error $_[1];
49}; 105};
50
51#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
52
53our $VERSION = '0.1';
54 106
55my $MAX_FPS = 60; 107my $MAX_FPS = 60;
56my $MIN_FPS = 5; # unused as of yet 108my $MIN_FPS = 5; # unused as of yet
57 109
58our $META_SERVER = "crossfire.real-time.com:13326"; 110our $META_SERVER = "http://metaserver.schmorp.de/current.json";
59 111
60our $LAST_REFRESH; 112our $LAST_REFRESH;
61our $NOW; 113our $NOW;
62 114
63our $CFG; 115our $CFG;
64our $CONN; 116our $CONN;
117our $PROFILE; # current profile
65our $FAST; # fast, low-quality mode, possibly useful for software-rendering 118our $FAST; # fast, low-quality mode, possibly useful for software-rendering
66 119
67our $WANT_REFRESH; 120our $WANT_REFRESH;
68our $CAN_REFRESH;
69 121
70our @SDL_MODES; 122our @SDL_MODES;
71our $WIDTH; 123our $WIDTH;
72our $HEIGHT; 124our $HEIGHT;
73our $FULLSCREEN; 125our $FULLSCREEN;
… …
77our $FONT_FIXED; 129our $FONT_FIXED;
78 130
79our $MAP; 131our $MAP;
80our $MAPMAP; 132our $MAPMAP;
81our $MAPWIDGET; 133our $MAPWIDGET;
134our $COMPLETER;
82our $BUTTONBAR; 135our $BUTTONBAR;
83our $LOGVIEW;
84our $CONSOLE;
85our $METASERVER; 136our $METASERVER;
86our $LOGIN_BUTTON; 137our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 138our $QUIT_DIALOG;
88our $HOST_ENTRY; 139our $HOST_ENTRY;
140our $FULLSCREEN_ENABLE;
141our $PICKUP_ENABLE;
89our $SERVER_INFO; 142our $SERVER_INFO;
90 143
91our $SETUP_DIALOG; 144our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK; 145our $SETUP_NOTEBOOK;
93our $SETUP_SERVER; 146our $SETUP_SERVER;
94our $SETUP_KEYBOARD; 147our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96 148
149our $PL_NOTEBOOK;
97our $STATS_WINDOW; 150our $PL_WINDOW;
151
152our $MUSIC_PLAYING_WIDGET;
153our $LICENSE_WIDGET;
154
155our $PICKUP_PAGE;
156our $INVENTORY_PAGE;
157our $STATS_PAGE;
158our $SKILL_PAGE;
159our $SPELL_PAGE;
160our $SPELL_LIST;
161
162our $HELP_WINDOW;
98our $MESSAGE_WINDOW; 163our $MESSAGE_WINDOW;
99our $FLOORBOX; 164our $FLOORBOX;
100our $GAUGES; 165our $GAUGES;
101our $STATWIDS; 166our $STATWIDS;
102 167
103our $SDL_ACTIVE; 168our $SDL_ACTIVE;
104our %SDL_CB; 169our %SDL_CB;
105 170
106our $SDL_MIXER;
107our @SOUNDS; # event => file mapping
108our %AUDIO_CHUNKS; # audio files
109
110our $ALT_ENTER_MESSAGE; 171our $ALT_ENTER_MESSAGE;
111our $STATUSBOX; 172our $STATUSBOX;
112our $DEBUG_STATUS; 173our $DEBUG_STATUS;
113 174
114our $INV_WINDOW;
115our $INV; 175our $INV;
116our $INVR; 176our $INVR;
117our $INV_RIGHT_HB; 177our $INVR_HB;
118 178
119our $BIND_EDITOR; 179#############################################################################
120
121our $PICKUP_CFG;
122 180
123sub status { 181sub status {
124 $STATUSBOX->add (CFClient::UI::Label::escape $_[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]);
125} 183}
126 184
127sub debug { 185sub debug {
128 $DEBUG_STATUS->set_text ($_[0]); 186 $DEBUG_STATUS->set_text ($_[0]);
129} 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#############################################################################
130 443
131sub destroy_query_dialog { 444sub destroy_query_dialog {
132 (delete $_[0]{query_dialog})->destroy 445 (delete $_[0]{query_dialog})->destroy
133 if $_[0]{query_dialog}; 446 if $_[0]{query_dialog};
134} 447}
135 448
449# FIXME: a very ugly hack to wait for stat update look below! #d#
450our $QUERY_TIMER; #d#
451
136# server query dialog 452# server query dialog
137sub server_query { 453sub server_query {
138 my ($conn, $flags, $prompt) = @_; 454 my ($conn, $flags, $prompt) = @_;
139 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
140 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame 471 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
141 x => "center", 472 x => "center",
142 y => "center", 473 y => "center",
143 title => "Server Query", 474 title => "Server Query",
144 child => my $vbox = new CFClient::UI::VBox, 475 child => my $vbox = new CFPlus::UI::VBox,
145 ; 476 ;
146 477
147 my @dialog = my $label = new CFClient::UI::Label 478 my @dialog = my $label = new CFPlus::UI::Label
148 max_w => $::WIDTH * 0.4, 479 max_w => $::WIDTH * 0.8,
149 ellipsise => 0, 480 ellipsise => 0,
150 text => $prompt; 481 text => $prompt;
151 482
152 if ($flags & CS_QUERY_YESNO) { 483 if ($flags & CS_QUERY_YESNO) {
153 push @dialog, my $hbox = new CFClient::UI::HBox; 484 push @dialog, my $hbox = new CFPlus::UI::HBox;
154 485
155 $hbox->add (new CFClient::UI::Button 486 $hbox->add (new CFPlus::UI::Button
156 text => "No", 487 text => "No",
157 on_activate => sub { 488 on_activate => sub {
158 $conn->send ("reply n"); 489 $conn->send ("reply n");
159 $dialog->destroy; 490 $dialog->destroy;
160 0 491 0
161 } 492 }
162 ); 493 );
163 $hbox->add (new CFClient::UI::Button 494 $hbox->add (new CFPlus::UI::Button
164 text => "Yes", 495 text => "Yes",
165 on_activate => sub { 496 on_activate => sub {
166 $conn->send ("reply y"); 497 $conn->send ("reply y");
167 destroy_query_dialog $conn; 498 destroy_query_dialog $conn;
168 0 499 0
… …
170 ); 501 );
171 502
172 $dialog->grab_focus; 503 $dialog->grab_focus;
173 504
174 } elsif ($flags & CS_QUERY_SINGLECHAR) { 505 } elsif ($flags & CS_QUERY_SINGLECHAR) {
175 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
176
177 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) {
178 $MESSAGE_WINDOW->show; 507 $dialog->{tooltip} = "#charcreation_focus";
179 508
180 unshift @dialog, new CFClient::UI::Label 509 unshift @dialog, new CFPlus::UI::Label
181 max_w => $::WIDTH * 0.4, 510 max_w => $::WIDTH * 0.8,
182 ellipsise => 0, 511 ellipsise => 0,
183 markup => "\nOr use your keyboard:\n"; 512 markup => "\nOr use your keyboard and the text entry below:\n";
184 513
185 unshift @dialog, my $table = new CFClient::UI::Table; 514 unshift @dialog, my $table = new CFPlus::UI::Table;
186 515
187 $table->add (0, 0, new CFClient::UI::Button 516 $table->add_at (0, 0, new CFPlus::UI::Button
188 text => "Next Race", 517 text => "Next Race",
189 on_activate => sub { 518 on_activate => sub {
190 $conn->send ("reply n"); 519 $conn->send ("reply n");
191 destroy_query_dialog $conn; 520 destroy_query_dialog $conn;
192 0 521 0
193 }, 522 },
194 ); 523 );
195 $table->add (2, 0, new CFClient::UI::Button 524 $table->add_at (2, 0, new CFPlus::UI::Button
196 text => "Accept", 525 text => "Accept",
197 on_activate => sub { 526 on_activate => sub {
198 $conn->send ("reply d"); 527 $conn->send ("reply d");
199 destroy_query_dialog $conn; 528 destroy_query_dialog $conn;
200 0 529 0
201 }, 530 },
202 ); 531 );
203 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
204 unshift @dialog, new CFClient::UI::Label 556 unshift @dialog, new CFPlus::UI::Label
205 max_w => $::WIDTH * 0.4, 557 max_w => $::WIDTH * 0.4,
206 ellipsise => 0, 558 ellipsise => 0,
207 markup => 559 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
208 "<big><b>Character Creation: Race</b></big>\n\n"
209 . "Look at the <b>Messages</b> window to see a description of this race "
210 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
211 . "and the center of the screen to see how this race looks like "
212 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
213 . "You can look at another race, or accept this race (you will come back to this race eventually, "
214 . "so you can take your time making this important choice."
215 ; 560 ;
216 561
217 } elsif ($prompt =~ /roll new stats/) { 562 } elsif ($prompt =~ /roll new stats/) {
218 if (my $stat = delete $conn->{stat_change_with}) { 563 if (my $stat = delete $conn->{stat_change_with}) {
219 $conn->send ("reply $stat"); 564 $conn->send ("reply $stat");
220 destroy_query_dialog $conn; 565 destroy_query_dialog $conn;
221 return; 566 return;
222 } 567 }
223 568
224 $STATS_WINDOW->show;
225 $MESSAGE_WINDOW->hide;
226
227 unshift @dialog, new CFClient::UI::Label 569 unshift @dialog, new CFPlus::UI::Label
228 max_w => $::WIDTH * 0.4, 570 max_w => $::WIDTH * 0.4,
229 ellipsise => 0, 571 ellipsise => 0,
230 markup => "\nOr use your keyboard:\n"; 572 markup => "\nOr use your keyboard and the text entry below:\n";
231 573
232 unshift @dialog, my $table = new CFClient::UI::Table; 574 unshift @dialog, my $table = new CFPlus::UI::Table;
233 575
234 # left: re-roll 576 # left: re-roll
235 $table->add (0, 0, new CFClient::UI::Button 577 $table->add_at (0, 0, new CFPlus::UI::Button
236 text => "Roll Again", 578 text => "Roll Again",
237 on_activate => sub { 579 on_activate => sub {
238 $conn->send ("reply y"); 580 $conn->send ("reply y");
239 destroy_query_dialog $conn; 581 destroy_query_dialog $conn;
240 0 582 0
241 }, 583 },
242 ); 584 );
243 585
244 # center: swap stats 586 # center: swap stats
245 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 587 my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
588 expand => 1,
246 value => $_, 589 value => $_,
247 options => [ 590 options => [
248 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 591 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
249 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 592 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
250 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 593 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
… …
253 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 596 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
254 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 597 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
255 ], 598 ],
256 ), 1 .. 2; 599 ), 1 .. 2;
257 600
258 $table->add (2, 0, new CFClient::UI::Button 601 $table->add_at (2, 0, new CFPlus::UI::Button
259 text => "Swap Stats", 602 text => "Swap Stats",
260 on_activate => sub { 603 on_activate => sub {
261 $conn->{stat_change_with} = $sw2->{value}; 604 $conn->{stat_change_with} = $sw2->{value};
262 $conn->send ("reply $sw1->{value}"); 605 $conn->send ("reply $sw1->{value}");
263 destroy_query_dialog $conn; 606 destroy_query_dialog $conn;
264 0 607 0
265 }, 608 },
266 ); 609 );
267 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 610 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
268 611
269 # right: accept 612 # right: accept
270 $table->add (4, 0, new CFClient::UI::Button 613 $table->add_at (4, 0, new CFPlus::UI::Button
271 text => "Accept", 614 text => "Accept",
272 on_activate => sub { 615 on_activate => sub {
273 $conn->send ("reply n"); 616 $conn->send ("reply n");
274 $STATS_WINDOW->hide; 617 $STATS_PAGE->hide;
275 destroy_query_dialog $conn; 618 destroy_query_dialog $conn;
276 0 619 0
277 }, 620 },
278 ); 621 );
279 622
623 unshift @dialog, my $hbox = new CFPlus::UI::HBox;
624 for (
625 [Str => CS_STAT_STR],
626 [Dex => CS_STAT_DEX],
627 [Con => CS_STAT_CON],
628 [Int => CS_STAT_INT],
629 [Wis => CS_STAT_WIS],
630 [Pow => CS_STAT_POW],
631 [Cha => CS_STAT_CHA],
632 ) {
633 my ($name, $id) = @$_;
634 $hbox->add (new CFPlus::UI::Label
635 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
636 align => 0,
637 expand => 1,
638 can_events => 1,
639 can_hover => 1,
640 tooltip => "#stat_$name",
641 );
642 }
643
280 unshift @dialog, new CFClient::UI::Label 644 unshift @dialog, new CFPlus::UI::Label
281 max_w => $::WIDTH * 0.4, 645 max_w => $::WIDTH * 0.4,
282 ellipsise => 0, 646 ellipsise => 0,
283 markup => 647 markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
284 "<big><b>Character Creation: Stats</b></big>\n\n"
285 . "Look at the <b>Stats</b> window to see your basic stats "
286 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
287 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
288 . "Race selection will influence those values later on."
289 ; 648 ;
290 } 649 }
291 650
292 push @dialog, my $entry = new CFClient::UI::Entry 651 push @dialog, my $entry = new CFPlus::UI::Entry
293 on_changed => sub { 652 on_changed => sub {
294 $conn->send ("reply $_[1]"); 653 $conn->send ("reply $_[1]");
295 destroy_query_dialog $conn; 654 destroy_query_dialog $conn;
296 0 655 0
297 }, 656 },
… …
300 $entry->grab_focus; 659 $entry->grab_focus;
301 660
302 } else { 661 } else {
303 $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)";
304 663
305 push @dialog, my $entry = new CFClient::UI::Entry 664 push @dialog, my $entry = new CFPlus::UI::Entry
306 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 665 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
307 on_activate => sub { 666 on_activate => sub {
308 $conn->send ("reply $_[1]"); 667 $conn->send ("reply $_[1]");
309 destroy_query_dialog $conn; 668 destroy_query_dialog $conn;
310 0 669 0
… …
324 $LOGIN_BUTTON->set_text ("Logout"); 683 $LOGIN_BUTTON->set_text ("Logout");
325 $SETUP_DIALOG->hide; 684 $SETUP_DIALOG->hide;
326 685
327 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;
328 687
329 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 688 my ($host, $port) = split /:/, $PROFILE->{host};
330 689
331 $MAP = new CFClient::Map $mapsize, $mapsize; 690 $MAP = new CFPlus::Map;
332 691
333 $CONN = eval { 692 $CONN = eval {
334 new CFClient::Protocol 693 new CFPlus::Protocol
335 host => $host, 694 host => $host,
336 port => $port || 13327, 695 port => $port || 13327,
337 user => $CFG->{profile}{default}{user}, 696 user => $PROFILE->{user},
338 pass => $CFG->{profile}{default}{password}, 697 pass => $PROFILE->{password},
339 mapw => $mapsize, 698 mapw => $mapsize,
340 maph => $mapsize, 699 maph => $mapsize,
341 700
701 client => "cfplus $CFPlus::VERSION $] $^O",
702
342 map_widget => $MAPWIDGET, 703 map_widget => $MAPWIDGET,
343 logview => $LOGVIEW,
344 statusbox => $STATUSBOX, 704 statusbox => $STATUSBOX,
345 map => $MAP, 705 map => $MAP,
346 mapmap => $MAPMAP, 706 mapmap => $MAPMAP,
347 query => \&server_query, 707 query => \&server_query,
348 708
349 sound_play => sub { 709 setup_req => {
350 my ($x, $y, $soundnum, $type) = @_; 710 smoothing => $CFG->{map_smoothing}*1,
351
352 $SDL_MIXER
353 or return;
354
355 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
356 or return;
357
358 $chunk->play;
359 }, 711 },
360 }; 712 };
361 713
362 if ($CONN) { 714 if ($CONN) {
363 CFClient::lowdelay fileno $CONN->{fh}; 715 CFPlus::lowdelay fileno $CONN->{fh};
364 716
365 status "login successful"; 717 status "login successful";
366 } else { 718 } else {
367 status "unable to connect"; 719 status "unable to connect";
368 stop_game(); 720 stop_game();
… …
371 723
372sub stop_game { 724sub stop_game {
373 $LOGIN_BUTTON->set_text ("Login"); 725 $LOGIN_BUTTON->set_text ("Login");
374 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 726 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
375 $SETUP_DIALOG->show; 727 $SETUP_DIALOG->show;
376 $INV_WINDOW->hide; 728 $PL_WINDOW->hide;
377 $SETUP_SPELLS->clear_spells; 729 $SPELL_LIST->clear_spells;
730 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
731
732 &audio_music_set_ambient ([]);
378 733
379 return unless $CONN; 734 return unless $CONN;
380 735
381 status "connection closed"; 736 status "connection closed";
382 737
383 destroy_query_dialog $CONN; 738 destroy_query_dialog $CONN;
384 $CONN->destroy; 739 $CONN->destroy;
385 $CONN = 0; # false, does not autovivify 740 $CONN = 0; # false, does not autovivify
741
742 undef $MAP;
386} 743}
387 744
388sub graphics_setup { 745sub graphics_setup {
389 my $vbox = new CFClient::UI::VBox; 746 my $vbox = new CFPlus::UI::VBox;
390 747
391 $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]);
392 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
393 $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");
394 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 762 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
395 763
764 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
396 $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],
397 $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);
398 770
399 $mode_slider->connect (changed => sub { 771 $mode_slider->connect (changed => sub {
400 my ($self, $value) = @_; 772 my ($self, $value) = @_;
401 773
402 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 774 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
403 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 775 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
404 }); 776 });
405 $mode_slider->emit (changed => $mode_slider->{range}[0]); 777 $mode_slider->emit (changed => $mode_slider->{range}[0]);
406 778
407 my $row = 1;
408
409 $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");
410 $table->add (1, $row++, new CFClient::UI::CheckBox 780 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
411 state => $CFG->{fullscreen}, 781 state => $CFG->{fullscreen},
412 tooltip => "Bring the client into fullscreen mode.", 782 tooltip => "Bring the client into fullscreen mode.",
413 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 783 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
414 ); 784 );
415 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
416 $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");
417 $table->add (1, $row++, new CFClient::UI::CheckBox 809 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
418 state => $CFG->{fast}, 810 state => $CFG->{fast},
419 tooltip => "Lower the visual quality considerably to speed up rendering.", 811 tooltip => "Lower the visual quality considerably to speed up rendering.",
420 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 812 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
421 ); 813 );
422 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
423 $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");
424 $table->add (1, $row++, new CFClient::UI::Slider 833 $table->add_at (1, $row++, new CFPlus::UI::Slider
425 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 834 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
426 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 835 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
427 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 }
428 ); 837 );
429 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
430 $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");
431 $table->add (1, $row++, new CFClient::UI::CheckBox 849 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
432 state => $CFG->{fow_enable}, 850 state => $CFG->{fow_enable},
433 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.",
434 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 852 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
435 ); 853 );
436 854
437 $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");
438 $table->add (1, $row++, new CFClient::UI::Slider 856 $table->add_at (1, $row++, new CFPlus::UI::Slider
439 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 857 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
440 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.",
441 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 859 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
442 ); 860 );
443 861
444 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
445 $table->add (1, $row++, new CFClient::UI::CheckBox
446 state => $CFG->{fow_smooth},
447 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
448 on_changed => sub {
449 my ($self, $value) = @_;
450 $CFG->{fow_smooth} = $value;
451 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
452 0
453 }
454 );
455
456 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
457 $table->add (1, $row++, new CFClient::UI::Slider
458 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
459 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
460 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
461 );
462
463 $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");
464 $table->add (1, $row++, new CFClient::UI::Slider 863 $table->add_at (1, $row++, new CFPlus::UI::Slider
465 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 864 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
466 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.",
467 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 867 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
468 ); 868 );
469 869
470 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
471
472 $table->add (1, $row++, new CFClient::UI::Slider
473 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
474 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
475 on_changed => sub {
476 $CFG->{stat_fontsize} = $_[1];
477 &set_stats_window_fontsize;
478 0
479 }
480 );
481
482 $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");
483 $table->add (1, $row++, new CFClient::UI::Slider 871 $table->add_at (1, $row++, new CFPlus::UI::Slider
484 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 872 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
485 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.",
486 on_changed => sub { 874 on_changed => sub {
487 $CFG->{gauge_fontsize} = $_[1]; 875 $CFG->{gauge_fontsize} = $_[1];
488 &set_gauge_window_fontsize; 876 &set_gauge_window_fontsize;
489 0 877 0
490 } 878 }
491 ); 879 );
492 880
493 $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");
494 $table->add (1, $row++, new CFClient::UI::Slider 882 $table->add_at (1, $row++, new CFPlus::UI::Slider
495 range => [$CFG->{gauge_size}, 0.2, 0.8], 883 range => [$CFG->{gauge_size}, 0.2, 0.8],
496 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.",
497 on_changed => sub { 885 on_changed => sub {
498 $CFG->{gauge_size} = $_[1]; 886 $CFG->{gauge_size} = $_[1];
499 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 887 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
500 0 888 0
501 } 889 }
502 ); 890 );
503 891
504 $table->add (1, $row++, new CFClient::UI::Button
505 expand => 1, align => 0, text => "Apply",
506 tooltip => "Apply the video settings",
507 on_activate => sub {
508 video_shutdown ();
509 video_init ();
510 0
511 }
512 );
513
514 $vbox 892 $vbox
515} 893}
516 894
517sub audio_setup { 895sub audio_setup {
518 my $vbox = new CFClient::UI::VBox; 896 my $vbox = new CFPlus::UI::VBox;
519 897
520 $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]);
521 899
522 my $row = 0; 900 my $row = 0;
523 901
524 $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");
525 $table->add (1, $row++, new CFClient::UI::CheckBox 903 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
526 state => $CFG->{audio_enable}, 904 state => $CFG->{audio_enable},
527 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.",
528 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 906 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
529 ); 907 );
530# $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");
531# $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 {
532# $CFG->{effects_volume} = $_[1]; 910# $CFG->{effects_volume} = $_[1];
533# }); 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
534 $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");
535 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 931 $table->add_at (1, $row, new CFPlus::UI::CheckBox
536 $hbox->add (new CFClient::UI::CheckBox
537 expand => 1, state => $CFG->{bgm_enable}, 932 expand => 1, state => $CFG->{bgm_enable},
538 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.",
539 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 }
540 ); 940 );
541 $hbox->add (new CFClient::UI::Slider 941 $table->add_at (2, $row++, new CFPlus::UI::Slider
542 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 942 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
543 tooltip => "The volume of the background music. Changes are instant.", 943 tooltip => "The volume of the background music. Changes are instant.",
544 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 }
545 ); 945 );
546 946
547 $table->add (1, $row++, new CFClient::UI::Button 947 $table->add_at (1, $row++, new CFPlus::UI::Button
548 expand => 1, align => 0, text => "Apply", 948 c_colspan => 2, expand => 1, align => 0, text => "Apply",
549 tooltip => "Apply the audio settings", 949 tooltip => "Apply the audio settings",
550 on_activate => sub { 950 on_activate => sub {
551 audio_shutdown (); 951 audio_shutdown ();
552 audio_init (); 952 audio_init ();
553 0 953 0
… …
555 ); 955 );
556 956
557 $vbox 957 $vbox
558} 958}
559 959
560sub set_stats_window_fontsize {
561 for (values %{$STATWIDS}) {
562 $_->set_fontsize ($::CFG->{stat_fontsize});
563 }
564}
565
566sub set_gauge_window_fontsize { 960sub set_gauge_window_fontsize {
567 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 961 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
568 $_->set_fontsize ($::CFG->{gauge_fontsize}); 962 $_->set_fontsize ($::CFG->{gauge_fontsize});
569 } 963 }
570} 964}
571 965
572sub make_gauge_window { 966sub make_gauge_window {
573 my $gh = int $HEIGHT * $CFG->{gauge_size}; 967 my $gh = int $HEIGHT * $CFG->{gauge_size};
574 968
575 my $win = new CFClient::UI::Frame ( 969 my $win = new CFPlus::UI::Frame (
576 force_x => 0, 970 force_x => 0,
577 force_y => "max", 971 force_y => "max",
578 force_w => $WIDTH, 972 force_w => $WIDTH,
579 force_h => $gh, 973 force_h => $gh,
580 ); 974 );
581 975
582 $win->add (my $hbox = new CFClient::UI::HBox 976 $win->add (my $hbox = new CFPlus::UI::HBox
583 children => [ 977 children => [
584 (new CFClient::UI::HBox expand => 1), 978 (new CFPlus::UI::HBox expand => 1),
585 (new CFClient::UI::VBox children => [ 979 (new CFPlus::UI::VBox children => [
586 (new CFClient::UI::Empty expand => 1), 980 (new CFPlus::UI::Empty expand => 1),
587 (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)),
588 ]), 982 ]),
589 (my $vbox = new CFClient::UI::VBox), 983 (my $vbox = new CFPlus::UI::VBox),
590 ], 984 ],
591 ); 985 );
592 986
593 $vbox->add (new CFClient::UI::HBox 987 $vbox->add (new CFPlus::UI::HBox
594 expand => 1, 988 expand => 1,
595 children => [ 989 children => [
596 (new CFClient::UI::Empty expand => 1), 990 (new CFPlus::UI::Empty expand => 1),
597 (my $hb = new CFClient::UI::HBox), 991 (my $hb = new CFPlus::UI::HBox),
598 ], 992 ],
599 ); 993 );
600 994
601 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 995 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
602 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.");
603 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 996 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
604 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.");
605 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 997 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
606 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.");
607 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 998 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
608 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.");
609 999
610 $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");
611 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);
612 $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");
613 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
614 1004
615 $GAUGES = { 1005 $GAUGES = {
1006 exp => $exp, prg => $prg, sklprg => $sklprg,
616 exp => $exp, win => $win, range => $rng, 1007 win => $win, range => $rng,
617 food => $fg, mana => $mg, hp => $hg, grace => $gg 1008 hp => $hg, mana => $mg, grace => $gg, food => $fg,
618 }; 1009 };
619 1010
620 &set_gauge_window_fontsize; 1011 &set_gauge_window_fontsize;
621 1012
622 $win 1013 $win
623} 1014}
624 1015
625sub debug_setup { 1016sub debug_setup {
626 my $table = new CFClient::UI::Table; 1017 my $table = new CFPlus::UI::Table;
627 1018
628 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 1019 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
629 $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 });
630 $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");
631 $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 });
632 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 1023 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
633 $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 });
634 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 1025 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
635 $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() } );
636 1028
637 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#
638 1030
639 for my $x (0..2) { 1031 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
640 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);
641 $table->add ($x + 3, $y, 1033 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
642 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);
643 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);
644 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");
645 ); 1037
646 } 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]],
647 } 1046 });
648 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 });
649 1063
650 $table 1064 $table
651} 1065}
652 1066
653sub stats_window { 1067sub stats_window {
654 my $tgw = new CFClient::UI::FancyFrame 1068 my $r = new CFPlus::UI::ScrolledWindow (
655 y => $HEIGHT * (2/8), 1069 expand => 1,
656 x => "max", 1070 scroll_y => 1
657 title => "Stats", 1071 );
658 name => "stats_window", 1072 $r->add (my $vb = new CFPlus::UI::VBox);
659 has_close_button => 1;
660 1073
661 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 1074 $vb->add (new CFPlus::UI::FancyFrame
1075 label => "Player",
1076 child => (my $pi = new CFPlus::UI::VBox),
1077 );
1078
662 $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,
663 can_hover => 1, can_events => 1, 1080 can_hover => 1, can_events => 1,
664 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.");
665 $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,
666 can_hover => 1, can_events => 1, 1083 can_hover => 1, can_events => 1,
667 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).");
668 1085
669 $vb->add (my $hb0 = new CFClient::UI::HBox); 1086 $pi->add (my $hb0 = new CFPlus::UI::HBox);
670 $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,
671 can_hover => 1, can_events => 1, 1088 can_hover => 1, can_events => 1,
672 tooltip => "The weight of the player including all inventory items."); 1089 tooltip => "The weight of the player including all inventory items.");
673 $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,
674 can_hover => 1, can_events => 1, 1091 can_hover => 1, can_events => 1,
675 tooltip => "The weight limit: you cannot carry more than this."); 1092 tooltip => "The weight limit: you cannot carry more than this.");
676 1093
677 1094 $vb->add (new CFPlus::UI::FancyFrame
1095 label => "Primary/Secondary Statistics",
678 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1096 child => (my $hb = new CFPlus::UI::HBox expand => 1),
1097 );
679 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 1098 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
680 1099
681 my $color2 = [1, 1, 0]; 1100 my $color2 = [1, 1, 0];
682 1101
683 for ( 1102 for (
684 [0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"], 1103 [0, 0, st_str => "Str", 30],
685 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"], 1104 [0, 1, st_dex => "Dex", 30],
686 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"], 1105 [0, 2, st_con => "Con", 30],
687 [0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"], 1106 [0, 3, st_int => "Int", 30],
688 [0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"], 1107 [0, 4, st_wis => "Wis", 30],
689 [0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"], 1108 [0, 5, st_pow => "Pow", 30],
690 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 1109 [0, 6, st_cha => "Cha", 30],
691 1110
692 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 1111 [2, 0, st_wc => "Wc", -120],
693 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 1112 [2, 1, st_ac => "Ac", -120],
694 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 1113 [2, 2, st_dam => "Dam", 120],
695 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 1114 [2, 3, st_arm => "Arm", 120],
696 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 1115 [2, 4, st_spd => "Spd", 10.54],
697 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 1116 [2, 5, st_wspd => "WSp", 10.54],
698 ) { 1117 ) {
699 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 1118 my ($col, $row, $id, $label, $template) = @$_;
700 1119
701 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 1120 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
702 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 1121 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
1122 align => +1, template => $template, tooltip => "#stat_$label");
703 $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
704 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 1124 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
1125 align => -1, text => $label, tooltip => "#stat_$label");
705 } 1126 }
706 1127
1128 $vb->add (new CFPlus::UI::FancyFrame
1129 label => "Resistancies",
707 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 1130 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
1131 );
708 1132
709 my $row = 0; 1133 my $row = 0;
710 my $col = 0; 1134 my $col = 0;
711 1135
712 my %resist_names = ( 1136 my %resist_names = (
1137 slow => ["Slow",
713 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", 1138 "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
1139 holyw => ["Holy Word",
714 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 1140 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
1141 conf => ["Confusion",
715 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 1142 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
1143 fire => ["Fire",
716 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 1144 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
1145 depl => ["Depletion",
717 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 1146 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
1147 magic => ["Magic",
718 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 1148 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
1149 drain => ["Draining",
719 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 1150 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
1151 acid => ["Acid",
720 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 1152 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
1153 pois => ["Poison",
721 pois => "<b>Poison</b> (resistance to getting poisoned)", 1154 "<b>Poison</b> (resistance to getting poisoned)"],
1155 para => ["Paralysation",
722 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 1156 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
1157 deat => ["Death",
723 deat => "<b>Death</b> (resistance against death spells)", 1158 "<b>Death</b> (resistance against death spells)"],
724 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 1159 phys => ["Physical",
1160 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
1161 blind => ["Blind",
725 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 1162 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
1163 fear => ["Fear",
726 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 1164 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
1165 tund => ["Turn undead",
727 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 1166 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
1167 elec => ["Electricity",
728 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 1168 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
1169 cold => ["Cold",
729 cold => "<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, ...)"],
1171 ghit => ["Ghost hit",
730 ghit => "<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)"],
731 ); 1173 );
1174
732 for (qw/slow holyw conf fire depl magic 1175 for (qw/slow holyw conf fire depl magic
733 drain acid pois para deat phys 1176 drain acid pois para deat phys
734 blind fear tund elec cold ghit/) 1177 blind fear tund elec cold ghit/)
735 { 1178 {
736 $tbl2->add ($col, $row, 1179 $tbl2->add_at ($col, $row,
737 $STATWIDS->{"res_$_"} = 1180 $STATWIDS->{"res_$_"} =
738 new CFClient::UI::Label 1181 new CFPlus::UI::Label
739 font => $FONT_FIXED, 1182 font => $FONT_FIXED,
740 template => "-100%", 1183 template => "-100%",
741 align => +1, 1184 align => +1,
742 valign => 0, 1185 valign => 0,
743 can_events => 1, 1186 can_events => 1,
744 can_hover => 1, 1187 can_hover => 1,
745 tooltip => $resist_names{$_}, 1188 tooltip => $resist_names{$_}->[1],
746 ); 1189 );
747 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 1190 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
748 font => $FONT_FIXED, 1191 font => $FONT_FIXED,
749 can_hover => 1, 1192 can_hover => 1,
750 can_events => 1, 1193 can_events => 1,
751 image => "ui/resist/resist_$_.png", 1194 path => "ui/resist/resist_$_.png",
752 tooltip => $resist_names{$_}, 1195 tooltip => $resist_names{$_}->[1],
1196 );
1197 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
1198 text => $resist_names{$_}->[0],
1199 font => $FONT_FIXED,
1200 can_hover => 1,
1201 can_events => 1,
1202 tooltip => $resist_names{$_}->[1],
753 ); 1203 );
754 1204
755 $row++; 1205 $row++;
756 if ($row % 6 == 0) { 1206 if ($row % 6 == 0) {
757 $col += 2; 1207 $col += 3;
758 $row = 0; 1208 $row = 0;
759 } 1209 }
760 } 1210 }
761 1211
762 &set_stats_window_fontsize;
763 update_stats_window ({}); 1212 #update_stats_window ({});
764 1213
1214 $r
1215}
1216
1217sub skill_window {
1218 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1219
1220 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1221
765 $tgw 1222 $sw
766} 1223}
767 1224
768sub formsep($) { 1225sub formsep($) {
769 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1226 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
770} 1227}
771 1228
772sub update_stats_window {
773 my ($stats) = @_;
774
775 # I love text protocols...
776
777 my $hp = $stats->{+CS_STAT_HP} * 1;
778 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
779 my $sp = $stats->{+CS_STAT_SP} * 1;
780 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
781 my $fo = $stats->{+CS_STAT_FOOD} * 1;
782 my $fo_m = 999;
783 my $gr = $stats->{+CS_STAT_GRACE} * 1;
784 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
785
786 $GAUGES->{hp} ->set_value ($hp, $hp_m);
787 $GAUGES->{mana} ->set_value ($sp, $sp_m);
788 $GAUGES->{food} ->set_value ($fo, $fo_m);
789 $GAUGES->{grace} ->set_value ($gr, $gr_m);
790 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
791 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
792 my $rng = $stats->{+CS_STAT_RANGE};
793 $rng =~ s/^Range: //; # thank you so much dear server
794 $GAUGES->{range} ->set_text ("Rng: " . $rng);
795 my $title = $stats->{+CS_STAT_TITLE};
796 $title =~ s/^Player: //;
797 $STATWIDS->{title} ->set_text ("Title: " . $title);
798
799 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
800 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
801 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
802 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
803 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
804 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
805 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
806 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
807 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
808 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
809 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
810 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
811 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
812
813 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
814
815 my %tbl = (
816 phys => CS_STAT_RES_PHYS,
817 magic => CS_STAT_RES_MAG,
818 fire => CS_STAT_RES_FIRE,
819 elec => CS_STAT_RES_ELEC,
820 cold => CS_STAT_RES_COLD,
821 conf => CS_STAT_RES_CONF,
822 acid => CS_STAT_RES_ACID,
823 drain => CS_STAT_RES_DRAIN,
824 ghit => CS_STAT_RES_GHOSTHIT,
825 pois => CS_STAT_RES_POISON,
826 slow => CS_STAT_RES_SLOW,
827 para => CS_STAT_RES_PARA,
828 tund => CS_STAT_TURN_UNDEAD,
829 fear => CS_STAT_RES_FEAR,
830 depl => CS_STAT_RES_DEPLETE,
831 deat => CS_STAT_RES_DEATH,
832 holyw => CS_STAT_RES_HOLYWORD,
833 blind => CS_STAT_RES_BLIND,
834 );
835
836 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
837 for keys %tbl;
838}
839
840my $METASERVER_ATIME; 1229my $METASERVER_ATIME;
841 1230
842sub update_metaserver { 1231sub update_metaserver {
1232 my ($metaserver_dialog) = @_;
1233
1234 $METASERVER = $metaserver_dialog
1235 if defined $metaserver_dialog;
1236
843 return if $METASERVER_ATIME > time; 1237 return if $METASERVER_ATIME > time;
844 $METASERVER_ATIME = time + 60; 1238 $METASERVER_ATIME = time + 60;
845 1239
846 my $table = $METASERVER->{table}; 1240 my $table = $METASERVER->{table};
847 $table->clear; 1241 $table->clear;
848 $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...");
849 1243
850 my $buf; 1244 my $ok = 0;
851 1245
852 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 1246 CFPlus::background {
1247 my $ua = CFPlus::lwp_useragent;
853 1248
854 unless ($fh) { 1249 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
855 $label->set_text ("unable to contact metaserver: $!"); 1250 } sub {
856 return; 1251 my ($msg) = @_;
857 } 1252 if ($msg) {
858
859 Event->io (fd => $fh, poll => 'r', cb => sub {
860 my $res = sysread $fh, $buf, 8192, length $buf;
861
862 if (!defined $res) {
863 $_[0]->w->cancel;
864 $label->set_text ("error while retrieving server list: $!");
865 } elsif ($res == 0) {
866 $_[0]->w->cancel;
867 status "server list retrieved";
868
869 utf8::decode $buf if utf8::valid $buf;
870
871 $table->clear; 1253 $table->clear;
872 1254
873 my @tip = ( 1255 my @tip = (
874 "The current number of users logged in on the server.", 1256 "The current number of users logged in on the server.",
875 "The hostname of the server.", 1257 "The hostname of the server.",
876 "The time this server has been running without being restarted.", 1258 "The time this server has been running without being restarted.",
877 "The server software version - a '+' indicates a Crossfire+ server.", 1259 "The server software version - a '+' indicates a Crossfire+ server.",
878 "Short information about this server provided by its admins.", 1260 "Short information about this server provided by its admins.",
879 ); 1261 );
880 my @col = qw(#Users Host Uptime Version Description); 1262 my @col = qw(#Users Host Uptime Version Description);
881 $table->add ($_, 0, new CFClient::UI::Label 1263 $table->add_at ($_, 0, new CFPlus::UI::Label
882 can_hover => 1, can_events => 1, 1264 can_hover => 1, can_events => 1,
883 align => 0, fg => [1, 1, 0], 1265 align => 0, fg => [1, 1, 0],
884 text => $col[$_], tooltip => $tip[$_]) 1266 text => $col[$_], tooltip => $tip[$_])
885 for 0 .. $#col; 1267 for 0 .. $#col;
886 1268
887 my @align = qw(1 0 1 1 -1); 1269 my @align = qw(1 0 1 1 -1);
888 1270
889 my $y = 0; 1271 my $y = 0;
890 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 1272 for my $m (@{ $msg->{servers} }) {
891 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)};
892 1275
893 for ($desc) { 1276 for ($desc) {
894 s/<br>/\n/gi; 1277 s/<br>/\n/gi;
895 s/<li>/\n· /gi; 1278 s/<li>/\n· /gi;
896 s/<.*?>//sgi; 1279 s/<.*?>//sgi;
897 s/&/&amp;/g; 1280 s/&amp;/&/g;
898 s/</&lt;/g; 1281 s/&lt;/</g;
899 s/>/&gt;/g; 1282 s/&gt;/>/g;
900 } 1283 }
901 1284
902 $uptime = sprintf "%dd %02d:%02d:%02d", 1285 $uptime = sprintf "%dd %02d:%02d:%02d",
903 (int $m->[8] / 86400), 1286 (int $uptime / 86400),
904 (int $m->[8] / 3600) % 24, 1287 (int $uptime / 3600) % 24,
905 (int $m->[8] / 60) % 60, 1288 (int $uptime / 60) % 60,
906 $m->[8] % 60; 1289 $uptime % 60;
907 1290
908 $m = [$users, $host, $uptime, $version, $desc]; 1291 $m = [$users, $host, $uptime, $version, $desc];
909 1292
910 $y++; 1293 $y++;
911 1294
912 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 1295 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
913 (new CFClient::UI::Button 1296 (new CFPlus::UI::Button
914 text => "Use", 1297 text => "Use",
915 tooltip => "Put this server into the <b>Host:Port</b> field", 1298 tooltip => "Put this server into the <b>Host:Port</b> field",
916 on_activate => sub { 1299 on_activate => sub {
917 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1300 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
918 $METASERVER->hide; 1301 $METASERVER->hide;
919 0 1302 0
920 }, 1303 },
921 ), 1304 ),
922 (new CFClient::UI::Empty expand => 1), 1305 (new CFPlus::UI::Empty expand => 1),
923 ]); 1306 ]);
924 1307
925 $table->add ($_, $y, new CFClient::UI::Label 1308 $table->add_at ($_, $y, new CFPlus::UI::Label
1309 max_w => $::WIDTH * 0.4,
926 ellipsise => 0, 1310 ellipsise => 0,
927 align => $align[$_], 1311 align => $align[$_],
928 text => $m->[$_], 1312 text => $m->[$_],
929 tooltip => $tip[$_], 1313 tooltip => $tip[$_],
1314 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
930 can_hover => 1, 1315 can_hover => 1,
931 can_events => 1, 1316 can_events => 1,
932 fontsize => 0.8) 1317 fontsize => 0.8)
933 for 0 .. $#$m; 1318 for 0 .. $#$m;
934 } 1319 }
1320 } else {
1321 $ok or $label->set_text ("error while contacting metaserver");
935 } 1322 }
936 }); 1323 };
1324
937} 1325}
938 1326
939sub metaserver_dialog { 1327sub metaserver_dialog {
940 my $dialog = new CFClient::UI::FancyFrame 1328 my $vbox = new CFPlus::UI::VBox;
1329 my $table = new CFPlus::UI::Table;
1330 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
1331
1332 my $dialog = new CFPlus::UI::Toplevel
941 title => "Server List", 1333 title => "Server List",
942 name => 'metaserver_dialog', 1334 name => 'metaserver_dialog',
943 x => 'center', 1335 x => 'center',
944 y => 'center', 1336 y => 'center',
945 z => 3, 1337 z => 3,
1338 force_w => $::WIDTH * 0.9,
946 force_h => $::HEIGHT * 0.4, 1339 force_h => $::HEIGHT * 0.7,
947 child => (my $vbox = new CFClient::UI::VBox), 1340 child => $vbox,
1341 has_close_button => 1,
1342 table => $table,
948 on_visibility_change => sub { 1343 on_visibility_change => sub {
949 update_metaserver if $_[1]; 1344 update_metaserver ($_[0]) if $_[1];
950 0 1345 0
951 }, 1346 },
952 ; 1347 ;
953 1348
954 $dialog->{table} = new CFClient::UI::Table;
955
956 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
957
958 $dialog 1349 $dialog
959} 1350}
960 1351
961sub server_setup { 1352sub server_setup {
962 my $vbox = new CFClient::UI::VBox; 1353 my $vbox = new CFPlus::UI::VBox;
963 1354
1355 $vbox->add (new CFPlus::UI::FancyFrame
1356 label => "Connection Settings",
964 $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 );
965 $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");
966 1360
967 { 1361 {
968 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1362 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
969 1363
970 $vbox->add ( 1364 $vbox->add (
971 $HOST_ENTRY = new CFClient::UI::Entry 1365 $HOST_ENTRY = new CFPlus::UI::Entry
972 expand => 1, 1366 expand => 1,
973 text => $CFG->{profile}{default}{host}, 1367 text => $CFG->{profile}{default}{host},
974 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",
975 on_changed => sub { 1369 on_changed => sub {
976 my ($self, $value) = @_; 1370 my ($self, $value) = @_;
977 $CFG->{profile}{default}{host} = $value; 1371 $CFG->{profile}{default}{host} = $value;
978 0 1372 1
979 } 1373 }
980 ); 1374 );
981 1375
982 $METASERVER = metaserver_dialog;
983
984 $vbox->add (new CFClient::UI::Button 1376 $vbox->add (new CFPlus::UI::Button
985 expand => 1, 1377 expand => 1,
986 text => "Server List", 1378 text => "Server List",
987 other => $METASERVER, 1379 other => $METASERVER,
988 tooltip => "Show a list of available crossfire servers", 1380 tooltip => "Show a list of available crossfire servers",
989 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1381 on_activate => sub { $METASERVER->toggle_visibility; 0 },
990 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1382 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
991 ); 1383 );
992 } 1384 }
993 1385
994 $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");
995 $table->add (1, 4, new CFClient::UI::Entry 1387 $table->add_at (1, 4, new CFPlus::UI::Entry
996 text => $CFG->{profile}{default}{user}, 1388 text => $CFG->{profile}{default}{user},
997 tooltip => "The name of your character on the server", 1389 tooltip => "The name of your character on the server",
998 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1390 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
999 ); 1391 );
1000 1392
1001 $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");
1002 $table->add (1, 5, new CFClient::UI::Entry 1394 $table->add_at (1, 5, new CFPlus::UI::Entry
1003 text => $CFG->{profile}{default}{password}, 1395 text => $CFG->{profile}{default}{password},
1004 hidden => 1, 1396 hidden => 1,
1005 tooltip => "The password for your character", 1397 tooltip => "The password for your character",
1006 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1398 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1007 ); 1399 );
1008 1400
1009 $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");
1010 $table->add (1, 7, new CFClient::UI::Slider 1402 $table->add_at (1, 7, new CFPlus::UI::Slider
1011 force_w => 100, 1403 force_w => 100,
1012 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1404 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1013 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. "
1014 . "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, "
1015 . "but you also increase bandwidth requirements and latency. " 1407 . "but you also increase bandwidth requirements and latency. "
1016 . "This option is only used once at log-in.", 1408 . "This option is only used once at log-in.",
1017 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 },
1018 ); 1410 );
1019 1411
1020 $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");
1021 $table->add (1, 8, new CFClient::UI::CheckBox 1413 $table->add_at (1, 8, new CFPlus::UI::Entry
1022 state => $CFG->{face_prefetch}, 1414 text => $CFG->{output_rate},
1023 tooltip => "<b>Background Image Prefetch</b>\n\n" 1415 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1024 . "If enabled, the client automatically pre-fetches images from the server. " 1416 . "when sending data. When 0 or unset, the server "
1025 . "This might increase or create lag, but increases the chances " 1417 . "default will be used, which is usually around 100kb/s. Most servers will "
1026 . "of faces being ready for display when you encounter them. " 1418 . "dynamically find an optimal rate, so adjust this only when necessary.",
1027 . "It also uses up server bandwidth on every connect, "
1028 . "so only set it if you really need to prefetch images. "
1029 . "This option can be set and unset any time.",
1030 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1419 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1031 ); 1420 );
1032 1421
1033 $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");
1034 $table->add (1, 9, new CFClient::UI::Entry 1423 $table->add_at (1, 9, new CFPlus::UI::Entry
1035 text => $CFG->{output_count}, 1424 text => $CFG->{output_count},
1036 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.",
1037 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1426 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1038 ); 1427 );
1039 1428
1040 $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");
1041 $table->add (1, 10, new CFClient::UI::Entry 1430 $table->add_at (1, 10, new CFPlus::UI::Entry
1042 text => $CFG->{output_sync}, 1431 text => $CFG->{output_sync},
1043 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.",
1044 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1433 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1045 ); 1434 );
1046 1435
1047 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1436 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1048 expand => 1, 1437 expand => 1,
1049 align => 0, 1438 align => 0,
1050 text => "Login", 1439 text => "Login",
1051 on_activate => sub { 1440 on_activate => sub {
1052 $CONN ? stop_game 1441 $CONN ? stop_game
1053 : 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);
1054 0 1480 0
1055 }, 1481 },
1056 ); 1482 );
1057 1483
1058 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1484 $table
1059 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1060 text => $CFG->{say_command},
1061 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. "
1062 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1063 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1064 on_changed => sub {
1065 my ($self, $value) = @_;
1066 $CFG->{say_command} = $value;
1067 0
1068 }
1069 );
1070
1071 $vbox->add (new CFClient::UI::Label
1072 text => "Server Info",
1073 fontsize => 1.2,
1074 padding_y => 8,
1075 fg => [1, 1, 0, 1],
1076 );
1077
1078 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1079
1080 $vbox
1081}
1082
1083sub message_window {
1084 my $window = new CFClient::UI::FancyFrame
1085 name => "message_window",
1086 title => "Messages",
1087 border_bg => [1, 1, 1, 1],
1088 bg => [0, 0, 0, 0.75],
1089 x => "max",
1090 y => 0,
1091 force_w => $::WIDTH * 0.4,
1092 force_h => $::HEIGHT * 0.5,
1093 child => (my $vbox = new CFClient::UI::VBox),
1094 has_close_button => 1;
1095
1096 $vbox->add ($LOGVIEW);
1097
1098 $vbox->add (my $input = new CFClient::UI::Entry
1099 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1100 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1101 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1102 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1103 on_focus_in => sub {
1104 my ($input, $prev_focus) = @_;
1105
1106 delete $input->{refocus_map};
1107
1108 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1109 $input->{refocus_map} = 1;
1110 }
1111 delete $input->{auto_activated};
1112
1113 0
1114 },
1115 on_activate => sub {
1116 my ($input, $text) = @_;
1117 $input->set_text ('');
1118
1119 if ($text =~ /^\/(.*)/) {
1120 $::CONN->user_send ($1);
1121 } else {
1122 my $say_cmd = $::CFG->{say_command} || 'say';
1123 $::CONN->user_send ("$say_cmd $text");
1124 }
1125 if ($input->{refocus_map}) {
1126 delete $input->{refocus_map};
1127 $MAPWIDGET->focus_in
1128 }
1129
1130 0
1131 },
1132 on_escape => sub {
1133 $MAPWIDGET->grab_focus;
1134
1135 0
1136 },
1137 );
1138
1139 $CONSOLE = {
1140 window => $window,
1141 input => $input,
1142 };
1143
1144 $window
1145}
1146
1147sub open_quit_dialog {
1148 unless ($QUIT_DIALOG) {
1149 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1150 x => "center",
1151 y => "center",
1152 z => 50,
1153 title => "Really Quit?",
1154 ;
1155
1156 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1157
1158 $vb->add (new CFClient::UI::Label
1159 text => "You should find a savebed and apply it first!",
1160 max_w => $WIDTH * 0.25,
1161 ellipsize => 0,
1162 );
1163 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1164 $hb->add (new CFClient::UI::Button
1165 text => "Ok",
1166 expand => 1,
1167 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1168 );
1169 $hb->add (new CFClient::UI::Button
1170 text => "Quit anyway",
1171 expand => 1,
1172 on_activate => sub { exit },
1173 );
1174 }
1175
1176 $QUIT_DIALOG->show;
1177} 1485}
1178 1486
1179sub autopickup_setup { 1487sub autopickup_setup {
1488 my $r = new CFPlus::UI::ScrolledWindow (
1489 expand => 1,
1490 scroll_y => 1
1491 );
1180 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 );
1181 1496
1182 for ( 1497 for (
1183 ["General", 0, 0, 1498 ["General", 0, 0,
1184 ["Enable autopickup" => PICKUP_NEWMODE], 1499 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1185 ["Inhibit autopickup" => PICKUP_INHIBIT], 1500 ["Inhibit autopickup" => PICKUP_INHIBIT],
1186 ["Stop before pickup" => PICKUP_STOP], 1501 ["Stop before pickup" => PICKUP_STOP],
1187 ["Debug autopickup" => PICKUP_DEBUG], 1502 ["Debug autopickup" => PICKUP_DEBUG],
1188 ], 1503 ],
1189 ["Weapons", 0, 6, 1504 ["Weapons", 0, 6,
… …
1199 ["Boots" => PICKUP_BOOTS], 1514 ["Boots" => PICKUP_BOOTS],
1200 ["Gloves" => PICKUP_GLOVES], 1515 ["Gloves" => PICKUP_GLOVES],
1201 ["Cloaks" => PICKUP_CLOAK], 1516 ["Cloaks" => PICKUP_CLOAK],
1202 ], 1517 ],
1203 1518
1204 ["Readables", 2, 2, 1519 ["Readables", 2, 0,
1205 ["Spellbooks" => PICKUP_SPELLBOOK], 1520 ["Spellbooks" => PICKUP_SPELLBOOK],
1206 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1521 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1207 ["Normal Books/Scrolls" => PICKUP_READABLES], 1522 ["Normal Books/Scrolls" => PICKUP_READABLES],
1208 ], 1523 ],
1209 ["Misc", 2, 7, 1524 ["Misc", 2, 5,
1210 ["Food" => PICKUP_FOOD], 1525 ["Food" => PICKUP_FOOD],
1211 ["Drinks" => PICKUP_DRINK], 1526 ["Drinks" => PICKUP_DRINK],
1212 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1527 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1213 ["Keys" => PICKUP_KEY], 1528 ["Keys" => PICKUP_KEY],
1214 ["Magical Items" => PICKUP_MAGICAL], 1529 ["Magical Items" => PICKUP_MAGICAL],
1215 ["Potions" => PICKUP_POTION], 1530 ["Potions" => PICKUP_POTION],
1216 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1531 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1217 ["Ignore cursed" => PICKUP_NOT_CURSED], 1532 ["Ignore cursed" => PICKUP_NOT_CURSED],
1218 ["Jewelery" => PICKUP_JEWELS], 1533 ["Jewelery" => PICKUP_JEWELS],
1534 ["Flesh" => PICKUP_FLESH],
1219 ], 1535 ],
1220 ["Weight/Value ratio", 2, 17] 1536 ["Weight/Value ratio", 2, 17]
1221 ) 1537 )
1222 { 1538 {
1223 my ($title, $x, $y, @bits) = @$_; 1539 my ($title, $x, $y, @bits) = @$_;
1224 $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]);
1225 1541
1226 for (@bits) { 1542 for (@bits) {
1227 ++$y; 1543 ++$y;
1228 1544
1229 my $mask = $_->[1]; 1545 my $mask = $_->[1];
1230 $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);
1231 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1547 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1232 state => $CFG->{pickup} & $mask, 1548 state => $::CFG->{pickup} & $mask,
1233 on_changed => sub { 1549 on_changed => sub {
1234 my ($box, $value) = @_; 1550 my ($box, $value) = @_;
1235 1551
1236 if ($value) { 1552 if ($value) {
1237 $::CFG->{pickup} |= $mask; 1553 $::CFG->{pickup} |= $mask;
… …
1242 $::CONN->send_command ("pickup $::CFG->{pickup}") 1558 $::CONN->send_command ("pickup $::CFG->{pickup}")
1243 if defined $::CONN; 1559 if defined $::CONN;
1244 1560
1245 0 1561 0
1246 }); 1562 });
1563
1564 ${$_->[2]} = $checkbox if $_->[2];
1247 } 1565 }
1248 } 1566 }
1249 1567
1250 $table->add (2, 18, new CFClient::UI::ValSlider 1568 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1251 range => [0, 0, 16, 1, 1], 1569 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1570 template => ">= 99",
1252 to_value => sub { ">= " . 5 * $_[0] }, 1571 to_value => sub { ">= " . 5 * $_[0] },
1253 on_changed => sub { 1572 on_changed => sub {
1254 my ($slider, $value) = @_; 1573 my ($slider, $value) = @_;
1255 1574
1256 $::CFG->{pickup} &= ~0x7; 1575 $::CFG->{pickup} &= ~0xF;
1257 $::CFG->{pickup} |= int $value 1576 $::CFG->{pickup} |= int $value
1258 if $value; 1577 if $value;
1259 1; 1578 1;
1260 }); 1579 });
1580
1261 $table->add (3, 18, new CFClient::UI::Button 1581 $table->add_at (3, 18, new CFPlus::UI::Button
1262 text => "set", 1582 text => "set",
1263 on_activate => sub { 1583 on_activate => sub {
1264 $::CONN->send_command ("pickup $::CFG->{pickup}") 1584 $::CONN->send_command ("pickup $::CFG->{pickup}")
1265 if defined $::CONN; 1585 if defined $::CONN;
1266 0 1586 0
1267 }); 1587 });
1268 1588
1269 $table 1589 $r
1270} 1590}
1271 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);
1610
1272sub inventory_window { 1611sub inventory_widget {
1273 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1612 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1613
1614 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1615 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1616
1617 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1618
1619 use sort 'stable';
1620
1621 $hb1->add (new CFPlus::UI::Selector
1622 value => $::CFG->{inv_sort},
1623 options => [
1624 [type => "Type/Name"],
1625 [mtime => "Recent/Normal/Locked"],
1626 [weight => "Weight/Type"],
1627 ],
1628 on_changed => sub {
1629 $::CFG->{inv_sort} = $_[1];
1630 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1631 },
1632 );
1633 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1634 #TODO# update to weigh/maxweight
1635 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1636
1637 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1638 $sw1->add ($INV = new CFPlus::UI::Inventory);
1639 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1640
1641 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1642
1643 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1644
1645 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1646 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1647
1648 # XXX: Call after $INVR = ... because set_opencont sets the items
1649 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1650
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;
1692}
1693
1694sub toggle_player_page {
1695 my ($widget) = @_;
1696
1697 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1698 $PL_WINDOW->hide;
1699 } else {
1700 $PL_NOTEBOOK->set_current_page ($widget);
1701 $PL_WINDOW->show;
1702 }
1703}
1704
1705sub player_window {
1706 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1274 x => "center", 1707 x => "center",
1275 y => "center", 1708 y => "center",
1276 force_w => $WIDTH * 9/10, 1709 force_w => $WIDTH * 9/10,
1277 force_h => $HEIGHT * 9/10, 1710 force_h => $HEIGHT * 9/10,
1278 title => "Inventory", 1711 title => "Player",
1712 name => "playerbook",
1279 has_close_button => 1, 1713 has_close_button => 1
1280 ; 1714 ;
1281 1715
1282 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1716 my $ntb =
1717 $PL_NOTEBOOK =
1718 new CFPlus::UI::Notebook expand => 1;
1283 1719
1284 $hb->add (my $vb1 = new CFClient::UI::VBox); 1720 $ntb->add_tab (
1285 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1721 "Statistics (F2)" => $STATS_PAGE = stats_window,
1286 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1722 "Shows statistics, where all your Stats and Resistances are shown."
1723 );
1724 $ntb->add_tab (
1725 "Skills (F3)" => $SKILL_PAGE = skill_window,
1726 "Shows all your Skills."
1727 );
1287 1728
1288 $hb->add (my $vb2 = new CFClient::UI::VBox); 1729 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1730 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1731 $ntb->add_tab (
1732 "Spellbook (F4)" => $spellsw,
1733 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1734 );
1735 $ntb->add_tab (
1736 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1737 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1738 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
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.");
1289 1742
1290 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1743 $ntb->add_tab (Media => media_window,
1744 "License, Author and Source info for media sent by the server.");
1291 1745
1292 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1746 $ntb->set_current_page ($INVENTORY_PAGE);
1293 1747
1294 # XXX: Call after $INVR = ... because set_opencont sets the items 1748 $plwin->add ($ntb);
1295 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1749 $plwin
1296
1297 $invwin
1298}
1299
1300sub spell_setup {
1301 new CFClient::UI::SpellList
1302} 1750}
1303 1751
1304sub keyboard_setup { 1752sub keyboard_setup {
1305 my $binding_list = new CFClient::UI::VBox; 1753 CFPlus::Macro::keyboard_setup
1306
1307 my $refresh;
1308 $refresh = sub {
1309 $binding_list->clear ();
1310
1311 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1312 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1313 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1314 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1315
1316 my $lbl = join "; ", @$cmds;
1317 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1318 $binding_list->add (my $hb = new CFClient::UI::HBox);
1319 $hb->add (new CFClient::UI::Button
1320 text => "delete",
1321 tooltip => "Deletes the binding",
1322 on_activate => sub {
1323 $binding_list->remove ($hb);
1324 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1325 0
1326 });
1327
1328 $hb->add (new CFClient::UI::Button
1329 text => "edit",
1330 tooltip => "Edits the binding",
1331 on_activate => sub {
1332 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1334 sub {
1335 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1337 $::CFG->{profile}{default}{bindings}{$nmod}{$nsym} = $ncmds;
1338 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show;
1341 },
1342 sub {
1343 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1344 $SETUP_DIALOG->show;
1345 });
1346 $::BIND_EDITOR->show;
1347 $SETUP_DIALOG->hide;
1348 0
1349 });
1350
1351 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1352 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1353 }
1354 }
1355 };
1356
1357 my $vb = new CFClient::UI::VBox;
1358 $vb->add (my $hb = new CFClient::UI::HBox);
1359 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1360 $hb->add (new CFClient::UI::CheckBox
1361 expand => 1,
1362 state => $CFG->{shift_fire_stop},
1363 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1364 on_changed => sub {
1365 my ($cbox, $value) = @_;
1366 $CFG->{shift_fire_stop} = $value;
1367 0
1368 });
1369
1370 $vb->add ($binding_list);
1371 $vb->add (my $hb = new CFClient::UI::HBox);
1372
1373 $hb->add (new CFClient::UI::Button
1374 text => "record new",
1375 expand => 1,
1376 tooltip => "This button opens the binding editor with an empty binding.",
1377 on_activate => sub {
1378 $::BIND_EDITOR->set_binding (undef, undef, [],
1379 sub {
1380 my ($mod, $sym, $cmds) = @_;
1381 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
1382 $refresh->();
1383 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1384 $SETUP_DIALOG->show;
1385 },
1386 sub {
1387 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1388 $SETUP_DIALOG->show;
1389 },
1390 );
1391 $SETUP_DIALOG->hide;
1392 $::BIND_EDITOR->show;
1393 0
1394 },
1395 );
1396
1397 $hb->add (new CFClient::UI::Button
1398 text => "close",
1399 tooltip => "Closes the binding window",
1400 expand => 1,
1401 on_activate => sub {
1402 $SETUP_DIALOG->hide;
1403 0
1404 }
1405 );
1406
1407 $refresh->();
1408
1409 $vb
1410} 1754}
1411 1755
1412sub help_window { 1756sub help_window {
1413 my $win = new CFClient::UI::FancyFrame 1757 my $win = new CFPlus::UI::Toplevel
1414 x => 'center', 1758 x => 'center',
1415 y => 'center', 1759 y => 'center',
1416 z => 2, 1760 z => 4,
1417 name => 'doc_browser', 1761 name => 'doc_browser',
1418 force_w => int $WIDTH * 7/8, 1762 force_w => int $WIDTH * 7/8,
1419 force_h => int $HEIGHT * 7/8, 1763 force_h => int $HEIGHT * 7/8,
1420 title => "Documentation"; 1764 title => "Help Browser",
1765 has_close_button => 1;
1421 1766
1422 $win->add (my $vbox = new CFClient::UI::VBox); 1767 $win->add (my $vbox = new CFPlus::UI::VBox);
1423 1768
1424 $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 );
1425 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1773 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1426 expand => 1, fontsize => 0.8, padding_x => 4); 1774 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1427 1775
1428 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1776 my @history;
1429 $buttons->add (my $combo = new CFClient::UI::Combobox 1777 my @future;
1430 value => undef, 1778 my $curnode;
1431 options => [ 1779
1432 [intro => "Introduction"], 1780 my $load_node; $load_node = sub {
1433 [manual => "Manual"], 1781 my ($node, $para) = @_;
1434 [skill_help => "Skills"], 1782
1435 [command_help => "Commands"], 1783 $buttons->clear;
1436 [dmcommand_help => "DM Commands"], 1784
1437 [COPYING => "License Terms"], 1785 $buttons->add (new CFPlus::UI::Button
1438 ], 1786 text => "⇤",
1787 tooltip => "back to the starting page",
1439 on_changed => sub { 1788 on_activate => sub {
1440 my ($self, $pod) = @_; 1789 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1441 1790 unshift @future, @history;
1442 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1791 @history = ();
1443 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1792 $load_node->(@{shift @future});
1444
1445 $viewer->clear;
1446 1793 },
1447 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1794 );
1448 for @$pom;
1449 1795
1450 $viewer->set_offset (0); 1796 if (@history) {
1797 $buttons->add (new CFPlus::UI::Button
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});
1803 },
1451 0 1804 );
1452 }, 1805 }
1453 on_visibility_change => sub { 1806
1454 my ($self, $visible) = @_; 1807 if (@future) {
1455 return unless $visible; 1808 $buttons->add (new CFPlus::UI::Button
1456 return if $self->{value}; 1809 text => "⋙",
1457 $self->set_value ("intro"); 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 },
1458 0 1815 );
1459 }, 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);
1460 ); 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 };
1461 1854
1462 $win 1855 $win
1463} 1856}
1464 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;
1889 }
1890 ;
1891
1892 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1893
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 }
1911
1912 $QUIT_DIALOG->show;
1913 $QUIT_DIALOG->grab_focus;
1914}
1915
1916sub show_tip_of_the_day {
1917 # find all tips
1918 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
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;
1963 },
1964 );
1965
1966 $dialog->show;
1967 };
1968}
1969
1465sub sdl_init { 1970sub sdl_init {
1466 CFClient::SDL_Init 1971 CFPlus::SDL_Init
1467 and die "SDL::Init failed!\n"; 1972 and die "SDL::Init failed!\n";
1468} 1973}
1469 1974
1470sub video_init { 1975sub video_init {
1471 sdl_init;
1472
1473 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1976 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1474 1977
1475 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1978 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1476 1979
1477 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1980 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1478 $FULLSCREEN = $CFG->{fullscreen}; 1981 $FULLSCREEN = $CFG->{fullscreen};
1479 $FAST = $CFG->{fast}; 1982 $FAST = $CFG->{fast};
1480 1983
1481 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1984 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1482 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1985 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1483 1986
1484 $SDL_ACTIVE = 1; 1987 $SDL_ACTIVE = 1;
1485 $LAST_REFRESH = time - 0.01; 1988 $LAST_REFRESH = time - 0.01;
1486 1989
1487 CFClient::OpenGL::init; 1990 CFPlus::OpenGL::init;
1991 CFPlus::Macro::init;
1488 1992
1489 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1993 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1490 1994
1491 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1995 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1492 1996
1493 ############################################################################# 1997 #############################################################################
1494 1998
1495 if ($DEBUG_STATUS) { 1999 if ($DEBUG_STATUS) {
1496 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2000 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1497 } else { 2001 } else {
1498 # create the widgets 2002 # create/configure the widgets
1499 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
1500 $DEBUG_STATUS = new CFClient::UI::Label 2016 $DEBUG_STATUS = new CFPlus::UI::Label
1501 padding => 0, 2017 padding => 0,
1502 z => 100, 2018 z => 100,
1503 force_x => "max", 2019 force_x => "max",
1504 force_y => 0; 2020 force_y => 0;
1505 $DEBUG_STATUS->show; 2021 $DEBUG_STATUS->show;
1506 2022
1507 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1508
1509 $STATUSBOX = new CFClient::UI::Statusbox; 2023 $STATUSBOX = new CFPlus::UI::Statusbox;
1510 $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]);
1511 2025
1512 (new CFClient::UI::Frame 2026 (new CFPlus::UI::Frame
1513 bg => [0, 0, 0, 0.4], 2027 bg => [0, 0, 0, 0.4],
1514 force_x => 0, 2028 force_x => 0,
1515 force_y => "max", 2029 force_y => "max",
1516 child => $STATUSBOX, 2030 child => $STATUSBOX,
1517 )->show; 2031 )->show;
1518 2032
1519 CFClient::UI::FancyFrame->new ( 2033 CFPlus::UI::Toplevel->new (
1520 title => "Map", 2034 title => "Map",
1521 name => "mapmap", 2035 name => "mapmap",
1522 x => 0, 2036 x => 0,
1523 y => $FONTSIZE + 8, 2037 y => $FONTSIZE + 8,
1524 border_bg => [1, 1, 1, 192/255], 2038 border_bg => [1, 1, 1, 192/255],
1525 bg => [1, 1, 1, 0], 2039 bg => [1, 1, 1, 0],
1526 child => ($MAPMAP = new CFClient::MapWidget::MapMap 2040 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1527 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.",
1528 ), 2042 ),
1529 )->show; 2043 )->show;
1530 2044
1531 $MAPWIDGET = new CFClient::MapWidget; 2045 $MAPWIDGET = new CFPlus::MapWidget;
1532 $MAPWIDGET->connect (activate_console => sub { 2046 $MAPWIDGET->connect (activate_console => sub {
1533 my ($mapwidget, $preset) = @_; 2047 my ($mapwidget, $preset) = @_;
1534 2048
1535 if ($CONSOLE) { 2049 $MESSAGE_WINDOW->activate_console ($preset)
1536 $CONSOLE->{input}->{auto_activated} = 1; 2050 if $MESSAGE_WINDOW;
1537 $CONSOLE->{input}->grab_focus;
1538
1539 if ($preset && $CONSOLE->{input}->get_text eq '') {
1540 $CONSOLE->{input}->set_text ($preset);
1541 }
1542 }
1543 }); 2051 });
1544 $MAPWIDGET->show; 2052 $MAPWIDGET->show;
1545 $MAPWIDGET->grab_focus; 2053 $MAPWIDGET->grab_focus;
1546 2054
1547 $LOGVIEW = new CFClient::UI::TextScroller 2055 $COMPLETER = new CFPlus::MapWidget::Command::
1548 expand => 1, 2056 command => { },
1549 font => $FONT_FIXED, 2057 tooltip => "#completer_help",
1550 fontsize => $::CFG->{log_fontsize},
1551 indent => -4,
1552 can_hover => 1,
1553 can_events => 1,
1554 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1555 ; 2058 ;
1556 2059
1557 $SETUP_DIALOG = new CFClient::UI::FancyFrame 2060 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1558 title => "Setup", 2061 title => "Setup",
1559 name => "setup_dialog", 2062 name => "setup_dialog",
1560 x => 'center', 2063 x => 'center',
1561 y => 'center', 2064 y => 'center',
1562 z => 2, 2065 z => 2,
1563 force_w => $::WIDTH * 0.6, 2066 force_w => $::WIDTH * 0.6,
1564 force_h => $::HEIGHT * 0.6, 2067 force_h => $::HEIGHT * 0.6,
1565 has_close_button => 1, 2068 has_close_button => 1,
1566 ; 2069 ;
1567 2070
2071 $METASERVER = metaserver_dialog;
2072 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
2073
1568 $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,
1569 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 2075 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1570 2076
1571 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2077 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1572 "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.");
1573 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 2079 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1574 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 2080 "Configure various client-specific settings.");
1575 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2081 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1576 "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.");
1577 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2083 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1578 "Configure the use of audio, sound effects and background music."); 2084 "Configure the use of audio, sound effects and background music.");
1579 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2085 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1580 "Lets you define, edit and delete key bindings." 2086 "Lets you define, edit and delete key bindings."
1581 . "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 "
1582 . "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 "
1583 . "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. "
1584 . "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 "
1585 . "binding editor closes"); 2091 . "binding editor closes");
1586 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1587 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1588 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2092 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1589 "Some debuggin' options. Do not ask."); 2093 "Some debuggin' options. Do not ask.");
1590 2094
1591 $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
1592 2096
1593 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2097 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1594 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.");
1595 2099
1596 $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,
1597 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.");
1598 2102
1599 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
1600 2104
1601 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1602 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1603 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 2105 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1604 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 2106 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1605 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1606 2107
1607 $BUTTONBAR->add (new CFClient::UI::Button 2108 $BUTTONBAR->add (new CFPlus::UI::Button
1608 text => "Save Config", 2109 text => "Save Config",
1609 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.",
1610 on_activate => sub { 2111 on_activate => sub {
1611 $::CFG->{layout} = CFClient::UI::get_layout; 2112 $::CFG->{layout} = CFPlus::UI::get_layout;
1612 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 2113 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1613 status "Configuration Saved"; 2114 status "Configuration Saved";
1614 0 2115 0
1615 }, 2116 },
1616 ); 2117 );
1617 2118
1618 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 2119 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1619 tooltip => "View Documentation"); 2120 tooltip => "View Documentation");
1620 2121
2122
1621 $BUTTONBAR->add (new CFClient::UI::Button 2123 $BUTTONBAR->add (new CFPlus::UI::Button
1622 text => "Quit", 2124 text => "Quit",
1623 tooltip => "Terminates the program", 2125 tooltip => "Terminates the program",
1624 on_activate => sub { 2126 on_activate => sub {
1625 if ($CONN) { 2127 if ($CONN) {
1626 open_quit_dialog; 2128 open_quit_dialog;
1627 } else { 2129 } else {
1628 exit; 2130 Event::unloop_all;
1629 } 2131 }
1630 0 2132 0
1631 }, 2133 },
1632 ); 2134 );
1633 2135
1634 $BUTTONBAR->show; 2136 $BUTTONBAR->show;
1635 $SETUP_DIALOG->show; 2137 $SETUP_DIALOG->show;
2138 $MESSAGE_WINDOW->show;
1636 } 2139 }
1637 2140
1638 $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]);
1639} 2142}
1640 2143
1641sub video_shutdown { 2144sub video_shutdown {
1642 CFClient::OpenGL::shutdown; 2145 CFPlus::OpenGL::shutdown;
1643 2146
1644 undef $SDL_ACTIVE; 2147 undef $SDL_ACTIVE;
1645} 2148}
1646 2149
1647my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1648my $bgmusic;#TODO#hack#d#
1649
1650sub audio_channel_finished {
1651 my ($channel) = @_;
1652
1653 #warn "channel $channel finished\n";#d#
1654}
1655
1656sub audio_music_finished {
1657 return unless $CFG->{bgm_enable};
1658
1659 # TODO: hack, do play loop and mood music
1660 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
1661 $bgmusic->play (0);
1662
1663 push @bgmusic, shift @bgmusic;
1664}
1665
1666sub audio_init {
1667 if ($CFG->{audio_enable}) {
1668 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
1669 $SDL_MIXER = !CFClient::Mix_OpenAudio;
1670
1671 unless ($SDL_MIXER) {
1672 status "Unable to open sound device: there will be no sound";
1673 return;
1674 }
1675
1676 CFClient::Mix_AllocateChannels 8;
1677 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
1678
1679 audio_music_finished;
1680
1681 while (<$fh>) {
1682 next if /^\s*#/;
1683 next if /^\s*$/;
1684
1685 my ($file, $volume, $event) = split /\s+/, $_, 3;
1686
1687 push @SOUNDS, "$volume,$file";
1688
1689 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1690 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
1691 $chunk->volume ($volume * 128 / 100);
1692 $chunk
1693 };
1694 }
1695 } else {
1696 status "unable to open sound config: $!";
1697 }
1698 }
1699}
1700
1701sub audio_shutdown {
1702 CFClient::Mix_CloseAudio if $SDL_MIXER;
1703 undef $SDL_MIXER;
1704 @SOUNDS = ();
1705 %AUDIO_CHUNKS = ();
1706}
1707
1708my %animate_object; 2150my %animate_object;
1709my $animate_timer; 2151my $animate_timer;
1710 2152
1711my $fps = 9; 2153my $fps = 9;
1712 2154
1713my %demo;#d#
1714
1715sub force_refresh { 2155sub force_refresh {
2156 if ($ENV{CFPLUS_DEBUG} & 4) {
1716 $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;
1717 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2158 debug sprintf "%3.2f", $fps;
2159 }
1718 2160
1719 $CFClient::UI::ROOT->draw; 2161 $CFPlus::UI::ROOT->draw;
1720 2162 CFPlus::SDL_GL_SwapBuffers;
1721 $WANT_REFRESH = 0;
1722 $CAN_REFRESH = 0;
1723 $LAST_REFRESH = $NOW; 2163 $LAST_REFRESH = $NOW;
1724
17250 && do {
1726 # some weird model-drawing code, just a joke right now
1727 use CFClient::OpenGL;
1728
1729 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1730 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1731 $demo{r} ||= do {
1732 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1733 $mod->{v} = pack "f*", @{$mod->{v}};
1734 $_ = [scalar @$_, pack "S!*", @$_]
1735 for values %{$mod->{g}};
1736 $mod
1737 };
1738
1739 my $r = $demo{r} or die;
1740
1741 glDepthMask 1;
1742 glClear GL_DEPTH_BUFFER_BIT;
1743 glEnable GL_TEXTURE_2D;
1744 glEnable GL_DEPTH_TEST;
1745 glEnable GL_CULL_FACE;
1746 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1747
1748 glMatrixMode GL_PROJECTION;
1749 glLoadIdentity;
1750 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1751 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1752 glMatrixMode GL_MODELVIEW;
1753 glLoadIdentity;
1754
1755 glPushMatrix;
1756 glTranslate 0, 0, -800;
1757 glScale 1, -1, 1;
1758 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1759 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1760 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1761 glScale 50, 50, 50;
1762
1763 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1764 while (my ($k, $v) = each %{$r->{g}}) {
1765 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1766 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1767 }
1768
1769 glPopMatrix;
1770
1771 glShadeModel GL_FLAT;
1772 glDisable GL_DEPTH_TEST;
1773 glDisable GL_TEXTURE_2D;
1774 glDepthMask 0;
1775
1776 $WANT_REFRESH++; 2164 $WANT_REFRESH->stop;
1777};
1778
1779 CFClient::SDL_GL_SwapBuffers;
1780} 2165}
1781 2166
2167$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2168
1782my $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 {
1783 $NOW = time; 2170 $NOW = time;
1784 2171
1785 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2172 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1786 for CFClient::SDL_PollEvent; 2173 for CFPlus::poll_events;
1787 2174
1788 if (%animate_object) { 2175 if (%animate_object) {
1789 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2176 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1790 $WANT_REFRESH++; 2177 $WANT_REFRESH->start;
1791 }
1792
1793 if ($WANT_REFRESH) {
1794 force_refresh;
1795 } else {
1796 $CAN_REFRESH = 1;
1797 } 2178 }
1798}); 2179});
1799 2180
1800sub animation_start { 2181sub animation_start {
1801 my ($widget) = @_; 2182 my ($widget) = @_;
… …
1805sub animation_stop { 2186sub animation_stop {
1806 my ($widget) = @_; 2187 my ($widget) = @_;
1807 delete $animate_object{$widget}; 2188 delete $animate_object{$widget};
1808} 2189}
1809 2190
1810# check once/second for faces that need to be prefetched
1811# this should, of course, only run on demand, but
1812# SDL forces worse things on us....
1813
1814Event->timer (after => 1, interval => 0.25, cb => sub {
1815 $CONN->face_prefetch
1816 if $CONN;
1817});
1818
1819%SDL_CB = ( 2191%SDL_CB = (
1820 CFClient::SDL_QUIT => sub { 2192 CFPlus::SDL_QUIT => sub {
1821 Event::unloop -1; 2193 Event::unloop_all;
1822 }, 2194 },
1823 CFClient::SDL_VIDEORESIZE => sub { 2195 CFPlus::SDL_VIDEORESIZE => sub {
1824 }, 2196 },
1825 CFClient::SDL_VIDEOEXPOSE => sub { 2197 CFPlus::SDL_VIDEOEXPOSE => sub {
1826 CFClient::UI::full_refresh; 2198 CFPlus::UI::full_refresh;
1827 }, 2199 },
1828 CFClient::SDL_ACTIVEEVENT => sub { 2200 CFPlus::SDL_ACTIVEEVENT => sub {
1829# 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;
1830 }, 2207 },
1831 CFClient::SDL_KEYDOWN => sub { 2208 CFPlus::SDL_KEYDOWN => sub {
1832 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2209 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1833 # alt-enter 2210 # alt-enter
2211 $FULLSCREEN_ENABLE->toggle;
1834 video_shutdown; 2212 video_shutdown;
1835 $CFG->{fullscreen} = !$CFG->{fullscreen};
1836 video_init; 2213 video_init;
1837 } else { 2214 } else {
1838 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2215 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1839 } 2216 }
1840 }, 2217 },
1841 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2218 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1842 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2219 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1843 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2220 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1844 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2221 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1845 CFClient::SDL_USEREVENT => sub { 2222 CFPlus::SDL_USEREVENT => sub {
1846 if ($_[0]{code} == 1) { 2223 if ($_[0]{code} == 1) {
1847 audio_channel_finished $_[0]{data1}; 2224 audio_channel_finished $_[0]{data1};
1848 } elsif ($_[0]{code} == 0) { 2225 } elsif ($_[0]{code} == 0) {
1849 audio_music_finished; 2226 audio_music_finished;
1850 } 2227 }
… …
1854############################################################################# 2231#############################################################################
1855 2232
1856$SIG{INT} = $SIG{TERM} = sub { exit }; 2233$SIG{INT} = $SIG{TERM} = sub { exit };
1857 2234
1858{ 2235{
1859 local $SIG{__DIE__} = sub {
1860 return unless defined $^S && !$^S;
1861 Carp::confess $_[1];#d#TODO: remove when stable
1862 CFClient::fatal $_[0];
1863 };
1864
1865 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2236 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2237 CFPlus::DB::Server::run;
2238
1866 CFClient::UI::set_layout ($::CFG->{layout}); 2239 CFPlus::UI::set_layout ($::CFG->{layout});
1867 2240
1868 my %DEF_CFG = ( 2241 my %DEF_CFG = (
1869 sdl_mode => 0, 2242 sdl_mode => 0,
1870 width => 640,
1871 height => 480,
1872 fullscreen => 0, 2243 fullscreen => 0,
1873 fast => 0, 2244 fast => 0,
2245 force_opengl11 => undef,
2246 texture_compression => 1,
1874 map_scale => 1, 2247 map_scale => 1,
1875 fow_enable => 1, 2248 fow_enable => 1,
1876 fow_intensity => 0.45, 2249 fow_intensity => 0,
1877 fow_smooth => 0, 2250 map_smoothing => 1,
1878 gui_fontsize => 1, 2251 gui_fontsize => 1,
1879 log_fontsize => 0.7, 2252 log_fontsize => 0.7,
1880 gauge_fontsize => 1, 2253 gauge_fontsize => 1,
1881 gauge_size => 0.35, 2254 gauge_size => 0.35,
1882 stat_fontsize => 0.7, 2255 stat_fontsize => 0.7,
1883 mapsize => 100, 2256 mapsize => 100,
1884 say_command => 'say',
1885 audio_enable => 1, 2257 audio_enable => 1,
2258 effects_enable => 1,
2259 effects_volume => 1,
1886 bgm_enable => 1, 2260 bgm_enable => 1,
1887 bgm_volume => 0.25, 2261 bgm_volume => 0.5,
1888 face_prefetch => 0,
1889 output_sync => 1, 2262 output_sync => 1,
1890 output_count => 1, 2263 output_count => 1,
2264 output_rate => "",
1891 pickup => 0, 2265 pickup => 0,
2266 inv_sort => "mtime",
1892 default => "profile", # default profile 2267 default => "profile", # default profile
2268 show_tips => 1,
2269 logview_max_par => 1000,
1893 ); 2270 );
1894 2271
1895 while (my ($k, $v) = each %DEF_CFG) { 2272 while (my ($k, $v) = each %DEF_CFG) {
1896 $CFG->{$k} = $v unless exists $CFG->{$k}; 2273 $CFG->{$k} = $v unless exists $CFG->{$k};
1897 } 2274 }
1898 2275
1899 $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 }
1900 2290
1901 sdl_init; 2291 sdl_init;
1902 2292
1903 @SDL_MODES = reverse 2293 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1904 grep $_->[0] >= 640 && $_->[1] >= 480, 2294 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1905 CFClient::SDL_ListModes;
1906
1907 @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;
1908 2298
1909 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2299 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1910 2300
1911 { 2301 {
1912 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2302 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1913 DejaVuSans.ttf 2303 DejaVuSans.ttf
1914 DejaVuSansMono.ttf 2304 DejaVuSansMono.ttf
1915 DejaVuSans-Bold.ttf 2305 DejaVuSans-Bold.ttf
1916 DejaVuSansMono-Bold.ttf 2306 DejaVuSansMono-Bold.ttf
1917 DejaVuSans-Oblique.ttf 2307 DejaVuSans-Oblique.ttf
1918 DejaVuSansMono-Oblique.ttf 2308 DejaVuSansMono-Oblique.ttf
1919 DejaVuSans-BoldOblique.ttf 2309 DejaVuSans-BoldOblique.ttf
1920 DejaVuSansMono-BoldOblique.ttf 2310 DejaVuSansMono-BoldOblique.ttf
1921 ); 2311 );
1922 2312
1923 CFClient::add_font $_ for @fonts; 2313 CFPlus::add_font $_ for @fonts;
1924 2314
1925 CFClient::pango_init; 2315 CFPlus::pango_init;
1926 2316
1927 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2317 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1928 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2318 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1929 2319
1930 $FONT_PROP->make_default; 2320 $FONT_PROP->make_default;
1931 } 2321 }
1932 2322
1933# compare mono (ft) vs. rgba (cairo) 2323# compare mono (ft) vs. rgba (cairo)
1934# ft - 1.8s, cairo 3s, even in alpha-only mode 2324# ft - 1.8s, cairo 3s, even in alpha-only mode
1935# for my $rgba (0..1) { 2325# for my $rgba (0..1) {
1936# my $t1 = Time::HiRes::time; 2326# my $t1 = Time::HiRes::time;
1937# for (1..1000) { 2327# for (1..1000) {
1938# my $layout = CFClient::Layout->new ($rgba); 2328# my $layout = CFPlus::Layout->new ($rgba);
1939# $layout->set_text ("hallo" x 100); 2329# $layout->set_text ("hallo" x 100);
1940# $layout->render; 2330# $layout->render;
1941# } 2331# }
1942# my $t2 = Time::HiRes::time; 2332# my $t2 = Time::HiRes::time;
1943# warn $t2-$t1; 2333# warn $t2-$t1;
… …
1945 2335
1946 video_init; 2336 video_init;
1947 audio_init; 2337 audio_init;
1948} 2338}
1949 2339
2340show_tip_of_the_day if $CFG->{show_tips};
2341
2342Event->idle (cb => sub {
2343 $_[0]->w->cancel;
2344 $startup_done->();
2345});
2346
1950Event::loop; 2347Event::loop;
2348
2349#video_shutdown;
2350#audio_shutdown;
1951#CFClient::SDL_Quit; 2351CFPlus::SDL_Quit;
1952#CFClient::_exit 0; 2352CFPlus::DB::Server::stop;
1953
1954END { CFClient::SDL_Quit }
1955 2353
1956=head1 NAME 2354=head1 NAME
1957 2355
1958cfplus - A Crossfire+ and Crossfire game client 2356cfplus - A Crossfire TRT and Crossfire game client
1959 2357
1960=head1 SYNOPSIS 2358=head1 SYNOPSIS
1961 2359
1962Just run it - no commandline arguments are supported. 2360Just run it - no commandline arguments are supported.
1963 2361
1964=head1 USAGE 2362=head1 USAGE
1965 2363
1966cfplus 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
1967fullscreen and interactively. 2365be used in fullscreen mode and interactively.
1968 2366
1969=head1 DEBUGGING 2367=head1 DEBUGGING
1970 2368
1971 2369
1972CFPLUS_DEBUG - environment variable 2370CFPLUS_DEBUG - environment variable

Diff Legend

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