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

Diff Legend

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