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

Diff Legend

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