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.84 by root, Sun Jul 2 18:52:05 2006 UTC vs.
Revision 1.224 by root, Thu Aug 30 07:57:59 2007 UTC

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

Diff Legend

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