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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines