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.101 by elmex, Sun Jul 23 17:03:44 2006 UTC vs.
Revision 1.230 by root, Mon Oct 8 17:05:29 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines