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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.84 by root, Sun Jul 2 18:52:05 2006 UTC vs.
Revision 1.226 by root, Sat Sep 1 07:22:21 2007 UTC

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

Diff Legend

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