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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines