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.22 by root, Sun May 28 01:37:45 2006 UTC vs.
Revision 1.185 by elmex, Tue Jul 24 18:39:39 2007 UTC

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

Diff Legend

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