ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.99 by root, Sun Jul 23 08:58:44 2006 UTC vs.
Revision 1.198 by root, Tue Jul 31 02:45:39 2007 UTC

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

Diff Legend

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