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.100 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.199 by root, Wed Aug 1 14:27:21 2007 UTC

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

Diff Legend

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