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.21 by root, Sun May 28 01:16:04 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;
135our $HOST_ENTRY;
136our $FULLSCREEN_ENABLE;
137our $PICKUP_ENABLE;
138our $SERVER_INFO;
86 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;
87our $FLOORBOX; 156our $FLOORBOX;
88our $GAUGES; 157our $GAUGES;
89our $STATWIDS; 158our $STATWIDS;
90 159
91our $SDL_ACTIVE; 160our $SDL_ACTIVE;
92our %SDL_CB; 161our %SDL_CB;
93 162
94our $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
95our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
96our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
97 172
98our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
99our $STATUSBOX; 174our $STATUSBOX;
100our $DEBUG_STATUS; 175our $DEBUG_STATUS;
101 176
102our $INV; 177our $INV;
103our $INVR; 178our $INVR;
104our $INVR_LBL; 179our $INV_RIGHT_HB;
180
181our $PICKUP_CFG;
182
183our $IN_BUILD_MODE;
184our $BUILD_BUTTON;
105 185
106sub status { 186sub status {
107 $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]);
108} 188}
109 189
110sub debug { 190sub debug {
111 $DEBUG_STATUS->set_text ($_[0]); 191 $DEBUG_STATUS->set_text ($_[0]);
112 my ($w, $h) = $DEBUG_STATUS->size_request; 192}
113 $DEBUG_STATUS->move ($WIDTH - $w, 0); 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;
114} 439}
115 440
116sub start_game { 441sub start_game {
117 status "logging in..."; 442 status "logging in...";
118 443
444 $LOGIN_BUTTON->set_text ("Logout");
445 $SETUP_DIALOG->hide;
446
119 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;
120 448
121 my ($host, $port) = split /:/, $CFG->{host}; 449 my ($host, $port) = split /:/, $PROFILE->{host};
122 450
123 $MAP = new CFClient::Map $mapsize, $mapsize; 451 $MAP = new CFPlus::Map;
124 452
125 $CONN = eval { 453 $CONN = eval {
126 new CFClient::Protocol 454 new CFPlus::Protocol
127 host => $host, 455 host => $host,
128 port => $port || 13327, 456 port => $port || 13327,
129 user => $CFG->{user}, 457 user => $PROFILE->{user},
130 pass => $CFG->{password}, 458 pass => $PROFILE->{password},
131 mapw => $mapsize, 459 mapw => $mapsize,
132 maph => $mapsize, 460 maph => $mapsize,
461
462 client => "cfplus $CFPlus::VERSION $] $^O",
133 463
134 map_widget => $MAPWIDGET, 464 map_widget => $MAPWIDGET,
135 logview => $LOGVIEW, 465 logview => $LOGVIEW,
136 statusbox => $STATUSBOX, 466 statusbox => $STATUSBOX,
137 map => $MAP, 467 map => $MAP,
138 mapmap => $MAPMAP, 468 mapmap => $MAPMAP,
469 query => \&server_query,
470
471 setup_req => {
472 smoothing => $CFG->{map_smoothing}*1,
473 },
139 474
140 sound_play => sub { 475 sound_play => sub {
141 my ($x, $y, $soundnum, $type) = @_; 476 my ($x, $y, $soundnum, $type) = @_;
142 477
143 $SDL_MIXER 478 $SDL_MIXER
… …
149 $chunk->play; 484 $chunk->play;
150 }, 485 },
151 }; 486 };
152 487
153 if ($CONN) { 488 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 489 CFPlus::lowdelay fileno $CONN->{fh};
155 490
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 491 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
162 } else { 492 } else {
163 status "unable to connect"; 493 status "unable to connect";
164 stop_game(); 494 stop_game();
165 } 495 }
166} 496}
167 497
168sub stop_game { 498sub stop_game {
499 $LOGIN_BUTTON->set_text ("Login");
500 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
501 $SETUP_DIALOG->show;
502 $PL_WINDOW->hide;
503 $SPELL_LIST->clear_spells;
504 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
505
506 &audio_music_set ([]);
507
169 return unless $CONN; 508 return unless $CONN;
170 509
171 status "connection closed"; 510 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 511
512 destroy_query_dialog $CONN;
173 $CONN->destroy; 513 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 514 $CONN = 0; # false, does not autovivify
175 515
176 $BUTTONBAR->{children}[1]->emit ("activate") 516 undef $MAP;
177 unless $BUTTONBAR->{children}[1]->{state};
178} 517}
179 518
180sub client_setup { 519sub graphics_setup {
181 my $dialog = new CFClient::UI::FancyFrame 520 my $vbox = new CFPlus::UI::VBox;
182 req_x => 1, 521
183 req_y => $HEIGHT * (1/8),
184 name => "client_setup",
185 title => "Client Setup",
186 child => (my $vbox = new CFClient::UI::VBox);
187 $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]);
188 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
189 $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");
190 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 536 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
191 537
192 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 538 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
193 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 539 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
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);
194 544
195 $mode_slider->connect (changed => sub { 545 $mode_slider->connect (changed => sub {
196 my ($self, $value) = @_; 546 my ($self, $value) = @_;
197 547
198 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 548 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
199 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 549 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
200 }); 550 });
201 $mode_slider->emit (changed => $mode_slider->{range}[0]); 551 $mode_slider->emit (changed => $mode_slider->{range}[0]);
202 552
203 my $row = 1;
204
205 $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");
206 $table->add (1, $row++, new CFClient::UI::CheckBox 554 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
207 state => $CFG->{fullscreen}, 555 state => $CFG->{fullscreen},
208 tooltip => "Bring the client into fullscreen mode.", 556 tooltip => "Bring the client into fullscreen mode.",
209 on_changed => sub { 557 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
210 my ($self, $value) = @_;
211 $CFG->{fullscreen} = $value;
212 }
213 ); 558 );
214 559
215 $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");
216 $table->add (1, $row++, new CFClient::UI::CheckBox 561 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
217 state => $CFG->{fast}, 562 state => $CFG->{fast},
218 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.",
219 on_changed => sub { 577 on_activate => sub {
220 my ($self, $value) = @_; 578 video_shutdown ();
221 $CFG->{fast} = $value; 579 video_init ();
580 0
222 } 581 }
223 ); 582 );
224 583
225 $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");
226 $table->add (1, $row++, new CFClient::UI::Slider 585 $table->add_at (1, $row++, new CFPlus::UI::Slider
227 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 586 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
228 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 587 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
229 on_changed => sub { 588 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
230 my ($self, $value) = @_;
231 $CFG->{map_scale} = 2 ** $value;
232 }
233 ); 589 );
234 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
235 $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");
236 $table->add (1, $row++, new CFClient::UI::CheckBox 601 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
237 state => $CFG->{fow_enable}, 602 state => $CFG->{fow_enable},
238 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.",
239 on_changed => sub { 604 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
240 my ($self, $value) = @_;
241 $CFG->{fow_enable} = $value;
242 }
243 ); 605 );
244 606
245 $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");
246 $table->add (1, $row++, new CFClient::UI::Slider 608 $table->add_at (1, $row++, new CFPlus::UI::Slider
247 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 609 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
248 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.",
249 on_changed => sub { 611 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
250 my ($self, $value) = @_;
251 $CFG->{fow_intensity} = $value;
252 }
253 ); 612 );
254 613
255 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
256 $table->add (1, $row++, new CFClient::UI::CheckBox
257 state => $CFG->{fow_smooth},
258 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
259 on_changed => sub {
260 my ($self, $value) = @_;
261 $CFG->{fow_smooth} = $value;
262 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
263 }
264 );
265
266 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
267 $table->add (1, $row++, new CFClient::UI::Slider
268 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
269 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
270 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
271 );
272
273 $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");
274 $table->add (1, $row++, new CFClient::UI::Slider 615 $table->add_at (1, $row++, new CFPlus::UI::Slider
275 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 616 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
276 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.",
277 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 618 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
278 ); 619 );
279 620
280 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
281
282 $table->add (1, $row++, new CFClient::UI::Slider
283 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
284 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
285 on_changed => sub {
286 $CFG->{stat_fontsize} = $_[1];
287 &set_stats_window_fontsize;
288 }
289 );
290
291 $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");
292 $table->add (1, $row++, new CFClient::UI::Slider 622 $table->add_at (1, $row++, new CFPlus::UI::Slider
293 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 623 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
294 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.",
295 on_changed => sub { 625 on_changed => sub {
296 $CFG->{gauge_fontsize} = $_[1]; 626 $CFG->{gauge_fontsize} = $_[1];
297 &set_gauge_window_fontsize; 627 &set_gauge_window_fontsize;
628 0
298 } 629 }
299 ); 630 );
300 631
301 $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");
302 $table->add (1, $row++, new CFClient::UI::Slider 633 $table->add_at (1, $row++, new CFPlus::UI::Slider
303 range => [$CFG->{gauge_size}, 0.2, 0.8], 634 range => [$CFG->{gauge_size}, 0.2, 0.8],
304 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.",
305 on_changed => sub { 636 on_changed => sub {
306 $CFG->{gauge_size} = $_[1]; 637 $CFG->{gauge_size} = $_[1];
307 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 638 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
639 0
308 } 640 }
309 ); 641 );
310 642
311 $table->add (1, $row++, new CFClient::UI::Button 643 $vbox
312 expand => 1, align => 0, text => "Apply", 644}
313 tooltip => "Apply the video settings",
314 on_activate => sub {
315 video_shutdown ();
316 video_init ();
317 }
318 );
319 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
320 $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");
321 $table->add (1, $row++, new CFClient::UI::CheckBox 654 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
322 state => $CFG->{audio_enable}, 655 state => $CFG->{audio_enable},
323 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.",
324 on_changed => sub { 657 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
325 $CFG->{audio_enable} = $_[1];
326 }
327 ); 658 );
328# $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");
329# $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 {
330# $CFG->{effects_volume} = $_[1]; 661# $CFG->{effects_volume} = $_[1];
331# }); 662# });
332 $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");
333 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 664 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
334 $hbox->add (new CFClient::UI::CheckBox 665 $hbox->add (new CFPlus::UI::CheckBox
335 expand => 1, state => $CFG->{bgm_enable}, 666 expand => 1, state => $CFG->{bgm_enable},
336 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.",
337 on_changed => sub { 668 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
338 $CFG->{bgm_enable} = $_[1];
339 }
340 ); 669 );
341 $hbox->add (new CFClient::UI::Slider 670 $hbox->add (new CFPlus::UI::Slider
342 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 671 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
343 tooltip => "The volume of the background music. Changes are instant.", 672 tooltip => "The volume of the background music. Changes are instant.",
344 on_changed => sub { 673 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
345 $CFG->{bgm_volume} = $_[1];
346 CFClient::MixMusic::volume $_[1] * 128;
347 }
348 ); 674 );
349 675
350 $table->add (1, $row++, new CFClient::UI::Button 676 $table->add_at (1, $row++, new CFPlus::UI::Button
351 expand => 1, align => 0, text => "Apply", 677 expand => 1, align => 0, text => "Apply",
352 tooltip => "Apply the audio settings", 678 tooltip => "Apply the audio settings",
353 on_activate => sub { 679 on_activate => sub {
354 audio_shutdown (); 680 audio_shutdown ();
355 audio_init (); 681 audio_init ();
682 0
356 } 683 }
357 ); 684 );
358 685
359 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 686 $vbox
360 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
361 text => $CFG->{say_command},
362 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. "
363 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
364 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
365 on_changed => sub {
366 my ($self, $value) = @_;
367 $CFG->{say_command} = $value;
368 }
369 );
370
371 $dialog
372}
373
374sub set_stats_window_fontsize {
375 for (values %{$STATWIDS}) {
376 $_->set_fontsize ($::CFG->{stat_fontsize});
377 }
378} 687}
379 688
380sub set_gauge_window_fontsize { 689sub set_gauge_window_fontsize {
381 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 690 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
382 $_->set_fontsize ($::CFG->{gauge_fontsize}); 691 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
384} 693}
385 694
386sub make_gauge_window { 695sub make_gauge_window {
387 my $gh = int $HEIGHT * $CFG->{gauge_size}; 696 my $gh = int $HEIGHT * $CFG->{gauge_size};
388 697
389 my $win = new CFClient::UI::Frame ( 698 my $win = new CFPlus::UI::Frame (
390 req_x => 0, 699 force_x => 0,
391 req_y => -1, 700 force_y => "max",
392 def_w => $WIDTH, 701 force_w => $WIDTH,
393 def_h => $gh, 702 force_h => $gh,
394 ); 703 );
395 704
396 $win->add (my $hbox = new CFClient::UI::HBox 705 $win->add (my $hbox = new CFPlus::UI::HBox
397 children => [ 706 children => [
398 (new CFClient::UI::HBox expand => 1), 707 (new CFPlus::UI::HBox expand => 1),
399 (new CFClient::UI::VBox children => [ 708 (new CFPlus::UI::VBox children => [
400 (new CFClient::UI::Empty expand => 1), 709 (new CFPlus::UI::Empty expand => 1),
401 (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)),
402 ]), 711 ]),
403 (my $vbox = new CFClient::UI::VBox), 712 (my $vbox = new CFPlus::UI::VBox),
404 ], 713 ],
405 ); 714 );
406 715
407 $vbox->add (new CFClient::UI::HBox 716 $vbox->add (new CFPlus::UI::HBox
408 expand => 1, 717 expand => 1,
409 children => [ 718 children => [
410 (new CFClient::UI::Empty expand => 1), 719 (new CFPlus::UI::Empty expand => 1),
411 (my $hb = new CFClient::UI::HBox), 720 (my $hb = new CFPlus::UI::HBox),
412 ], 721 ],
413 ); 722 );
414 723
415 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 724 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
416 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.");
417 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 725 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
418 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.");
419 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 726 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
420 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.");
421 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 727 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
422 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.");
423 728
424 $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");
425 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.");
426 $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");
427 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
428 731
429 $GAUGES = { 732 $GAUGES = {
430 exp => $exp, win => $win, range => $rng, 733 exp => $exp, win => $win, range => $rng,
431 food => $fg, mana => $mg, hp => $hg, grace => $gg 734 food => $fg, mana => $mg, hp => $hg, grace => $gg
432 }; 735 };
… …
434 &set_gauge_window_fontsize; 737 &set_gauge_window_fontsize;
435 738
436 $win 739 $win
437} 740}
438 741
742sub debug_setup {
743 my $table = new CFPlus::UI::Table;
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
439sub make_stats_window { 760sub stats_window {
440 my $tgw = new CFClient::UI::FancyFrame 761 my $r = new CFPlus::UI::ScrolledWindow (
441 req_y => $HEIGHT * (2/8),
442 req_x => -1, 762 expand => 1,
443 title => "Stats", 763 scroll_y => 1
444 name => "stats_window"; 764 );
765 $r->add (my $vb = new CFPlus::UI::VBox);
445 766
446 $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
447 $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,
448 can_hover => 1, can_events => 1, 773 can_hover => 1, can_events => 1,
449 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.");
450 $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,
451 can_hover => 1, can_events => 1, 776 can_hover => 1, can_events => 1,
452 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).");
453 778
454 $vb->add (my $hb0 = new CFClient::UI::HBox); 779 $pi->add (my $hb0 = new CFPlus::UI::HBox);
455 $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,
456 can_hover => 1, can_events => 1, 781 can_hover => 1, can_events => 1,
457 tooltip => "The weight of the player including all inventory items."); 782 tooltip => "The weight of the player including all inventory items.");
458 $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,
459 can_hover => 1, can_events => 1, 784 can_hover => 1, can_events => 1,
460 tooltip => "The weight limit: you cannot carry more than this."); 785 tooltip => "The weight limit: you cannot carry more than this.");
461 786
462 787 $vb->add (new CFPlus::UI::FancyFrame
788 label => "Primary/Secondary Statistics",
463 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 789 child => (my $hb = new CFPlus::UI::HBox expand => 1),
790 );
464 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 791 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
465 792
466 my $color2 = [1, 1, 0]; 793 my $color2 = [1, 1, 0];
467 794
468 for ( 795 for (
469 [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],
470 [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],
471 [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],
472 [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],
473 [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],
474 [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],
475 [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],
476 803
477 [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],
478 [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],
479 [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],
480 [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],
481 [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],
482 [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],
483 ) { 810 ) {
484 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 811 my ($col, $row, $id, $label, $template) = @$_;
485 812
486 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 813 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
487 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");
488 $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
489 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");
490 } 819 }
491 820
821 $vb->add (new CFPlus::UI::FancyFrame
822 label => "Resistancies",
492 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 823 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
824 );
493 825
494 my $row = 0; 826 my $row = 0;
495 my $col = 0; 827 my $col = 0;
496 828
497 my %resist_names = ( 829 my %resist_names = (
830 slow => ["Slow",
498 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",
499 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",
500 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",
501 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",
502 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",
503 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",
504 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",
505 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",
506 pois => "<b>Poison</b> (resistance to getting poisoned)", 847 "<b>Poison</b> (resistance to getting poisoned)"],
848 para => ["Paralysation",
507 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",
508 deat => "<b>Death</b> (resistance against death spells)", 851 "<b>Death</b> (resistance against death spells)"],
509 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",
510 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",
511 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",
512 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",
513 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",
514 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",
515 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)"],
516 ); 866 );
867
517 for (qw/slow holyw conf fire depl magic 868 for (qw/slow holyw conf fire depl magic
518 drain acid pois para deat phys 869 drain acid pois para deat phys
519 blind fear tund elec cold ghit/) 870 blind fear tund elec cold ghit/)
520 { 871 {
521 $tbl2->add ($col, $row, 872 $tbl2->add_at ($col, $row,
522 $STATWIDS->{"res_$_"} = 873 $STATWIDS->{"res_$_"} =
523 new CFClient::UI::Label 874 new CFPlus::UI::Label
524 font => $FONT_FIXED, 875 font => $FONT_FIXED,
525 template => "-100%", 876 template => "-100%",
526 align => +1, 877 align => +1,
527 valign => 0, 878 valign => 0,
528 can_events => 1, 879 can_events => 1,
529 can_hover => 1, 880 can_hover => 1,
530 tooltip => $resist_names{$_}, 881 tooltip => $resist_names{$_}->[1],
531 ); 882 );
532 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 883 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
533 font => $FONT_FIXED, 884 font => $FONT_FIXED,
534 can_hover => 1, 885 can_hover => 1,
535 can_events => 1, 886 can_events => 1,
536 image => "ui/resist/resist_$_.png", 887 path => "ui/resist/resist_$_.png",
537 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],
538 ); 896 );
539 897
540 $row++; 898 $row++;
541 if ($row % 6 == 0) { 899 if ($row % 6 == 0) {
542 $col += 2; 900 $col += 3;
543 $row = 0; 901 $row = 0;
544 } 902 }
545 } 903 }
546 904
547 &set_stats_window_fontsize;
548 update_stats_window ({}); 905 #update_stats_window ({});
549 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]);
550 $tgw 913 $sw
551} 914}
552 915
553sub formsep { 916sub formsep($) {
554 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 917 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
555}
556
557sub update_stats_window {
558 my ($stats) = @_;
559
560 # I love text protocols...
561
562 my $hp = $stats->{+CS_STAT_HP} * 1;
563 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
564 my $sp = $stats->{+CS_STAT_SP} * 1;
565 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
566 my $fo = $stats->{+CS_STAT_FOOD} * 1;
567 my $fo_m = 999;
568 my $gr = $stats->{+CS_STAT_GRACE} * 1;
569 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
570
571 $GAUGES->{hp} ->set_value ($hp, $hp_m);
572 $GAUGES->{mana} ->set_value ($sp, $sp_m);
573 $GAUGES->{food} ->set_value ($fo, $fo_m);
574 $GAUGES->{grace} ->set_value ($gr, $gr_m);
575 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
576 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
577 my $rng = $stats->{+CS_STAT_RANGE};
578 $rng =~ s/^Range: //; # thank you so much dear server
579 $GAUGES->{range} ->set_text ("Rng: " . $rng);
580 my $title = $stats->{+CS_STAT_TITLE};
581 $title =~ s/^Player: //;
582 $STATWIDS->{title} ->set_text ("Title: " . $title);
583
584 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
585 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
586 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
587 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
588 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
589 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
590 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
591 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
592 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
593 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
594 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
595 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
596 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
597
598 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
599
600 # TODO: replace by CS_STAT_RES_xxx constants
601 my %tbl = (
602 phys => 100,
603 magic => 101,
604 fire => 102,
605 elec => 103,
606 cold => 104,
607 conf => 105,
608 acid => 106,
609 drain => 107,
610 ghit => 108,
611 pois => 109,
612 slow => 110,
613 para => 111,
614 tund => 112,
615 fear => 113,
616 depl => 113,
617 deat => 115,
618 holyw => 116,
619 blind => 117,
620 );
621
622 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
623 for keys %tbl;
624}
625
626sub metaserver_dialog {
627 my $dialog = new CFClient::UI::FancyFrame
628 title => "Server List",
629 child => (my $vbox = new CFClient::UI::VBox);
630
631 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
632
633 $dialog
634} 918}
635 919
636my $METASERVER_ATIME; 920my $METASERVER_ATIME;
637 921
638sub update_metaserver { 922sub update_metaserver {
639 my ($HOST) = @_; 923 my ($metaserver_dialog) = @_;
924
925 $METASERVER = $metaserver_dialog
926 if defined $metaserver_dialog;
640 927
641 return if $METASERVER_ATIME > time; 928 return if $METASERVER_ATIME > time;
642 $METASERVER_ATIME = time + 60; 929 $METASERVER_ATIME = time + 60;
643 930
644 my $table = $METASERVER->{table}; 931 my $table = $METASERVER->{table};
645 $table->clear; 932 $table->clear;
646 $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...");
647 934
648 my $buf; 935 my $ok = 0;
649 936
650 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 937 CFPlus::background {
938 my $ua = CFPlus::lwp_useragent;
651 939
652 unless ($fh) { 940 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
653 $label->set_text ("unable to contact metaserver: $!"); 941 } sub {
654 return; 942 my ($msg) = @_;
655 } 943 if ($msg) {
656
657 Event->io (fd => $fh, poll => 'r', cb => sub {
658 my $res = sysread $fh, $buf, 8192, length $buf;
659
660 if (!defined $res) {
661 $_[0]->w->cancel;
662 $label->set_text ("error while retrieving server list: $!");
663 } elsif ($res == 0) {
664 $_[0]->w->cancel;
665 status "server list retrieved";
666
667 utf8::decode $buf if utf8::valid $buf;
668
669 $table->clear; 944 $table->clear;
670 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 );
671 my @col = qw(Use #Users Host Uptime Version Description); 953 my @col = qw(#Users Host Uptime Version Description);
672 $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[$_])
673 for 0 .. $#col; 958 for 0 .. $#col;
674 959
675 my @align = qw(1 0 1 1 -1); 960 my @align = qw(1 0 1 1 -1);
676 961
677 my $y = 0; 962 my $y = 0;
678 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 963 for my $m (@{ $msg->{servers} }) {
679 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)};
680 966
681 for ($desc) { 967 for ($desc) {
682 s/<br>/\n/gi; 968 s/<br>/\n/gi;
683 s/<li>/\n· /gi; 969 s/<li>/\n· /gi;
684 s/<.*?>//sgi; 970 s/<.*?>//sgi;
685 s/&/&amp;/g; 971 s/&amp;/&/g;
686 s/</&lt;/g; 972 s/&lt;/</g;
687 s/>/&gt;/g; 973 s/&gt;/>/g;
688 } 974 }
689 975
690 $uptime = sprintf "%dd %02d:%02d:%02d", 976 $uptime = sprintf "%dd %02d:%02d:%02d",
691 (int $m->[8] / 86400), 977 (int $uptime / 86400),
692 (int $m->[8] / 3600) % 24, 978 (int $uptime / 3600) % 24,
693 (int $m->[8] / 60) % 60, 979 (int $uptime / 60) % 60,
694 $m->[8] % 60; 980 $uptime % 60;
695 981
696 $m = [$users, $host, $uptime, $version, $desc]; 982 $m = [$users, $host, $uptime, $version, $desc];
697 983
698 $y++; 984 $y++;
699 985
700 $table->add (0, $y, new CFClient::UI::VBox children => [ 986 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
701 (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 {
702 $HOST->set_text ($CFG->{host} = $host); 991 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
992 $METASERVER->hide;
993 0
994 },
703 }), 995 ),
704 (new CFClient::UI::Empty expand => 1), 996 (new CFPlus::UI::Empty expand => 1),
705 ]); 997 ]);
706 998
707 $table->add ($_ + 1, $y, new CFClient::UI::Label 999 $table->add_at ($_, $y, new CFPlus::UI::Label
708 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)
709 for 0 .. $#$m; 1009 for 0 .. $#$m;
710 } 1010 }
1011 } else {
1012 $ok or $label->set_text ("error while contacting metaserver");
711 } 1013 }
712 }); 1014 };
713}
714 1015
715sub server_setup { 1016}
716 my $dialog = new CFClient::UI::FancyFrame 1017
717 x => $WIDTH * (1/3), 1018sub metaserver_dialog {
718 y => $HEIGHT * (1/8), 1019 my $vbox = new CFPlus::UI::VBox;
719 name => "server_setup", 1020 my $table = new CFPlus::UI::Table;
720 title => "Server Setup", 1021 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
721 child => (my $vbox = new CFClient::UI::VBox), 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,
722 on_visibility_change => sub { 1034 on_visibility_change => sub {
723 my ($self, $visible) = @_; 1035 update_metaserver ($_[0]) if $_[1];
724 $self->center if $visible; 1036 0
725 }, 1037 },
726 ; 1038 ;
727 1039
1040 $dialog
1041}
1042
1043sub server_setup {
1044 my $vbox = new CFPlus::UI::VBox;
1045
1046 $vbox->add (new CFPlus::UI::FancyFrame
1047 label => "Connection Settings",
728 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 1048 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1049 );
729 $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");
730 1051
731 { 1052 {
732 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1053 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
733 1054
734 $vbox->add ( 1055 $vbox->add (
735 my $HOST = new CFClient::UI::Entry 1056 $HOST_ENTRY = new CFPlus::UI::Entry
736 expand => 1, 1057 expand => 1,
737 text => $CFG->{host}, 1058 text => $CFG->{profile}{default}{host},
738 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",
739 on_changed => sub { 1060 on_changed => sub {
740 my ($self, $value) = @_; 1061 my ($self, $value) = @_;
741 $CFG->{host} = $value; 1062 $CFG->{profile}{default}{host} = $value;
1063 0
742 } 1064 }
743 ); 1065 );
744 1066
745 $METASERVER = metaserver_dialog;
746
747 $vbox->add (new CFClient::UI::Flopper 1067 $vbox->add (new CFPlus::UI::Button
748 expand => 1, 1068 expand => 1,
749 text => "Server List", 1069 text => "Server List",
750 other => $METASERVER, 1070 other => $METASERVER,
751 tooltip => "Show a list of available crossfire servers", 1071 tooltip => "Show a list of available crossfire servers",
752 on_open => sub { 1072 on_activate => sub { $METASERVER->toggle_visibility; 0 },
753 update_metaserver $HOST; 1073 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
754 }
755 ); 1074 );
756 } 1075 }
757 1076
758 $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");
759 $table->add (1, 4, new CFClient::UI::Entry 1078 $table->add_at (1, 4, new CFPlus::UI::Entry
760 text => $CFG->{user}, 1079 text => $CFG->{profile}{default}{user},
761 tooltip => "The name of your character on the server", 1080 tooltip => "The name of your character on the server",
762 on_changed => sub { 1081 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
763 my ($self, $value) = @_;
764 $CFG->{user} = $value;
765 }
766 ); 1082 );
767 1083
768 $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");
769 $table->add (1, 5, new CFClient::UI::Entry 1085 $table->add_at (1, 5, new CFPlus::UI::Entry
770 text => $CFG->{password}, 1086 text => $CFG->{profile}{default}{password},
771 hidden => 1, 1087 hidden => 1,
772 tooltip => "The password for your character", 1088 tooltip => "The password for your character",
773 on_changed => sub { 1089 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
774 my ($self, $value) = @_;
775 $CFG->{password} = $value;
776 }
777 ); 1090 );
778 1091
779 $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");
780 $table->add (1, 7, new CFClient::UI::Slider 1093 $table->add_at (1, 7, new CFPlus::UI::Slider
781 req_w => 100, 1094 force_w => 100,
782 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1095 range => [$CFG->{mapsize}, 10, 100, 0, 1],
783 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. "
784 . "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, "
785 . "but you also increase bandwidth requirements and latency. " 1098 . "but you also increase bandwidth requirements and latency. "
786 . "This option is only used once at log-in.", 1099 . "This option is only used once at log-in.",
787 on_changed => sub { 1100 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
788 my ($self, $value) = @_;
789
790 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
791 },
792 ); 1101 );
793 1102
794 $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");
795 $table->add (1, 8, new CFClient::UI::CheckBox 1104 $table->add_at (1, 8, new CFPlus::UI::CheckBox
796 state => $CFG->{face_prefetch}, 1105 state => $CFG->{face_prefetch},
797 tooltip => "<b>Background Image Prefetch</b>\n\n" 1106 tooltip => "<b>Background Image Prefetch</b>\n\n"
798 . "If enabled, the client automatically pre-fetches images from the server. " 1107 . "If enabled, the client automatically pre-fetches images from the server. "
799 . "This might increase or create lag, but increases the chances " 1108 . "This might increase or create lag, but increases the chances "
800 . "of faces being ready for display when you encounter them. " 1109 . "of faces being ready for display when you encounter them. "
801 . "It also uses up server bandwidth on every connect, " 1110 . "It also uses up server bandwidth on every connect, "
802 . "so only set it if you really need to prefetch images. " 1111 . "so only set it if you really need to prefetch images. "
803 . "This option can be set and unset any time.", 1112 . "This option can be set and unset any time.",
804 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1113 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
805 ); 1114 );
806 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
807 $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");
808 $table->add (1, 9, new CFClient::UI::Entry 1126 $table->add_at (1, 10, new CFPlus::UI::Entry
809 text => $CFG->{output_count}, 1127 text => $CFG->{output_count},
810 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.",
811 on_changed => sub { $CFG->{output_count} = $_[1] }, 1129 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
812 ); 1130 );
813 1131
814 $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");
815 $table->add (1, 10, new CFClient::UI::Entry 1133 $table->add_at (1, 11, new CFPlus::UI::Entry
816 text => $CFG->{output_sync}, 1134 text => $CFG->{output_sync},
817 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.",
818 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1136 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
819 ); 1137 );
820 1138
821 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1139 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
822 expand => 1, 1140 expand => 1,
823 align => 0, 1141 align => 0,
824 text => "Login", 1142 text => "Login",
825 on_activate => sub { 1143 on_activate => sub {
826 $CONN ? stop_game 1144 $CONN ? stop_game
827 : start_game; 1145 : start_game;
1146 0
828 }, 1147 },
829 ); 1148 );
830 1149
831 $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
832} 1201}
833 1202
834sub message_window { 1203sub message_window {
835 my $window = new CFClient::UI::FancyFrame 1204 my $window = new CFPlus::UI::Toplevel
836 name => "message_window", 1205 name => "message_window",
837 title => "Messages", 1206 title => "Messages",
838 border_bg => [1, 1, 1, 1], 1207 border_bg => [1, 1, 1, 1],
839 bg => [0, 0, 0, 0.75], 1208 x => "max",
840 req_x => -1,
841 req_y => 0, 1209 y => 0,
842 def_w => int $::WIDTH / 3, 1210 force_w => $::WIDTH * 0.4,
843 def_h => int $::HEIGHT / 5, 1211 force_h => $::HEIGHT * 0.5,
844 child => (my $vbox = new CFClient::UI::VBox); 1212 child => (my $vbox = new CFPlus::UI::VBox),
1213 has_close_button => 1;
845 1214
846 $vbox->add ($LOGVIEW); 1215 $vbox->add ($LOGVIEW);
847 1216
848 $vbox->add (my $input = new CFClient::UI::Entry 1217 $vbox->add (my $input = new CFPlus::UI::Entry
849 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> "
850 . "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>...). "
851 . "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). "
852 . "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.",
853 on_focus_in => sub { 1222 on_focus_in => sub {
… …
857 1226
858 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1227 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
859 $input->{refocus_map} = 1; 1228 $input->{refocus_map} = 1;
860 } 1229 }
861 delete $input->{auto_activated}; 1230 delete $input->{auto_activated};
1231
1232 0
862 }, 1233 },
863 on_activate => sub { 1234 on_activate => sub {
864 my ($input, $text) = @_; 1235 my ($input, $text) = @_;
865 $input->set_text (''); 1236 $input->set_text ('');
866 1237
… …
872 } 1243 }
873 if ($input->{refocus_map}) { 1244 if ($input->{refocus_map}) {
874 delete $input->{refocus_map}; 1245 delete $input->{refocus_map};
875 $MAPWIDGET->focus_in 1246 $MAPWIDGET->focus_in
876 } 1247 }
1248
1249 0
877 }, 1250 },
878 on_escape => sub { 1251 on_escape => sub {
879 $MAPWIDGET->focus_in 1252 $MAPWIDGET->grab_focus;
1253
1254 0
880 }, 1255 },
881 ); 1256 );
882 1257
883 $CONSOLE = { 1258 $CONSOLE = {
884 window => $window, 1259 window => $window,
885 input => $input 1260 input => $input,
886 }; 1261 };
887 1262
888 $window 1263 $window
1264}
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;
889} 1613}
890 1614
891sub open_quit_dialog { 1615sub open_quit_dialog {
892 unless ($QUIT_DIALOG) { 1616 unless ($QUIT_DIALOG) {
893 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 1617 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1618 x => "center",
1619 y => "center",
1620 z => 50,
1621 title => "Really Quit?",
1622 on_key_down => sub {
1623 my ($dialog, $ev) = @_;
1624 $ev->{sym} == 27 and $dialog->hide;
1625 }
1626 ;
894 1627
895 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1628 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
896 1629
897 $vb->add (new CFClient::UI::Label 1630 $vb->add (new CFPlus::UI::Label
898 text => "You should find a savebed and apply it first!", 1631 text => "You should find a savebed and apply it first!",
899 max_w => $WIDTH * 0.25, 1632 max_w => $WIDTH * 0.25,
900 ellipsize => 0, 1633 ellipsize => 0,
901 ); 1634 );
902 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1635 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
903 $hb->add (new CFClient::UI::Button 1636 $hb->add (new CFPlus::UI::Button
904 text => "Ok", 1637 text => "Ok",
905 expand => 1, 1638 expand => 1,
906 on_activate => sub { $QUIT_DIALOG->hide }, 1639 on_activate => sub { $QUIT_DIALOG->hide; 0 },
907 ); 1640 );
908 $hb->add (new CFClient::UI::Button 1641 $hb->add (new CFPlus::UI::Button
909 text => "Quit anyway", 1642 text => "Quit anyway",
910 expand => 1, 1643 expand => 1,
911 on_activate => sub { exit }, 1644 on_activate => sub { exit },
912 ); 1645 );
913 } 1646 }
914 1647
915 $QUIT_DIALOG->show; 1648 $QUIT_DIALOG->show;
916 $QUIT_DIALOG->center; 1649 $QUIT_DIALOG->grab_focus;
917} 1650}
918 1651
919sub make_inventory_window { 1652sub show_tip_of_the_day {
920 my $invwin = new CFClient::UI::FancyFrame 1653 # find all tips
921 def_w => $WIDTH * 7/8, 1654 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
922 def_h => $HEIGHT * 7/8, 1655
923 title => "Inventory", 1656 CFPlus::DB::get state => "tip_of_the_day", sub {
924 name => "inventory_window", 1657 my ($todindex) = @_;
925 on_visibility_change => sub { 1658 $todindex = 0 if $todindex >= @tod;
926 my ($self, $visible) = @_; 1659 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
927 $self->center if $visible; 1660
1661 # create dialog
1662 my $dialog;
1663
1664 my $close = sub {
1665 $dialog->destroy;
928 }, 1666 };
929 ;
930 1667
931 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1668 $dialog = new CFPlus::UI::Toplevel
1669 x => "center",
1670 y => "center",
1671 z => 3,
1672 name => 'tip_of_the_day',
1673 force_w => int $WIDTH * 4/9,
1674 force_h => int $WIDTH * 2/9,
1675 title => "Tip of the day #" . (1 + $todindex),
1676 child => my $vbox = new CFPlus::UI::VBox,
1677 has_close_button => 1,
1678 on_delete => $close,
1679 ;
932 1680
933 $hb->add (my $vb1 = new CFClient::UI::VBox); 1681 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
934 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1682 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
935 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1683 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
936 1684
937 $hb->add (my $vb2 = new CFClient::UI::VBox); 1685 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
938 1686
939 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1687 $table->add_at (0, 0, new CFPlus::UI::Button
940 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");
941 $hb2->add (new CFClient::UI::Button
942 text => "Close", 1688 text => "Close",
943 tooltip => "Close the currently open container (if one is open)", 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>.",
944 on_activate => sub { 1690 on_activate => $close,
945 $CONN->send ("apply $CONN->{open_container}")
946 if $CONN->{open_container} != 0;
947 },
948 ); 1691 );
949 1692
950 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1693 $table->add_at (2, 0, new CFPlus::UI::Button
951 1694 text => "Next",
952 $invwin 1695 tooltip => "Show the next <b>Tip of the day</b>.",
953}
954
955sub make_help_window {
956 my $win = new CFClient::UI::FancyFrame
957 def_w => int $WIDTH * 7/8,
958 def_h => int $HEIGHT * 7/8,
959 title => "Documentation";
960
961 $win->add (my $vbox = new CFClient::UI::VBox);
962
963 $vbox->add (my $buttons = new CFClient::UI::HBox);
964 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
965
966 for (
967 [intro => "Introduction"],
968 [manual => "Manual"],
969 [command_help => "Commands"],
970 [skill_help => "Skills"],
971 ) {
972 my ($pod, $label) = @$_;
973
974 $buttons->add (new CFClient::UI::Button
975 text => $label,
976 on_activate => sub { 1696 on_activate => sub {
977 my $parser = new Pod::POM; 1697 $close->();
978 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1698 &show_tip_of_the_day;
979
980 $viewer->clear;
981
982 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
983 for @{ CFClient::pod_to_pango_list $pom };
984
985 $viewer->set_offset (0);
986 }, 1699 },
987 ); 1700 );
1701
1702 $dialog->show;
988 } 1703 };
989
990 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
991
992 $win
993} 1704}
994 1705
995sub sdl_init { 1706sub sdl_init {
996 CFClient::SDL_Init 1707 CFPlus::SDL_Init
997 and die "SDL::Init failed!\n"; 1708 and die "SDL::Init failed!\n";
998} 1709}
999 1710
1000sub video_init { 1711sub video_init {
1001 sdl_init;
1002
1003 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1712 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1004 1713
1005 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1714 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1006 1715
1007 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1716 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1008 $FULLSCREEN = $CFG->{fullscreen}; 1717 $FULLSCREEN = $CFG->{fullscreen};
1009 $FAST = $CFG->{fast}; 1718 $FAST = $CFG->{fast};
1010 1719
1011 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1720 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1012 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1721 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1013 1722
1014 $SDL_ACTIVE = 1; 1723 $SDL_ACTIVE = 1;
1015 $LAST_REFRESH = time - 0.01; 1724 $LAST_REFRESH = time - 0.01;
1016 1725
1017 CFClient::OpenGL::init; 1726 CFPlus::OpenGL::init;
1018 1727
1019 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1728 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1020 1729
1021 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1730 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1022 1731
1023 ############################################################################# 1732 #############################################################################
1024 1733
1025 if ($DEBUG_STATUS) { 1734 if ($DEBUG_STATUS) {
1026 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1735 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1027 } else { 1736 } else {
1028 # create the widgets 1737 # create the widgets
1029 1738
1030 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1739 $DEBUG_STATUS = new CFPlus::UI::Label
1740 padding => 0,
1741 z => 100,
1742 force_x => "max",
1743 force_y => 0;
1031 $DEBUG_STATUS->show; 1744 $DEBUG_STATUS->show;
1032 1745
1033 $STATUSBOX = new CFClient::UI::Statusbox; 1746 $STATUSBOX = new CFPlus::UI::Statusbox;
1034 $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]);
1035 1748
1036 (new CFClient::UI::Frame 1749 (new CFPlus::UI::Frame
1037 bg => [0, 0, 0, 0.4], 1750 bg => [0, 0, 0, 0.4],
1038 req_y => -1, 1751 force_x => 0,
1752 force_y => "max",
1039 child => $STATUSBOX, 1753 child => $STATUSBOX,
1040 )->show; 1754 )->show;
1041 1755
1042 CFClient::UI::FancyFrame->new ( 1756 CFPlus::UI::Toplevel->new (
1757 title => "Map",
1758 name => "mapmap",
1759 x => 0,
1760 y => $FONTSIZE + 8,
1043 border_bg => [1, 1, 1, 192/255], 1761 border_bg => [1, 1, 1, 192/255],
1044 bg => [1, 1, 1, 0], 1762 bg => [1, 1, 1, 0],
1045 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1763 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1046 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.",
1047 ), 1765 ),
1048 )->show; 1766 )->show;
1049 1767
1050 $MAPWIDGET = new CFClient::MapWidget; 1768 $MAPWIDGET = new CFPlus::MapWidget;
1051 $MAPWIDGET->connect (activate_console => sub { 1769 $MAPWIDGET->connect (activate_console => sub {
1052 my ($mapwidget, $preset) = @_; 1770 my ($mapwidget, $preset) = @_;
1053 1771
1054 if ($CONSOLE) { 1772 if ($CONSOLE) {
1055 $CONSOLE->{input}->{auto_activated} = 1; 1773 $CONSOLE->{input}->{auto_activated} = 1;
1056 $CONSOLE->{input}->focus_in; 1774 $CONSOLE->{input}->grab_focus;
1057 1775
1058 if ($preset && $CONSOLE->{input}->get_text eq '') { 1776 if ($preset && $CONSOLE->{input}->get_text eq '') {
1059 $CONSOLE->{input}->set_text ($preset); 1777 $CONSOLE->{input}->set_text ($preset);
1060 } 1778 }
1061 } 1779 }
1062 }); 1780 });
1063 $MAPWIDGET->show; 1781 $MAPWIDGET->show;
1064 $MAPWIDGET->focus_in; 1782 $MAPWIDGET->grab_focus;
1065 1783
1066 $LOGVIEW = new CFClient::UI::TextView 1784 $LOGVIEW = new CFPlus::UI::TextScroller
1067 expand => 1, 1785 expand => 1,
1068 font => $FONT_FIXED, 1786 font => $FONT_FIXED,
1069 fontsize => $::CFG->{log_fontsize}, 1787 fontsize => $::CFG->{log_fontsize},
1788 indent => -4,
1070 can_hover => 1, 1789 can_hover => 1,
1071 can_events => 1, 1790 can_events => 1,
1791 max_par => $CFG->{logview_max_par},
1072 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.",
1073 ; 1793 ;
1074 1794
1075 $BUTTONBAR = new CFClient::UI::HBox; 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 ;
1076 1805
1077 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1806 $METASERVER = metaserver_dialog;
1078 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1807
1079 $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,
1080 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
1081 $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,
1082 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.");
1083 1836
1084 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
1085 1838
1086 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1087 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1088 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1839 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1089 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.");
1090 1841
1091 $BUTTONBAR->add (new CFClient::UI::Button 1842 $BUTTONBAR->add (new CFPlus::UI::Button
1092 text => "Save Config", 1843 text => "Save Config",
1093 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.",
1094 on_activate => sub { 1845 on_activate => sub {
1095 $::CFG->{layout} = CFClient::UI::get_layout; 1846 $::CFG->{layout} = CFPlus::UI::get_layout;
1096 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1847 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1097 status "Configuration Saved"; 1848 status "Configuration Saved";
1849 0
1098 }, 1850 },
1099 ); 1851 );
1100 1852
1101 $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,
1102 tooltip => "View Documentation"); 1854 tooltip => "View Documentation");
1103 1855
1856
1104 $BUTTONBAR->add (new CFClient::UI::Button 1857 $BUTTONBAR->add (new CFPlus::UI::Button
1105 text => "Quit", 1858 text => "Quit",
1106 tooltip => "Terminates the program", 1859 tooltip => "Terminates the program",
1107 on_activate => sub { 1860 on_activate => sub {
1108 if ($CONN) { 1861 if ($CONN) {
1109 open_quit_dialog; 1862 open_quit_dialog;
1110 } else { 1863 } else {
1111 exit; 1864 exit;
1112 } 1865 }
1866 0
1113 }, 1867 },
1114 ); 1868 );
1115 1869
1116 $BUTTONBAR->show; 1870 $BUTTONBAR->show;
1117 1871 $SETUP_DIALOG->show;
1118 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1119
1120 # delay till geometry is constant
1121 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1122 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1123 my $widget = $GAUGES->{win};
1124 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1125 });
1126 force_refresh ();
1127 } 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;
1128} 1994}
1129 1995
1130sub video_shutdown { 1996sub video_shutdown {
1997 CFPlus::OpenGL::shutdown;
1998
1131 undef $SDL_ACTIVE; 1999 undef $SDL_ACTIVE;
1132} 2000}
1133
1134my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1135my $bgmusic;#TODO#hack#d#
1136 2001
1137sub audio_channel_finished { 2002sub audio_channel_finished {
1138 my ($channel) = @_; 2003 my ($channel) = @_;
1139 2004
1140 #warn "channel $channel finished\n";#d# 2005 #warn "channel $channel finished\n";#d#
1141} 2006}
1142 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
1143sub audio_music_finished { 2080sub audio_music_finished {
1144 return unless $CFG->{bgm_enable}; 2081 $MUSIC_PLAYING = undef;
2082 undef $MUSIC_PLAYER;
1145 2083
1146 # TODO: hack, do play loop and mood music 2084 audio_music_changed;
1147 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
1148 $bgmusic->play (0);
1149
1150 push @bgmusic, shift @bgmusic;
1151} 2085}
1152 2086
1153sub audio_init { 2087sub audio_init {
1154 if ($CFG->{audio_enable}) { 2088 if ($CFG->{audio_enable}) {
1155 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 2089 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1156 $SDL_MIXER = !CFClient::Mix_OpenAudio; 2090 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1157 2091
1158 unless ($SDL_MIXER) { 2092 unless ($SDL_MIXER) {
1159 status "Unable to open sound device: there will be no sound"; 2093 status "Unable to open sound device: there will be no sound";
1160 return; 2094 return;
1161 } 2095 }
1162 2096
1163 CFClient::Mix_AllocateChannels 8; 2097 CFPlus::Mix_AllocateChannels 8;
1164 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 2098 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1165 2099
1166 audio_music_finished; 2100 audio_music_finished;
1167 2101
2102 local $_;
1168 while (<$fh>) { 2103 while (<$fh>) {
1169 next if /^\s*#/; 2104 next if /^\s*#/;
1170 next if /^\s*$/; 2105 next if /^\s*$/;
1171 2106
1172 my ($file, $volume, $event) = split /\s+/, $_, 3; 2107 my ($file, $volume, $event) = split /\s+/, $_, 3;
1173 2108
1174 push @SOUNDS, "$volume,$file"; 2109 push @SOUNDS, "$volume,$file";
1175 2110
1176 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 2111 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1177 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";
1178 $chunk->volume ($volume * 128 / 100); 2113 $chunk->volume ($volume * 128 / 100);
1179 $chunk 2114 $chunk
1180 }; 2115 };
1181 } 2116 }
1182 } else { 2117 } else {
… …
1184 } 2119 }
1185 } 2120 }
1186} 2121}
1187 2122
1188sub audio_shutdown { 2123sub audio_shutdown {
1189 CFClient::Mix_CloseAudio if $SDL_MIXER; 2124 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1190 undef $SDL_MIXER; 2125 undef $SDL_MIXER;
1191 @SOUNDS = (); 2126 @SOUNDS = ();
1192 %AUDIO_CHUNKS = (); 2127 %AUDIO_CHUNKS = ();
1193} 2128}
1194 2129
… …
1199 2134
1200my %demo;#d# 2135my %demo;#d#
1201 2136
1202sub force_refresh { 2137sub force_refresh {
1203 $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;
1204 debug sprintf "%3.2f", $fps; 2139 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1205 2140
1206 $CFClient::UI::ROOT->draw; 2141 $CFPlus::UI::ROOT->draw;
1207 2142
1208 $WANT_REFRESH = 0; 2143 $WANT_REFRESH = 0;
1209 $CAN_REFRESH = 0; 2144 $CAN_REFRESH = 0;
1210 $LAST_REFRESH = $NOW; 2145 $LAST_REFRESH = $NOW;
1211 2146
12120 && do {
1213 # some weird model-drawing code, just a joke right now
1214 use CFClient::OpenGL;
1215
1216 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1217 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1218 $demo{r} ||= do {
1219 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1220 $mod->{v} = pack "f*", @{$mod->{v}};
1221 $_ = [scalar @$_, pack "S!*", @$_]
1222 for values %{$mod->{g}};
1223 $mod
1224 };
1225
1226 my $r = $demo{r} or die;
1227
1228 glDepthMask 1;
1229 glClear GL_DEPTH_BUFFER_BIT;
1230 glEnable GL_TEXTURE_2D;
1231 glEnable GL_DEPTH_TEST;
1232 glEnable GL_CULL_FACE;
1233 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1234
1235 glMatrixMode GL_PROJECTION;
1236 glLoadIdentity;
1237 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1238 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1239 glMatrixMode GL_MODELVIEW;
1240 glLoadIdentity;
1241
1242 glPushMatrix;
1243 glTranslate 0, 0, -800;
1244 glScale 1, -1, 1;
1245 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1246 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1247 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1248 glScale 50, 50, 50;
1249
1250 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1251 while (my ($k, $v) = each %{$r->{g}}) {
1252 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1253 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1254 }
1255
1256 glPopMatrix;
1257
1258 glShadeModel GL_FLAT;
1259 glDisable GL_DEPTH_TEST;
1260 glDisable GL_TEXTURE_2D;
1261 glDepthMask 0;
1262
1263 $WANT_REFRESH++;
1264};
1265
1266 CFClient::SDL_GL_SwapBuffers; 2147 CFPlus::SDL_GL_SwapBuffers;
1267} 2148}
1268 2149
1269my $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 {
1270 $NOW = time; 2151 $NOW = time;
1271 2152
1272 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2153 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1273 for CFClient::SDL_PollEvent; 2154 for CFPlus::poll_events;
1274 2155
1275 if (%animate_object) { 2156 if (%animate_object) {
1276 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2157 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1277 $WANT_REFRESH++; 2158 ++$WANT_REFRESH;
1278 } 2159 }
1279 2160
1280 if ($WANT_REFRESH) { 2161 if ($WANT_REFRESH) {
1281 force_refresh; 2162 force_refresh;
1282 } else { 2163 } else {
… …
1302 $CONN->face_prefetch 2183 $CONN->face_prefetch
1303 if $CONN; 2184 if $CONN;
1304}); 2185});
1305 2186
1306%SDL_CB = ( 2187%SDL_CB = (
1307 CFClient::SDL_QUIT => sub { 2188 CFPlus::SDL_QUIT => sub {
1308 Event::unloop -1; 2189 exit;
1309 }, 2190 },
1310 CFClient::SDL_VIDEORESIZE => sub { 2191 CFPlus::SDL_VIDEORESIZE => sub {
1311 }, 2192 },
1312 CFClient::SDL_VIDEOEXPOSE => sub { 2193 CFPlus::SDL_VIDEOEXPOSE => sub {
1313 CFClient::UI::full_refresh; 2194 CFPlus::UI::full_refresh;
1314 }, 2195 },
1315 CFClient::SDL_ACTIVEEVENT => sub { 2196 CFPlus::SDL_ACTIVEEVENT => sub {
1316# 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;
1317 }, 2203 },
1318 CFClient::SDL_KEYDOWN => sub { 2204 CFPlus::SDL_KEYDOWN => sub {
1319 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2205 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1320 # alt-enter 2206 # alt-enter
2207 $FULLSCREEN_ENABLE->toggle;
1321 video_shutdown; 2208 video_shutdown;
1322 $CFG->{fullscreen} = !$CFG->{fullscreen};
1323 video_init; 2209 video_init;
1324 } else { 2210 } else {
1325 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2211 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1326 } 2212 }
1327 }, 2213 },
1328 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2214 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1329 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2215 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1330 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2216 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1331 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2217 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1332 CFClient::SDL_USEREVENT => sub { 2218 CFPlus::SDL_USEREVENT => sub {
1333 if ($_[0]{code} == 1) { 2219 if ($_[0]{code} == 1) {
1334 audio_channel_finished $_[0]{data1}; 2220 audio_channel_finished $_[0]{data1};
1335 } elsif ($_[0]{code} == 0) { 2221 } elsif ($_[0]{code} == 0) {
1336 audio_music_finished; 2222 audio_music_finished;
1337 } 2223 }
… …
1341############################################################################# 2227#############################################################################
1342 2228
1343$SIG{INT} = $SIG{TERM} = sub { exit }; 2229$SIG{INT} = $SIG{TERM} = sub { exit };
1344 2230
1345{ 2231{
1346 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1347
1348 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 2232 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2233 CFPlus::DB::Server::run;
2234
1349 CFClient::UI::set_layout ($::CFG->{layout}); 2235 CFPlus::UI::set_layout ($::CFG->{layout});
1350 2236
1351 my %DEF_CFG = ( 2237 my %DEF_CFG = (
1352 sdl_mode => 0, 2238 sdl_mode => 0,
1353 width => 640, 2239 width => 640,
1354 height => 480, 2240 height => 480,
1355 fullscreen => 0, 2241 fullscreen => 0,
1356 fast => 0, 2242 fast => 0,
1357 map_scale => 1, 2243 map_scale => 1,
1358 fow_enable => 1, 2244 fow_enable => 1,
1359 fow_intensity => 0.45, 2245 fow_intensity => 0,
1360 fow_smooth => 0, 2246 map_smoothing => 1,
1361 gui_fontsize => 1, 2247 gui_fontsize => 1,
1362 log_fontsize => 1, 2248 log_fontsize => 0.7,
1363 gauge_fontsize=> 1, 2249 gauge_fontsize => 1,
1364 gauge_size => 0.35, 2250 gauge_size => 0.35,
1365 stat_fontsize => 1, 2251 stat_fontsize => 0.7,
1366 mapsize => 100, 2252 mapsize => 100,
1367 host => "crossfire.schmorp.de",
1368 say_command => 'say', 2253 say_command => 'chat',
1369 audio_enable => 1, 2254 audio_enable => 1,
1370 bgm_enable => 1, 2255 bgm_enable => 1,
1371 bgm_volume => 0.25, 2256 bgm_volume => 0.25,
1372 face_prefetch => 0, 2257 face_prefetch => 0,
1373 output_sync => 1, 2258 output_sync => 1,
1374 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 );
1375 ); 2267
1376
1377 while (my ($k, $v) = each %DEF_CFG) { 2268 while (my ($k, $v) = each %DEF_CFG) {
1378 $CFG->{$k} = $v unless exists $CFG->{$k}; 2269 $CFG->{$k} = $v unless exists $CFG->{$k};
1379 } 2270 }
1380 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
1381 sdl_init; 2287 sdl_init;
1382 2288
1383 @SDL_MODES = reverse 2289 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1384 grep $_->[0] >= 640 && $_->[1] >= 480, 2290 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1385 CFClient::SDL_ListModes;
1386
1387 @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;
1388 2294
1389 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2295 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1390 2296
1391 { 2297 {
1392 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2298 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1393 DejaVuSans.ttf 2299 DejaVuSans.ttf
1394 DejaVuSansMono.ttf 2300 DejaVuSansMono.ttf
1395 DejaVuSans-Bold.ttf 2301 DejaVuSans-Bold.ttf
1396 DejaVuSansMono-Bold.ttf 2302 DejaVuSansMono-Bold.ttf
1397 DejaVuSans-Oblique.ttf 2303 DejaVuSans-Oblique.ttf
1398 DejaVuSansMono-Oblique.ttf 2304 DejaVuSansMono-Oblique.ttf
1399 DejaVuSans-BoldOblique.ttf 2305 DejaVuSans-BoldOblique.ttf
1400 DejaVuSansMono-BoldOblique.ttf 2306 DejaVuSansMono-BoldOblique.ttf
1401 ); 2307 );
1402 2308
1403 CFClient::add_font $_ for @fonts; 2309 CFPlus::add_font $_ for @fonts;
1404 2310
1405 CFClient::pango_init; 2311 CFPlus::pango_init;
1406 2312
1407 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2313 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1408 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2314 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1409 2315
1410 $FONT_PROP->make_default; 2316 $FONT_PROP->make_default;
1411 } 2317 }
1412 2318
1413# compare mono (ft) vs. rgba (cairo) 2319# compare mono (ft) vs. rgba (cairo)
1414# ft - 1.8s, cairo 3s, even in alpha-only mode 2320# ft - 1.8s, cairo 3s, even in alpha-only mode
1415# for my $rgba (0..1) { 2321# for my $rgba (0..1) {
1416# my $t1 = Time::HiRes::time; 2322# my $t1 = Time::HiRes::time;
1417# for (1..1000) { 2323# for (1..1000) {
1418# my $layout = CFClient::Layout->new ($rgba); 2324# my $layout = CFPlus::Layout->new ($rgba);
1419# $layout->set_text ("hallo" x 100); 2325# $layout->set_text ("hallo" x 100);
1420# $layout->render; 2326# $layout->render;
1421# } 2327# }
1422# my $t2 = Time::HiRes::time; 2328# my $t2 = Time::HiRes::time;
1423# warn $t2-$t1; 2329# warn $t2-$t1;
1424# } 2330# }
1425 2331
2332 $startup_done->();
2333
1426 video_init; 2334 video_init;
1427 audio_init; 2335 audio_init;
1428} 2336}
1429 2337
2338show_tip_of_the_day if $CFG->{show_tips};
2339
1430Event::loop; 2340Event::loop;
2341#CFPlus::SDL_Quit;
2342#CFPlus::_exit 0;
1431 2343
1432END { CFClient::SDL_Quit } 2344END {
2345 CFPlus::SDL_Quit;
2346 CFPlus::DB::Server::stop;
2347}
1433 2348
1434=head1 NAME 2349=head1 NAME
1435 2350
1436pclient - A Crossfire+ and Crossfire game client 2351cfplus - A Crossfire+ and Crossfire game client
1437 2352
1438=head1 SYNOPSIS 2353=head1 SYNOPSIS
1439 2354
1440Just run it - no commandline arguments are supported. 2355Just run it - no commandline arguments are supported.
1441 2356
1442=head1 USAGE 2357=head1 USAGE
1443 2358
1444Pclient 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
1445fullscreen and interactively. 2360fullscreen and interactively.
1446 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
1447=head1 AUTHOR 2372=head1 AUTHOR
1448 2373
1449Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2374Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1450 2375
1451 2376

Diff Legend

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