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.95 by root, Sun Jul 16 23:30:08 2006 UTC vs.
Revision 1.226 by root, Sat Sep 1 07:22:21 2007 UTC

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

Diff Legend

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