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.34 by elmex, Tue May 30 14:35:09 2006 UTC vs.
Revision 1.192 by root, Mon Jul 30 02:16:16 2007 UTC

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

Diff Legend

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