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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines