ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines