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.86 by root, Sun Jul 2 21:07:27 2006 UTC vs.
Revision 1.225 by root, Fri Aug 31 08:03:10 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines