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

Diff Legend

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