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.42 by root, Fri Jun 2 06:22:55 2006 UTC vs.
Revision 1.193 by root, Tue Jul 31 00:30: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 $HOST_ENTRY; 136our $HOST_ENTRY;
87our $SERVER_SETUP; 137our $FULLSCREEN_ENABLE;
138our $PICKUP_ENABLE;
139our $SERVER_INFO;
88 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;
89our $FLOORBOX; 157our $FLOORBOX;
90our $GAUGES; 158our $GAUGES;
91our $STATWIDS; 159our $STATWIDS;
92 160
93our $SDL_ACTIVE; 161our $SDL_ACTIVE;
94our %SDL_CB; 162our %SDL_CB;
95 163
96our $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
97our @SOUNDS; # event => file mapping 172our @SOUNDS; # event => file mapping
98our %AUDIO_CHUNKS; # audio files 173our %AUDIO_CHUNKS; # audio files
99 174
100our $ALT_ENTER_MESSAGE; 175our $ALT_ENTER_MESSAGE;
101our $STATUSBOX; 176our $STATUSBOX;
102our $DEBUG_STATUS; 177our $DEBUG_STATUS;
103 178
104our $INV_WINDOW;
105our $INV; 179our $INV;
106our $INVR; 180our $INVR;
107our $INV_RIGHT_HB; 181our $INV_RIGHT_HB;
108 182
109our $BIND_WINDOW; 183our $PICKUP_CFG;
110our $BIND_EDITOR;
111
112our $SPELL_LIST;
113 184
114sub status { 185sub status {
115 $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]);
116} 187}
117 188
118sub debug { 189sub debug {
119 $DEBUG_STATUS->set_text ($_[0]); 190 $DEBUG_STATUS->set_text ($_[0]);
120} 191}
121 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
122sub start_game { 434sub start_game {
123 status "logging in..."; 435 status "logging in...";
124 436
125 $LOGIN_BUTTON->set_text ("Logout"); 437 $LOGIN_BUTTON->set_text ("Logout");
126 $SERVER_SETUP->hide; 438 $SETUP_DIALOG->hide;
127 439
128 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;
129 441
130 my ($host, $port) = split /:/, $CFG->{host}; 442 my ($host, $port) = split /:/, $PROFILE->{host};
131 443
132 $MAP = new CFClient::Map $mapsize, $mapsize; 444 $MAP = new CFPlus::Map;
133 445
134 $CONN = eval { 446 $CONN = eval {
135 new CFClient::Protocol 447 new CFPlus::Protocol
136 host => $host, 448 host => $host,
137 port => $port || 13327, 449 port => $port || 13327,
138 user => $CFG->{user}, 450 user => $PROFILE->{user},
139 pass => $CFG->{password}, 451 pass => $PROFILE->{password},
140 mapw => $mapsize, 452 mapw => $mapsize,
141 maph => $mapsize, 453 maph => $mapsize,
142 454
455 client => "cfplus $CFPlus::VERSION $] $^O",
456
143 map_widget => $MAPWIDGET, 457 map_widget => $MAPWIDGET,
144 logview => $LOGVIEW,
145 statusbox => $STATUSBOX, 458 statusbox => $STATUSBOX,
146 map => $MAP, 459 map => $MAP,
147 mapmap => $MAPMAP, 460 mapmap => $MAPMAP,
461 query => \&server_query,
148 462
149 sound_play => sub { 463 setup_req => {
150 my ($x, $y, $soundnum, $type) = @_; 464 smoothing => $CFG->{map_smoothing}*1,
151
152 $SDL_MIXER
153 or return;
154
155 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
156 or return;
157
158 $chunk->play;
159 }, 465 },
160 }; 466 };
161 467
162 if ($CONN) { 468 if ($CONN) {
163 CFClient::lowdelay fileno $CONN->{fh}; 469 CFPlus::lowdelay fileno $CONN->{fh};
164 470
165 status "login successful"; 471 status "login successful";
166 } else { 472 } else {
167 status "unable to connect"; 473 status "unable to connect";
168 stop_game(); 474 stop_game();
169 } 475 }
170} 476}
171 477
172sub stop_game { 478sub stop_game {
173 $LOGIN_BUTTON->set_text ("Login"); 479 $LOGIN_BUTTON->set_text ("Login");
174 $SERVER_SETUP->show; 480 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
481 $SETUP_DIALOG->show;
175 $INV_WINDOW->hide; 482 $PL_WINDOW->hide;
176 $LOGVIEW->hide; 483 $SPELL_LIST->clear_spells;
484 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
485
486 &audio_music_set ([]);
177 487
178 return unless $CONN; 488 return unless $CONN;
179 489
180 status "connection closed"; 490 status "connection closed";
181 491
492 destroy_query_dialog $CONN;
182 $CONN->destroy; 493 $CONN->destroy;
183 $CONN = 0; # false, does not autovivify 494 $CONN = 0; # false, does not autovivify
184}
185 495
186sub client_setup { 496 undef $MAP;
187 my $dialog = new CFClient::UI::FancyFrame 497}
188 x => 1,
189 y => $HEIGHT * (1/8),
190 name => "client_setup",
191 title => "Client Setup",
192 child => (my $vbox = new CFClient::UI::VBox);
193 498
499sub graphics_setup {
500 my $vbox = new CFPlus::UI::VBox;
501
194 $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]);
195 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
196 $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");
197 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 516 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
198 517
518 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
199 $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],
200 $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);
201 524
202 $mode_slider->connect (changed => sub { 525 $mode_slider->connect (changed => sub {
203 my ($self, $value) = @_; 526 my ($self, $value) = @_;
204 527
205 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 528 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
206 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 529 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
207 }); 530 });
208 $mode_slider->emit (changed => $mode_slider->{range}[0]); 531 $mode_slider->emit (changed => $mode_slider->{range}[0]);
209 532
210 my $row = 1;
211
212 $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");
213 $table->add (1, $row++, new CFClient::UI::CheckBox 534 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
214 state => $CFG->{fullscreen}, 535 state => $CFG->{fullscreen},
215 tooltip => "Bring the client into fullscreen mode.", 536 tooltip => "Bring the client into fullscreen mode.",
216 on_changed => sub { 537 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
217 my ($self, $value) = @_;
218 $CFG->{fullscreen} = $value;
219 }
220 ); 538 );
221 539
222 $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");
223 $table->add (1, $row++, new CFClient::UI::CheckBox 541 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
224 state => $CFG->{fast}, 542 state => $CFG->{fast},
225 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.",
226 on_changed => sub { 557 on_activate => sub {
227 my ($self, $value) = @_; 558 video_shutdown ();
228 $CFG->{fast} = $value; 559 video_init ();
560 0
229 } 561 }
230 ); 562 );
231 563
232 $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");
233 $table->add (1, $row++, new CFClient::UI::Slider 565 $table->add_at (1, $row++, new CFPlus::UI::Slider
234 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 566 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
235 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 567 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
236 on_changed => sub { 568 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
237 my ($self, $value) = @_;
238 $CFG->{map_scale} = 2 ** $value;
239 }
240 ); 569 );
241 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
242 $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");
243 $table->add (1, $row++, new CFClient::UI::CheckBox 581 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
244 state => $CFG->{fow_enable}, 582 state => $CFG->{fow_enable},
245 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.",
246 on_changed => sub { 584 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
247 my ($self, $value) = @_;
248 $CFG->{fow_enable} = $value;
249 }
250 ); 585 );
251 586
252 $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");
253 $table->add (1, $row++, new CFClient::UI::Slider 588 $table->add_at (1, $row++, new CFPlus::UI::Slider
254 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 589 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
255 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.",
256 on_changed => sub { 591 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
257 my ($self, $value) = @_;
258 $CFG->{fow_intensity} = $value;
259 }
260 ); 592 );
261 593
262 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
263 $table->add (1, $row++, new CFClient::UI::CheckBox
264 state => $CFG->{fow_smooth},
265 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
266 on_changed => sub {
267 my ($self, $value) = @_;
268 $CFG->{fow_smooth} = $value;
269 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
270 }
271 );
272
273 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
274 $table->add (1, $row++, new CFClient::UI::Slider
275 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
276 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
277 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
278 );
279
280 $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");
281 $table->add (1, $row++, new CFClient::UI::Slider 595 $table->add_at (1, $row++, new CFPlus::UI::Slider
282 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 596 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
283 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.",
284 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 598 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
285 ); 599 );
286 600
287 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
288
289 $table->add (1, $row++, new CFClient::UI::Slider
290 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
291 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
292 on_changed => sub {
293 $CFG->{stat_fontsize} = $_[1];
294 &set_stats_window_fontsize;
295 }
296 );
297
298 $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");
299 $table->add (1, $row++, new CFClient::UI::Slider 602 $table->add_at (1, $row++, new CFPlus::UI::Slider
300 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 603 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
301 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.",
302 on_changed => sub { 605 on_changed => sub {
303 $CFG->{gauge_fontsize} = $_[1]; 606 $CFG->{gauge_fontsize} = $_[1];
304 &set_gauge_window_fontsize; 607 &set_gauge_window_fontsize;
608 0
305 } 609 }
306 ); 610 );
307 611
308 $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");
309 $table->add (1, $row++, new CFClient::UI::Slider 613 $table->add_at (1, $row++, new CFPlus::UI::Slider
310 range => [$CFG->{gauge_size}, 0.2, 0.8], 614 range => [$CFG->{gauge_size}, 0.2, 0.8],
311 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.",
312 on_changed => sub { 616 on_changed => sub {
313 $CFG->{gauge_size} = $_[1]; 617 $CFG->{gauge_size} = $_[1];
314 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 618 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
619 0
315 } 620 }
316 ); 621 );
317 622
318 $table->add (1, $row++, new CFClient::UI::Button 623 $vbox
319 expand => 1, align => 0, text => "Apply", 624}
320 tooltip => "Apply the video settings",
321 on_activate => sub {
322 video_shutdown ();
323 video_init ();
324 }
325 );
326 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
327 $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");
328 $table->add (1, $row++, new CFClient::UI::CheckBox 634 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
329 state => $CFG->{audio_enable}, 635 state => $CFG->{audio_enable},
330 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.",
331 on_changed => sub { 637 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
332 $CFG->{audio_enable} = $_[1];
333 }
334 ); 638 );
335# $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");
336# $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 {
337# $CFG->{effects_volume} = $_[1]; 641# $CFG->{effects_volume} = $_[1];
338# }); 642# });
339 $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");
340 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 644 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
341 $hbox->add (new CFClient::UI::CheckBox 645 $hbox->add (new CFPlus::UI::CheckBox
342 expand => 1, state => $CFG->{bgm_enable}, 646 expand => 1, state => $CFG->{bgm_enable},
343 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.",
344 on_changed => sub { 648 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
345 $CFG->{bgm_enable} = $_[1];
346 }
347 ); 649 );
348 $hbox->add (new CFClient::UI::Slider 650 $hbox->add (new CFPlus::UI::Slider
349 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 651 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
350 tooltip => "The volume of the background music. Changes are instant.", 652 tooltip => "The volume of the background music. Changes are instant.",
351 on_changed => sub { 653 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
352 $CFG->{bgm_volume} = $_[1];
353 CFClient::MixMusic::volume $_[1] * 128;
354 }
355 ); 654 );
356 655
357 $table->add (1, $row++, new CFClient::UI::Button 656 $table->add_at (1, $row++, new CFPlus::UI::Button
358 expand => 1, align => 0, text => "Apply", 657 expand => 1, align => 0, text => "Apply",
359 tooltip => "Apply the audio settings", 658 tooltip => "Apply the audio settings",
360 on_activate => sub { 659 on_activate => sub {
361 audio_shutdown (); 660 audio_shutdown ();
362 audio_init (); 661 audio_init ();
662 0
363 } 663 }
364 ); 664 );
365 665
366 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 666 $vbox
367 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
368 text => $CFG->{say_command},
369 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. "
370 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
371 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
372 on_changed => sub {
373 my ($self, $value) = @_;
374 $CFG->{say_command} = $value;
375 }
376 );
377
378 $dialog
379}
380
381sub set_stats_window_fontsize {
382 for (values %{$STATWIDS}) {
383 $_->set_fontsize ($::CFG->{stat_fontsize});
384 }
385} 667}
386 668
387sub set_gauge_window_fontsize { 669sub set_gauge_window_fontsize {
388 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 670 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
389 $_->set_fontsize ($::CFG->{gauge_fontsize}); 671 $_->set_fontsize ($::CFG->{gauge_fontsize});
391} 673}
392 674
393sub make_gauge_window { 675sub make_gauge_window {
394 my $gh = int $HEIGHT * $CFG->{gauge_size}; 676 my $gh = int $HEIGHT * $CFG->{gauge_size};
395 677
396 my $win = new CFClient::UI::Frame ( 678 my $win = new CFPlus::UI::Frame (
397 force_x => 0, 679 force_x => 0,
398 force_y => "max", 680 force_y => "max",
399 force_w => $WIDTH, 681 force_w => $WIDTH,
400 force_h => $gh, 682 force_h => $gh,
401 ); 683 );
402 684
403 $win->add (my $hbox = new CFClient::UI::HBox 685 $win->add (my $hbox = new CFPlus::UI::HBox
404 children => [ 686 children => [
405 (new CFClient::UI::HBox expand => 1), 687 (new CFPlus::UI::HBox expand => 1),
406 (new CFClient::UI::VBox children => [ 688 (new CFPlus::UI::VBox children => [
407 (new CFClient::UI::Empty expand => 1), 689 (new CFPlus::UI::Empty expand => 1),
408 (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)),
409 ]), 691 ]),
410 (my $vbox = new CFClient::UI::VBox), 692 (my $vbox = new CFPlus::UI::VBox),
411 ], 693 ],
412 ); 694 );
413 695
414 $vbox->add (new CFClient::UI::HBox 696 $vbox->add (new CFPlus::UI::HBox
415 expand => 1, 697 expand => 1,
416 children => [ 698 children => [
417 (new CFClient::UI::Empty expand => 1), 699 (new CFPlus::UI::Empty expand => 1),
418 (my $hb = new CFClient::UI::HBox), 700 (my $hb = new CFPlus::UI::HBox),
419 ], 701 ],
420 ); 702 );
421 703
422 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 704 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
423 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.");
424 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 705 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
425 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.");
426 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 706 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
427 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.");
428 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 707 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
429 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.");
430 708
431 $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");
432 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.");
433 $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");
434 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
435 711
436 $GAUGES = { 712 $GAUGES = {
437 exp => $exp, win => $win, range => $rng, 713 exp => $exp, win => $win, range => $rng,
438 food => $fg, mana => $mg, hp => $hg, grace => $gg 714 food => $fg, mana => $mg, hp => $hg, grace => $gg
439 }; 715 };
441 &set_gauge_window_fontsize; 717 &set_gauge_window_fontsize;
442 718
443 $win 719 $win
444} 720}
445 721
722sub debug_setup {
723 my $table = new CFPlus::UI::Table;
446 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
447sub make_stats_window { 773sub stats_window {
448 my $tgw = new CFClient::UI::FancyFrame 774 my $r = new CFPlus::UI::ScrolledWindow (
449 y => $HEIGHT * (2/8), 775 expand => 1,
450 x => "max", 776 scroll_y => 1
451 title => "Stats", 777 );
452 name => "stats_window"; 778 $r->add (my $vb = new CFPlus::UI::VBox);
453 779
454 $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
455 $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,
456 can_hover => 1, can_events => 1, 786 can_hover => 1, can_events => 1,
457 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.");
458 $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,
459 can_hover => 1, can_events => 1, 789 can_hover => 1, can_events => 1,
460 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).");
461 791
462 $vb->add (my $hb0 = new CFClient::UI::HBox); 792 $pi->add (my $hb0 = new CFPlus::UI::HBox);
463 $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,
464 can_hover => 1, can_events => 1, 794 can_hover => 1, can_events => 1,
465 tooltip => "The weight of the player including all inventory items."); 795 tooltip => "The weight of the player including all inventory items.");
466 $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,
467 can_hover => 1, can_events => 1, 797 can_hover => 1, can_events => 1,
468 tooltip => "The weight limit: you cannot carry more than this."); 798 tooltip => "The weight limit: you cannot carry more than this.");
469 799
470 800 $vb->add (new CFPlus::UI::FancyFrame
801 label => "Primary/Secondary Statistics",
471 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 802 child => (my $hb = new CFPlus::UI::HBox expand => 1),
803 );
472 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 804 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
473 805
474 my $color2 = [1, 1, 0]; 806 my $color2 = [1, 1, 0];
475 807
476 for ( 808 for (
477 [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],
478 [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],
479 [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],
480 [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],
481 [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],
482 [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],
483 [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],
484 816
485 [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],
486 [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],
487 [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],
488 [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],
489 [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],
490 [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],
491 ) { 823 ) {
492 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 824 my ($col, $row, $id, $label, $template) = @$_;
493 825
494 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 826 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
495 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");
496 $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
497 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");
498 } 832 }
499 833
834 $vb->add (new CFPlus::UI::FancyFrame
835 label => "Resistancies",
500 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 836 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
837 );
501 838
502 my $row = 0; 839 my $row = 0;
503 my $col = 0; 840 my $col = 0;
504 841
505 my %resist_names = ( 842 my %resist_names = (
843 slow => ["Slow",
506 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",
507 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",
508 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",
509 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",
510 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",
511 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",
512 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",
513 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",
514 pois => "<b>Poison</b> (resistance to getting poisoned)", 860 "<b>Poison</b> (resistance to getting poisoned)"],
861 para => ["Paralysation",
515 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",
516 deat => "<b>Death</b> (resistance against death spells)", 864 "<b>Death</b> (resistance against death spells)"],
517 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",
518 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",
519 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",
520 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",
521 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",
522 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",
523 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)"],
524 ); 879 );
880
525 for (qw/slow holyw conf fire depl magic 881 for (qw/slow holyw conf fire depl magic
526 drain acid pois para deat phys 882 drain acid pois para deat phys
527 blind fear tund elec cold ghit/) 883 blind fear tund elec cold ghit/)
528 { 884 {
529 $tbl2->add ($col, $row, 885 $tbl2->add_at ($col, $row,
530 $STATWIDS->{"res_$_"} = 886 $STATWIDS->{"res_$_"} =
531 new CFClient::UI::Label 887 new CFPlus::UI::Label
532 font => $FONT_FIXED, 888 font => $FONT_FIXED,
533 template => "-100%", 889 template => "-100%",
534 align => +1, 890 align => +1,
535 valign => 0, 891 valign => 0,
536 can_events => 1, 892 can_events => 1,
537 can_hover => 1, 893 can_hover => 1,
538 tooltip => $resist_names{$_}, 894 tooltip => $resist_names{$_}->[1],
539 ); 895 );
540 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 896 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
541 font => $FONT_FIXED, 897 font => $FONT_FIXED,
542 can_hover => 1, 898 can_hover => 1,
543 can_events => 1, 899 can_events => 1,
544 image => "ui/resist/resist_$_.png", 900 path => "ui/resist/resist_$_.png",
545 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],
546 ); 909 );
547 910
548 $row++; 911 $row++;
549 if ($row % 6 == 0) { 912 if ($row % 6 == 0) {
550 $col += 2; 913 $col += 3;
551 $row = 0; 914 $row = 0;
552 } 915 }
553 } 916 }
554 917
555 &set_stats_window_fontsize;
556 update_stats_window ({}); 918 #update_stats_window ({});
557 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]);
558 $tgw 926 $sw
559} 927}
560 928
561sub formsep { 929sub formsep($) {
562 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 930 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
563}
564
565sub update_stats_window {
566 my ($stats) = @_;
567
568 # I love text protocols...
569
570 my $hp = $stats->{+CS_STAT_HP} * 1;
571 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
572 my $sp = $stats->{+CS_STAT_SP} * 1;
573 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
574 my $fo = $stats->{+CS_STAT_FOOD} * 1;
575 my $fo_m = 999;
576 my $gr = $stats->{+CS_STAT_GRACE} * 1;
577 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
578
579 $GAUGES->{hp} ->set_value ($hp, $hp_m);
580 $GAUGES->{mana} ->set_value ($sp, $sp_m);
581 $GAUGES->{food} ->set_value ($fo, $fo_m);
582 $GAUGES->{grace} ->set_value ($gr, $gr_m);
583 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
584 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
585 my $rng = $stats->{+CS_STAT_RANGE};
586 $rng =~ s/^Range: //; # thank you so much dear server
587 $GAUGES->{range} ->set_text ("Rng: " . $rng);
588 my $title = $stats->{+CS_STAT_TITLE};
589 $title =~ s/^Player: //;
590 $STATWIDS->{title} ->set_text ("Title: " . $title);
591
592 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
593 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
594 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
595 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
596 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
597 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
598 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
599 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
600 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
601 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
602 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
603 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
604 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
605
606 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
607
608 # TODO: replace by CS_STAT_RES_xxx constants
609 my %tbl = (
610 phys => 100,
611 magic => 101,
612 fire => 102,
613 elec => 103,
614 cold => 104,
615 conf => 105,
616 acid => 106,
617 drain => 107,
618 ghit => 108,
619 pois => 109,
620 slow => 110,
621 para => 111,
622 tund => 112,
623 fear => 113,
624 depl => 113,
625 deat => 115,
626 holyw => 116,
627 blind => 117,
628 );
629
630 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
631 for keys %tbl;
632} 931}
633 932
634my $METASERVER_ATIME; 933my $METASERVER_ATIME;
635 934
636sub update_metaserver { 935sub update_metaserver {
936 my ($metaserver_dialog) = @_;
937
938 $METASERVER = $metaserver_dialog
939 if defined $metaserver_dialog;
940
637 return if $METASERVER_ATIME > time; 941 return if $METASERVER_ATIME > time;
638 $METASERVER_ATIME = time + 60; 942 $METASERVER_ATIME = time + 60;
639 943
640 my $table = $METASERVER->{table}; 944 my $table = $METASERVER->{table};
641 $table->clear; 945 $table->clear;
642 $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...");
643 947
644 my $buf; 948 my $ok = 0;
645 949
646 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 950 CFPlus::background {
951 my $ua = CFPlus::lwp_useragent;
647 952
648 unless ($fh) { 953 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
649 $label->set_text ("unable to contact metaserver: $!"); 954 } sub {
650 return; 955 my ($msg) = @_;
651 } 956 if ($msg) {
652
653 Event->io (fd => $fh, poll => 'r', cb => sub {
654 my $res = sysread $fh, $buf, 8192, length $buf;
655
656 if (!defined $res) {
657 $_[0]->w->cancel;
658 $label->set_text ("error while retrieving server list: $!");
659 } elsif ($res == 0) {
660 $_[0]->w->cancel;
661 status "server list retrieved";
662
663 utf8::decode $buf if utf8::valid $buf;
664
665 $table->clear; 957 $table->clear;
666 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 );
667 my @col = qw(Use #Users Host Uptime Version Description); 966 my @col = qw(#Users Host Uptime Version Description);
668 $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[$_])
669 for 0 .. $#col; 971 for 0 .. $#col;
670 972
671 my @align = qw(1 0 1 1 -1); 973 my @align = qw(1 0 1 1 -1);
672 974
673 my $y = 0; 975 my $y = 0;
674 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 976 for my $m (@{ $msg->{servers} }) {
675 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)};
676 979
677 for ($desc) { 980 for ($desc) {
678 s/<br>/\n/gi; 981 s/<br>/\n/gi;
679 s/<li>/\n· /gi; 982 s/<li>/\n· /gi;
680 s/<.*?>//sgi; 983 s/<.*?>//sgi;
681 s/&/&amp;/g; 984 s/&amp;/&/g;
682 s/</&lt;/g; 985 s/&lt;/</g;
683 s/>/&gt;/g; 986 s/&gt;/>/g;
684 } 987 }
685 988
686 $uptime = sprintf "%dd %02d:%02d:%02d", 989 $uptime = sprintf "%dd %02d:%02d:%02d",
687 (int $m->[8] / 86400), 990 (int $uptime / 86400),
688 (int $m->[8] / 3600) % 24, 991 (int $uptime / 3600) % 24,
689 (int $m->[8] / 60) % 60, 992 (int $uptime / 60) % 60,
690 $m->[8] % 60; 993 $uptime % 60;
691 994
692 $m = [$users, $host, $uptime, $version, $desc]; 995 $m = [$users, $host, $uptime, $version, $desc];
693 996
694 $y++; 997 $y++;
695 998
696 $table->add (0, $y, new CFClient::UI::VBox children => [ 999 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
697 (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 {
698 $HOST_ENTRY->set_text ($CFG->{host} = $host); 1004 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
699 $METASERVER->toggle_visibility; 1005 $METASERVER->hide;
1006 0
1007 },
700 }), 1008 ),
701 (new CFClient::UI::Empty expand => 1), 1009 (new CFPlus::UI::Empty expand => 1),
702 ]); 1010 ]);
703 1011
704 $table->add ($_ + 1, $y, new CFClient::UI::Label 1012 $table->add_at ($_, $y, new CFPlus::UI::Label
705 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)
706 for 0 .. $#$m; 1022 for 0 .. $#$m;
707 } 1023 }
1024 } else {
1025 $ok or $label->set_text ("error while contacting metaserver");
708 } 1026 }
709 }); 1027 };
1028
710} 1029}
711 1030
712sub metaserver_dialog { 1031sub metaserver_dialog {
713 my $dialog = new CFClient::UI::FancyFrame 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
714 title => "Server List", 1037 title => "Server List",
715 name => 'metaserver_dialog', 1038 name => 'metaserver_dialog',
716 x => 'center', 1039 x => 'center',
717 y => 'center', 1040 y => 'center',
718 child => (my $vbox = new CFClient::UI::VBox), 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,
719 on_visibility_change => sub { 1047 on_visibility_change => sub {
720 update_metaserver if $_[1]; 1048 update_metaserver ($_[0]) if $_[1];
1049 0
721 }, 1050 },
722 ; 1051 ;
723 1052
724 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
725
726 $dialog 1053 $dialog
727} 1054}
728 1055
729sub server_setup { 1056sub server_setup {
730 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame 1057 my $vbox = new CFPlus::UI::VBox;
731 x => "center", 1058
732 y => "center", 1059 $vbox->add (new CFPlus::UI::FancyFrame
733 name => "server_setup", 1060 label => "Connection Settings",
734 title => "Server Setup", 1061 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
735 child => (my $vbox = new CFClient::UI::VBox),
736 ; 1062 );
737
738 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
739 $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");
740 1064
741 { 1065 {
742 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1066 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
743 1067
744 $vbox->add ( 1068 $vbox->add (
745 $HOST_ENTRY = new CFClient::UI::Entry 1069 $HOST_ENTRY = new CFPlus::UI::Entry
746 expand => 1, 1070 expand => 1,
747 text => $CFG->{host}, 1071 text => $CFG->{profile}{default}{host},
748 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",
749 on_changed => sub { 1073 on_changed => sub {
750 my ($self, $value) = @_; 1074 my ($self, $value) = @_;
751 $CFG->{host} = $value; 1075 $CFG->{profile}{default}{host} = $value;
1076 1
752 } 1077 }
753 ); 1078 );
754 1079
755 $METASERVER = metaserver_dialog;
756
757 $vbox->add (new CFClient::UI::Button 1080 $vbox->add (new CFPlus::UI::Button
758 expand => 1, 1081 expand => 1,
759 text => "Server List", 1082 text => "Server List",
760 other => $METASERVER, 1083 other => $METASERVER,
761 tooltip => "Show a list of available crossfire servers", 1084 tooltip => "Show a list of available crossfire servers",
762 on_activate => sub { $METASERVER->toggle_visibility }, 1085 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1086 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
763 ); 1087 );
764 } 1088 }
765 1089
766 $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");
767 $table->add (1, 4, new CFClient::UI::Entry 1091 $table->add_at (1, 4, new CFPlus::UI::Entry
768 text => $CFG->{user}, 1092 text => $CFG->{profile}{default}{user},
769 tooltip => "The name of your character on the server", 1093 tooltip => "The name of your character on the server",
770 on_changed => sub { 1094 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
771 my ($self, $value) = @_;
772 $CFG->{user} = $value;
773 }
774 ); 1095 );
775 1096
776 $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");
777 $table->add (1, 5, new CFClient::UI::Entry 1098 $table->add_at (1, 5, new CFPlus::UI::Entry
778 text => $CFG->{password}, 1099 text => $CFG->{profile}{default}{password},
779 hidden => 1, 1100 hidden => 1,
780 tooltip => "The password for your character", 1101 tooltip => "The password for your character",
781 on_changed => sub { 1102 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
782 my ($self, $value) = @_;
783 $CFG->{password} = $value;
784 }
785 ); 1103 );
786 1104
787 $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");
788 $table->add (1, 7, new CFClient::UI::Slider 1106 $table->add_at (1, 7, new CFPlus::UI::Slider
789 force_w => 100, 1107 force_w => 100,
790 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1108 range => [$CFG->{mapsize}, 10, 100, 0, 1],
791 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. "
792 . "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, "
793 . "but you also increase bandwidth requirements and latency. " 1111 . "but you also increase bandwidth requirements and latency. "
794 . "This option is only used once at log-in.", 1112 . "This option is only used once at log-in.",
795 on_changed => sub { 1113 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
796 my ($self, $value) = @_;
797
798 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
799 },
800 ); 1114 );
801 1115
802 $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");
803 $table->add (1, 8, new CFClient::UI::CheckBox 1117 $table->add_at (1, 8, new CFPlus::UI::Entry
804 state => $CFG->{face_prefetch}, 1118 text => $CFG->{output_rate},
805 tooltip => "<b>Background Image Prefetch</b>\n\n" 1119 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
806 . "If enabled, the client automatically pre-fetches images from the server. " 1120 . "when sending data. When 0 or unset, the server "
807 . "This might increase or create lag, but increases the chances " 1121 . "default will be used, which is usually around 100kb/s. Most servers will "
808 . "of faces being ready for display when you encounter them. " 1122 . "dynamically find an optimal rate, so adjust this only when necessary.",
809 . "It also uses up server bandwidth on every connect, "
810 . "so only set it if you really need to prefetch images. "
811 . "This option can be set and unset any time.",
812 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1123 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
813 ); 1124 );
814 1125
815 $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");
816 $table->add (1, 9, new CFClient::UI::Entry 1127 $table->add_at (1, 9, new CFPlus::UI::Entry
817 text => $CFG->{output_count}, 1128 text => $CFG->{output_count},
818 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.",
819 on_changed => sub { $CFG->{output_count} = $_[1] }, 1130 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
820 ); 1131 );
821 1132
822 $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");
823 $table->add (1, 10, new CFClient::UI::Entry 1134 $table->add_at (1, 10, new CFPlus::UI::Entry
824 text => $CFG->{output_sync}, 1135 text => $CFG->{output_sync},
825 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.",
826 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1137 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
827 ); 1138 );
828 1139
829 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1140 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
830 expand => 1, 1141 expand => 1,
831 align => 0, 1142 align => 0,
832 text => "Login", 1143 text => "Login",
833 on_activate => sub { 1144 on_activate => sub {
834 $CONN ? stop_game 1145 $CONN ? stop_game
835 : start_game; 1146 : start_game;
1147 1
836 }, 1148 },
837 ); 1149 );
838 1150
839 $dialog 1151 $vbox->add (new CFPlus::UI::FancyFrame
840} 1152 label => "Server Info",
1153 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1154 );
841 1155
842sub message_window { 1156 $vbox
843 my $window = new CFClient::UI::FancyFrame 1157}
844 name => "message_window",
845 title => "Messages",
846 border_bg => [1, 1, 1, 1],
847 bg => [0, 0, 0, 0.75],
848 x => "max",
849 y => 0,
850 force_w => $::WIDTH / 3,
851 force_h => $::HEIGHT / 5,
852 child => (my $vbox = new CFClient::UI::VBox);
853 1158
854 $vbox->add ($LOGVIEW); 1159sub client_setup {
1160 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
855 1161
856 $vbox->add (my $input = new CFClient::UI::Entry 1162 my $row = 0;
857 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1163
858 . "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");
859 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1165 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
860 . "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?",
861 on_focus_in => sub { 1168 on_changed => sub {
862 my ($input, $prev_focus) = @_; 1169 my ($self, $value) = @_;
863 1170 $CFG->{show_tips} = $value;
864 delete $input->{refocus_map};
865
866 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
867 $input->{refocus_map} = 1;
868 } 1171 0
869 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
870 }, 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",
871 on_activate => sub { 1287 on_activate => sub {
872 my ($input, $text) = @_; 1288 $::CONN->send_command ("pickup $::CFG->{pickup}")
873 $input->set_text (''); 1289 if defined $::CONN;
874
875 if ($text =~ /^\/bind\s+(.*)$/) {
876 CFClient::Binder::open_binding_dialog (sub {
877 my ($mod, $sym) = @_;
878 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
879 });
880 } elsif ($text =~ /^\/(.*)/) {
881 $::CONN->user_send ($1);
882 } else {
883 my $say_cmd = $::CFG->{say_command} || 'say';
884 $::CONN->user_send ("$say_cmd $text");
885 } 1290 0
886 if ($input->{refocus_map}) { 1291 });
887 delete $input->{refocus_map}; 1292
888 $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 } @_
889 } 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]});
890 }, 1335 },
891 on_escape => sub { 1336 );
892 $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 );
893 }, 1466 }
894 );
895 1467
896 $CONSOLE = { 1468 if (@future) {
897 window => $window, 1469 $buttons->add (new CFPlus::UI::Button
898 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);
899 }; 1503 };
900 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
901 $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;
902} 1538}
903 1539
904sub open_quit_dialog { 1540sub open_quit_dialog {
905 unless ($QUIT_DIALOG) { 1541 unless ($QUIT_DIALOG) {
906 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1542 $QUIT_DIALOG = new CFPlus::UI::Toplevel
907 x => "center", 1543 x => "center",
908 y => "center", 1544 y => "center",
1545 z => 50,
909 title => "Really Quit?", 1546 title => "Really Quit?",
1547 on_key_down => sub {
1548 my ($dialog, $ev) = @_;
1549 $ev->{sym} == 27 and $dialog->hide;
1550 }
910 ; 1551 ;
911 1552
912 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1553 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
913 1554
914 $vb->add (new CFClient::UI::Label 1555 $vb->add (new CFPlus::UI::Label
915 text => "You should find a savebed and apply it first!", 1556 text => "You should find a savebed and apply it first!",
916 max_w => $WIDTH * 0.25, 1557 max_w => $WIDTH * 0.25,
917 ellipsize => 0, 1558 ellipsize => 0,
918 ); 1559 );
919 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1560 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
920 $hb->add (new CFClient::UI::Button 1561 $hb->add (new CFPlus::UI::Button
921 text => "Ok", 1562 text => "Ok",
922 expand => 1, 1563 expand => 1,
923 on_activate => sub { $QUIT_DIALOG->hide }, 1564 on_activate => sub { $QUIT_DIALOG->hide; 0 },
924 ); 1565 );
925 $hb->add (new CFClient::UI::Button 1566 $hb->add (new CFPlus::UI::Button
926 text => "Quit anyway", 1567 text => "Quit anyway",
927 expand => 1, 1568 expand => 1,
928 on_activate => sub { exit }, 1569 on_activate => sub { exit },
929 ); 1570 );
930 } 1571 }
931 1572
932 $QUIT_DIALOG->show; 1573 $QUIT_DIALOG->show;
1574 $QUIT_DIALOG->grab_focus;
933} 1575}
934 1576
935sub make_inventory_window { 1577sub show_tip_of_the_day {
936 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1578 # find all tips
937 x => "center", 1579 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
938 y => "center",
939 force_w => $WIDTH * 9/10,
940 force_h => $HEIGHT * 9/10,
941 title => "Inventory",
942 ;
943 1580
944 $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 { };
945 1585
946 $hb->add (my $vb1 = new CFClient::UI::VBox); 1586 # create dialog
947 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1587 my $dialog;
948 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
949 1588
950 $hb->add (my $vb2 = new CFClient::UI::VBox); 1589 my $close = sub {
951 1590 $dialog->destroy;
952 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
953
954 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
955
956 # XXX: Call after $INVR = ... because set_opencont sets the items
957 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
958
959 $invwin
960}
961
962sub make_spell_list {
963 $SPELL_LIST = new CFClient::UI::SpellList
964 force_w => $WIDTH * (9/10),
965 force_h => $HEIGHT * (9/10);
966 $SPELL_LIST
967}
968
969sub make_binding_window {
970 my $binding_list = new CFClient::UI::VBox;
971
972 my $refresh;
973 $refresh = sub {
974 $binding_list->clear ();
975
976 for my $mod (keys %{$::CFG->{bindings}}) {
977 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
978 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
979 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
980
981 my $lbl = join "; ", @$cmds;
982 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
983 $binding_list->add (my $hb = new CFClient::UI::HBox);
984 $hb->add (new CFClient::UI::Button
985 text => "delete",
986 tooltip => "Deletes the binding",
987 on_activate => sub {
988 $binding_list->remove ($hb);
989 delete $::CFG->{bindings}->{$mod}->{$sym};
990 });
991
992 $hb->add (new CFClient::UI::Button
993 text => "edit",
994 tooltip => "Edits the binding",
995 on_activate => sub {
996 $::BIND_EDITOR->set_binding (
997 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
998 sub {
999 my ($nmod, $nsym, $ncmds) = @_;
1000 delete $::CFG->{bindings}->{$mod}->{$sym};
1001 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1002 $refresh->();
1003 $::BIND_WINDOW->show;
1004 },
1005 sub {
1006 $::BIND_WINDOW->show;
1007 });
1008 $::BIND_EDITOR->show;
1009 $::BIND_WINDOW->hide;
1010 });
1011
1012 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1013 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1014 }
1015 }
1016 };
1017
1018 $BIND_WINDOW = new CFClient::UI::FancyFrame
1019 title => "Bindings",
1020 x => "center",
1021 y => "center",
1022 def_w => int $WIDTH * 9/10,
1023 def_h => int $HEIGHT * 9/10,
1024 on_visibility_change => sub {
1025 my ($self, $visible) = @_;
1026 $refresh->() if $visible;
1027 }; 1591 };
1028 1592
1029 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox); 1593 $dialog = new CFPlus::UI::Toplevel
1030 $vb->add ($binding_list); 1594 x => "center",
1031 $vb->add (my $hb = new CFClient::UI::HBox); 1595 y => "center",
1032 $hb->add (new CFClient::UI::Button 1596 z => 3,
1033 text => "record new", 1597 name => 'tip_of_the_day',
1034 expand => 1,
1035 tooltip => "This button opens the binding editor with an empty binding.",
1036 on_activate => sub {
1037 $::BIND_EDITOR->set_binding (undef, undef, [],
1038 sub {
1039 my ($mod, $sym, $cmds) = @_;
1040 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1041 $refresh->();
1042 $::BIND_WINDOW->show;
1043 },
1044 sub {
1045 $::BIND_WINDOW->show;
1046 });
1047 $::BIND_WINDOW->hide;
1048 $::BIND_EDITOR->show;
1049 },
1050 );
1051 $hb->add (new CFClient::UI::Button
1052 text => "close",
1053 tooltip => "Closes the binding window",
1054 expand => 1,
1055 on_activate => sub {
1056 $::BIND_WINDOW->hide;
1057 }
1058 );
1059
1060 $refresh->();
1061 $BIND_WINDOW
1062}
1063
1064sub make_help_window {
1065 my $win = new CFClient::UI::FancyFrame
1066 x => 'center',
1067 y => 'center',
1068 name => 'doc_browser',
1069 force_w => int $WIDTH * 7/8, 1598 force_w => int $WIDTH * 4/9,
1070 force_h => int $HEIGHT * 7/8, 1599 force_h => int $WIDTH * 2/9,
1071 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 ;
1072 1605
1073 $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]);
1074 1609
1075 $vbox->add (my $buttons = new CFClient::UI::HBox); 1610 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1076 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
1077 1611
1078 for ( 1612 $table->add_at (0, 0, new CFPlus::UI::Button
1079 [intro => "Introduction"],
1080 [manual => "Manual"],
1081 [command_help => "Commands"],
1082 [skill_help => "Skills"],
1083 ) {
1084 my ($pod, $label) = @$_;
1085
1086 $buttons->add (new CFClient::UI::Button
1087 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>.",
1088 on_activate => sub { 1621 on_activate => sub {
1089 my $parser = new Pod::POM; 1622 $close->();
1090 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1623 &show_tip_of_the_day;
1091
1092 $viewer->clear;
1093
1094 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1095 for @{ CFClient::pod_to_pango_list $pom };
1096
1097 $viewer->set_offset (0);
1098 }, 1624 },
1099 ); 1625 );
1626
1627 $dialog->show;
1100 } 1628 };
1101
1102 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1103
1104 $win
1105} 1629}
1106 1630
1107sub sdl_init { 1631sub sdl_init {
1108 CFClient::SDL_Init 1632 CFPlus::SDL_Init
1109 and die "SDL::Init failed!\n"; 1633 and die "SDL::Init failed!\n";
1110} 1634}
1111 1635
1112sub video_init { 1636sub video_init {
1113 sdl_init;
1114
1115 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1637 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1116 1638
1117 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1639 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1118 1640
1119 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1641 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1120 $FULLSCREEN = $CFG->{fullscreen}; 1642 $FULLSCREEN = $CFG->{fullscreen};
1121 $FAST = $CFG->{fast}; 1643 $FAST = $CFG->{fast};
1122 1644
1123 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1645 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1124 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1646 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1125 1647
1126 $SDL_ACTIVE = 1; 1648 $SDL_ACTIVE = 1;
1127 $LAST_REFRESH = time - 0.01; 1649 $LAST_REFRESH = time - 0.01;
1128 1650
1129 CFClient::OpenGL::init; 1651 CFPlus::OpenGL::init;
1130 1652
1131 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1653 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1132 1654
1133 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1655 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1134 1656
1135 ############################################################################# 1657 #############################################################################
1136 1658
1137 if ($DEBUG_STATUS) { 1659 if ($DEBUG_STATUS) {
1138 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1660 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1139 } else { 1661 } else {
1140 # create the widgets 1662 # create the widgets
1141 1663
1142 $DEBUG_STATUS = new CFClient::UI::Label 1664 $DEBUG_STATUS = new CFPlus::UI::Label
1143 padding => 0, 1665 padding => 0,
1144 z => 100, 1666 z => 100,
1145 force_x => "max", 1667 force_x => "max",
1146 force_y => 0; 1668 force_y => 0;
1147 $DEBUG_STATUS->show; 1669 $DEBUG_STATUS->show;
1148 1670
1149 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1150
1151 $STATUSBOX = new CFClient::UI::Statusbox; 1671 $STATUSBOX = new CFPlus::UI::Statusbox;
1152 $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]);
1153 1673
1154 (new CFClient::UI::Frame 1674 (new CFPlus::UI::Frame
1155 bg => [0, 0, 0, 0.4], 1675 bg => [0, 0, 0, 0.4],
1156 force_x => 0, 1676 force_x => 0,
1157 force_y => "max", 1677 force_y => "max",
1158 child => $STATUSBOX, 1678 child => $STATUSBOX,
1159 )->show; 1679 )->show;
1160 1680
1161 CFClient::UI::FancyFrame->new ( 1681 CFPlus::UI::Toplevel->new (
1162 title => "Mini Map", 1682 title => "Map",
1163 name => "mapmap", 1683 name => "mapmap",
1164 x => 0, 1684 x => 0,
1165 y => $FONTSIZE + 8, 1685 y => $FONTSIZE + 8,
1166 border_bg => [1, 1, 1, 192/255], 1686 border_bg => [1, 1, 1, 192/255],
1167 bg => [1, 1, 1, 0], 1687 bg => [1, 1, 1, 0],
1168 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1688 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1169 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.",
1170 ), 1690 ),
1171 )->show; 1691 )->show;
1172 1692
1173 $MAPWIDGET = new CFClient::MapWidget; 1693 $MAPWIDGET = new CFPlus::MapWidget;
1174 $MAPWIDGET->connect (activate_console => sub { 1694 $MAPWIDGET->connect (activate_console => sub {
1175 my ($mapwidget, $preset) = @_; 1695 my ($mapwidget, $preset) = @_;
1176 1696
1177 if ($CONSOLE) { 1697 $MESSAGE_WINDOW->activate_console ($preset)
1178 $CONSOLE->{input}->{auto_activated} = 1; 1698 if $MESSAGE_WINDOW;
1179 $CONSOLE->{input}->focus_in;
1180
1181 if ($preset && $CONSOLE->{input}->get_text eq '') {
1182 $CONSOLE->{input}->set_text ($preset);
1183 }
1184 }
1185 }); 1699 });
1186 $MAPWIDGET->show; 1700 $MAPWIDGET->show;
1187 $MAPWIDGET->focus_in; 1701 $MAPWIDGET->grab_focus;
1188 1702
1189 $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',
1190 expand => 1, 1708 z => 2,
1191 font => $FONT_FIXED, 1709 force_w => $::WIDTH * 0.6,
1192 fontsize => $::CFG->{log_fontsize}, 1710 force_h => $::HEIGHT * 0.6,
1193 can_hover => 1, 1711 has_close_button => 1,
1194 can_events => 1,
1195 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1196 ; 1712 ;
1197 1713
1198 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1714 $METASERVER = metaserver_dialog;
1715 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1199 1716
1200 $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,
1201 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);
1202 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1719
1720 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1203 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
1204 $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,
1205 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.");
1206 1745
1207 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
1208 1747
1209 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1210 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1211 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1748 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1212 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.");
1213 ."You can also hit the Tab-key to show/hide the Inventory.");
1214 1750
1215 $BUTTONBAR->add (new CFClient::UI::Button 1751 $BUTTONBAR->add (new CFPlus::UI::Button
1216 text => "Save Config", 1752 text => "Save Config",
1217 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.",
1218 on_activate => sub { 1754 on_activate => sub {
1219 $::CFG->{layout} = CFClient::UI::get_layout; 1755 $::CFG->{layout} = CFPlus::UI::get_layout;
1220 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1756 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1221 status "Configuration Saved"; 1757 status "Configuration Saved";
1758 0
1222 }, 1759 },
1223 ); 1760 );
1224 1761
1225 $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,
1226 tooltip => "View Documentation"); 1763 tooltip => "View Documentation");
1227 1764
1228 $BUTTONBAR->add (new CFClient::UI::Flopper
1229 text => "Bindings",
1230 other => make_binding_window,
1231 tooltip =>
1232 "Lets you define, edit and delete bindings."
1233 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1234 ."with nothing set and the recording started. After doing the actions you "
1235 ."want to record press Insert and you will be asked to press a key-combo."
1236 ."After pressing the combo the binding will be saved automatically and the "
1237 ."binding editor closes");
1238 1765
1239 $BUTTONBAR->add (new CFClient::UI::Flopper
1240 text => "Spells",
1241 other => make_spell_list,
1242 tooltip => "The spell list");
1243
1244 $BUTTONBAR->add (new CFClient::UI::Button 1766 $BUTTONBAR->add (new CFPlus::UI::Button
1245 text => "Quit", 1767 text => "Quit",
1246 tooltip => "Terminates the program", 1768 tooltip => "Terminates the program",
1247 on_activate => sub { 1769 on_activate => sub {
1248 if ($CONN) { 1770 if ($CONN) {
1249 open_quit_dialog; 1771 open_quit_dialog;
1250 } else { 1772 } else {
1251 exit; 1773 exit;
1252 } 1774 }
1775 0
1253 }, 1776 },
1254 ); 1777 );
1255 1778
1256 $BUTTONBAR->show; 1779 $BUTTONBAR->show;
1257 $SERVER_SETUP->show; 1780 $SETUP_DIALOG->show;
1781 }
1258 1782
1259 $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]);
1260 }
1261} 1784}
1262 1785
1263sub video_shutdown { 1786sub video_shutdown {
1787 CFPlus::OpenGL::shutdown;
1788
1264 undef $SDL_ACTIVE; 1789 undef $SDL_ACTIVE;
1265} 1790}
1266
1267my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1268my $bgmusic;#TODO#hack#d#
1269 1791
1270sub audio_channel_finished { 1792sub audio_channel_finished {
1271 my ($channel) = @_; 1793 my ($channel) = @_;
1272 1794
1273 #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} || 1;
1826 my $rwops = new CFPlus::RW $_[0];
1827 my $chunk = new CFPlus::MixChunk $rwops;
1828 $chunk->volume ($vol * 128);
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 }
1274} 1927}
1275 1928
1276sub audio_music_finished { 1929sub audio_music_finished {
1277 return unless $CFG->{bgm_enable}; 1930 undef $MUSIC_PLAYER;
1931 undef $MUSIC_PLAYING_META;
1932 undef $MUSIC_PLAYING_DATA;
1278 1933
1279 # TODO: hack, do play loop and mood music 1934 audio_music_changed;
1280 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
1281 $bgmusic->play (0);
1282
1283 push @bgmusic, shift @bgmusic;
1284} 1935}
1285 1936
1286sub audio_init { 1937sub audio_init {
1287 if ($CFG->{audio_enable}) { 1938 if ($CFG->{audio_enable}) {
1288 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1939 $ENV{MIX_EFFECTSMAXSPEED} = 1;
1289 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1940 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1290 1941
1291 unless ($SDL_MIXER) { 1942 unless ($SDL_MIXER) {
1292 status "Unable to open sound device: there will be no sound"; 1943 status "Unable to open sound device: there will be no sound";
1293 return; 1944 return;
1294 }
1295
1296 CFClient::Mix_AllocateChannels 8;
1297 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
1298
1299 audio_music_finished;
1300
1301 while (<$fh>) {
1302 next if /^\s*#/;
1303 next if /^\s*$/;
1304
1305 my ($file, $volume, $event) = split /\s+/, $_, 3;
1306
1307 push @SOUNDS, "$volume,$file";
1308
1309 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1310 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
1311 $chunk->volume ($volume * 128 / 100);
1312 $chunk
1313 };
1314 }
1315 } else {
1316 status "unable to open sound config: $!";
1317 } 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;
1318 } 1953 }
1319} 1954}
1320 1955
1321sub audio_shutdown { 1956sub audio_shutdown {
1322 CFClient::Mix_CloseAudio if $SDL_MIXER; 1957 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1323 undef $SDL_MIXER; 1958 undef $SDL_MIXER;
1324 @SOUNDS = (); 1959 @SOUNDS = ();
1325 %AUDIO_CHUNKS = (); 1960 %AUDIO_CHUNKS = ();
1326} 1961}
1327 1962
1328my %animate_object; 1963my %animate_object;
1329my $animate_timer; 1964my $animate_timer;
1330 1965
1331my $fps = 9; 1966my $fps = 9;
1332 1967
1333my %demo;#d#
1334
1335sub force_refresh { 1968sub force_refresh {
1336 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1969 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1337 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1970 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1338 1971
1339 $CFClient::UI::ROOT->draw; 1972 $CFPlus::UI::ROOT->draw;
1340 1973
1341 $WANT_REFRESH = 0; 1974 $WANT_REFRESH = 0;
1342 $CAN_REFRESH = 0; 1975 $CAN_REFRESH = 0;
1343 $LAST_REFRESH = $NOW; 1976 $LAST_REFRESH = $NOW;
1344 1977
13450 && do {
1346 # some weird model-drawing code, just a joke right now
1347 use CFClient::OpenGL;
1348
1349 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1350 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1351 $demo{r} ||= do {
1352 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1353 $mod->{v} = pack "f*", @{$mod->{v}};
1354 $_ = [scalar @$_, pack "S!*", @$_]
1355 for values %{$mod->{g}};
1356 $mod
1357 };
1358
1359 my $r = $demo{r} or die;
1360
1361 glDepthMask 1;
1362 glClear GL_DEPTH_BUFFER_BIT;
1363 glEnable GL_TEXTURE_2D;
1364 glEnable GL_DEPTH_TEST;
1365 glEnable GL_CULL_FACE;
1366 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1367
1368 glMatrixMode GL_PROJECTION;
1369 glLoadIdentity;
1370 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1371 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1372 glMatrixMode GL_MODELVIEW;
1373 glLoadIdentity;
1374
1375 glPushMatrix;
1376 glTranslate 0, 0, -800;
1377 glScale 1, -1, 1;
1378 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1379 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1380 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1381 glScale 50, 50, 50;
1382
1383 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1384 while (my ($k, $v) = each %{$r->{g}}) {
1385 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1386 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1387 }
1388
1389 glPopMatrix;
1390
1391 glShadeModel GL_FLAT;
1392 glDisable GL_DEPTH_TEST;
1393 glDisable GL_TEXTURE_2D;
1394 glDepthMask 0;
1395
1396 $WANT_REFRESH++;
1397};
1398
1399 CFClient::SDL_GL_SwapBuffers; 1978 CFPlus::SDL_GL_SwapBuffers;
1400} 1979}
1401 1980
1402my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1981my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1403 $NOW = time; 1982 $NOW = time;
1404 1983
1405 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1984 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1406 for CFClient::SDL_PollEvent; 1985 for CFPlus::poll_events;
1407 1986
1408 if (%animate_object) { 1987 if (%animate_object) {
1409 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1988 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1410 $WANT_REFRESH++; 1989 ++$WANT_REFRESH;
1411 } 1990 }
1412 1991
1413 if ($WANT_REFRESH) { 1992 if ($WANT_REFRESH) {
1414 force_refresh; 1993 force_refresh;
1415 } else { 1994 } else {
1425sub animation_stop { 2004sub animation_stop {
1426 my ($widget) = @_; 2005 my ($widget) = @_;
1427 delete $animate_object{$widget}; 2006 delete $animate_object{$widget};
1428} 2007}
1429 2008
1430# check once/second for faces that need to be prefetched
1431# this should, of course, only run on demand, but
1432# SDL forces worse things on us....
1433
1434Event->timer (after => 1, interval => 0.25, cb => sub {
1435 $CONN->face_prefetch
1436 if $CONN;
1437});
1438
1439%SDL_CB = ( 2009%SDL_CB = (
1440 CFClient::SDL_QUIT => sub { 2010 CFPlus::SDL_QUIT => sub {
1441 Event::unloop -1; 2011 exit;
1442 }, 2012 },
1443 CFClient::SDL_VIDEORESIZE => sub { 2013 CFPlus::SDL_VIDEORESIZE => sub {
1444 }, 2014 },
1445 CFClient::SDL_VIDEOEXPOSE => sub { 2015 CFPlus::SDL_VIDEOEXPOSE => sub {
1446 CFClient::UI::full_refresh; 2016 CFPlus::UI::full_refresh;
1447 }, 2017 },
1448 CFClient::SDL_ACTIVEEVENT => sub { 2018 CFPlus::SDL_ACTIVEEVENT => sub {
1449# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2019# not useful, as APPACTIVE include sonly iconified state, not unmapped
2020# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2021# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2022# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2023# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2024# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1450 }, 2025 },
1451 CFClient::SDL_KEYDOWN => sub { 2026 CFPlus::SDL_KEYDOWN => sub {
1452 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2027 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1453 # alt-enter 2028 # alt-enter
2029 $FULLSCREEN_ENABLE->toggle;
1454 video_shutdown; 2030 video_shutdown;
1455 $CFG->{fullscreen} = !$CFG->{fullscreen};
1456 video_init; 2031 video_init;
1457 } else { 2032 } else {
1458 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2033 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1459 } 2034 }
1460 }, 2035 },
1461 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2036 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1462 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2037 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1463 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2038 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1464 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2039 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1465 CFClient::SDL_USEREVENT => sub { 2040 CFPlus::SDL_USEREVENT => sub {
1466 if ($_[0]{code} == 1) { 2041 if ($_[0]{code} == 1) {
1467 audio_channel_finished $_[0]{data1}; 2042 audio_channel_finished $_[0]{data1};
1468 } elsif ($_[0]{code} == 0) { 2043 } elsif ($_[0]{code} == 0) {
1469 audio_music_finished; 2044 audio_music_finished;
1470 } 2045 }
1474############################################################################# 2049#############################################################################
1475 2050
1476$SIG{INT} = $SIG{TERM} = sub { exit }; 2051$SIG{INT} = $SIG{TERM} = sub { exit };
1477 2052
1478{ 2053{
1479 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1480
1481 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2054 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2055 CFPlus::DB::Server::run;
2056
1482 CFClient::UI::set_layout ($::CFG->{layout}); 2057 CFPlus::UI::set_layout ($::CFG->{layout});
1483 2058
1484 my %DEF_CFG = ( 2059 my %DEF_CFG = (
1485 sdl_mode => 0, 2060 sdl_mode => 0,
1486 width => 640,
1487 height => 480,
1488 fullscreen => 0, 2061 fullscreen => 0,
1489 fast => 0, 2062 fast => 0,
1490 map_scale => 1, 2063 map_scale => 1,
1491 fow_enable => 1, 2064 fow_enable => 1,
1492 fow_intensity => 0.45, 2065 fow_intensity => 0,
1493 fow_smooth => 0, 2066 map_smoothing => 1,
1494 gui_fontsize => 1, 2067 gui_fontsize => 1,
1495 log_fontsize => 1, 2068 log_fontsize => 0.7,
1496 gauge_fontsize=> 1, 2069 gauge_fontsize => 1,
1497 gauge_size => 0.35, 2070 gauge_size => 0.35,
1498 stat_fontsize => 1, 2071 stat_fontsize => 0.7,
1499 mapsize => 100, 2072 mapsize => 100,
1500 host => "crossfire.schmorp.de",
1501 say_command => 'say',
1502 audio_enable => 1, 2073 audio_enable => 1,
1503 bgm_enable => 1, 2074 bgm_enable => 1,
1504 bgm_volume => 0.25, 2075 bgm_volume => 0.25,
1505 face_prefetch => 0,
1506 output_sync => 1, 2076 output_sync => 1,
1507 output_count => 1, 2077 output_count => 1,
2078 output_rate => "",
2079 pickup => 0,
2080 inv_sort => "mtime",
2081 default => "profile", # default profile
2082 show_tips => 1,
2083 logview_max_par => 1000,
2084 );
1508 ); 2085
1509
1510 while (my ($k, $v) = each %DEF_CFG) { 2086 while (my ($k, $v) = each %DEF_CFG) {
1511 $CFG->{$k} = $v unless exists $CFG->{$k}; 2087 $CFG->{$k} = $v unless exists $CFG->{$k};
1512 } 2088 }
1513 2089
2090 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2091 $PROFILE = $CFG->{profile}{default};
2092
2093 # convert old bindings (only default profile matters)
2094 if (my $bindings = delete $PROFILE->{bindings}) {
2095 while (my ($mod, $syms) = each %$bindings) {
2096 while (my ($sym, $cmds) = each %$syms) {
2097 push @{ $PROFILE->{macro} }, {
2098 accelkey => [$mod*1, $sym*1],
2099 action => $cmds,
2100 };
2101 }
2102 }
2103 }
2104
1514 sdl_init; 2105 sdl_init;
1515 2106
1516 @SDL_MODES = reverse 2107 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1517 grep $_->[0] >= 640 && $_->[1] >= 480, 2108 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1518 CFClient::SDL_ListModes;
1519
1520 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2109 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2110
2111 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
1521 2112
1522 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2113 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1523 2114
1524 { 2115 {
1525 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2116 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1526 DejaVuSans.ttf 2117 DejaVuSans.ttf
1527 DejaVuSansMono.ttf 2118 DejaVuSansMono.ttf
1528 DejaVuSans-Bold.ttf 2119 DejaVuSans-Bold.ttf
1529 DejaVuSansMono-Bold.ttf 2120 DejaVuSansMono-Bold.ttf
1530 DejaVuSans-Oblique.ttf 2121 DejaVuSans-Oblique.ttf
1531 DejaVuSansMono-Oblique.ttf 2122 DejaVuSansMono-Oblique.ttf
1532 DejaVuSans-BoldOblique.ttf 2123 DejaVuSans-BoldOblique.ttf
1533 DejaVuSansMono-BoldOblique.ttf 2124 DejaVuSansMono-BoldOblique.ttf
1534 ); 2125 );
1535 2126
1536 CFClient::add_font $_ for @fonts; 2127 CFPlus::add_font $_ for @fonts;
1537 2128
1538 CFClient::pango_init; 2129 CFPlus::pango_init;
1539 2130
1540 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2131 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1541 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2132 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1542 2133
1543 $FONT_PROP->make_default; 2134 $FONT_PROP->make_default;
1544 } 2135 }
1545 2136
1546# compare mono (ft) vs. rgba (cairo) 2137# compare mono (ft) vs. rgba (cairo)
1547# ft - 1.8s, cairo 3s, even in alpha-only mode 2138# ft - 1.8s, cairo 3s, even in alpha-only mode
1548# for my $rgba (0..1) { 2139# for my $rgba (0..1) {
1549# my $t1 = Time::HiRes::time; 2140# my $t1 = Time::HiRes::time;
1550# for (1..1000) { 2141# for (1..1000) {
1551# my $layout = CFClient::Layout->new ($rgba); 2142# my $layout = CFPlus::Layout->new ($rgba);
1552# $layout->set_text ("hallo" x 100); 2143# $layout->set_text ("hallo" x 100);
1553# $layout->render; 2144# $layout->render;
1554# } 2145# }
1555# my $t2 = Time::HiRes::time; 2146# my $t2 = Time::HiRes::time;
1556# warn $t2-$t1; 2147# warn $t2-$t1;
1557# } 2148# }
1558 2149
2150 $startup_done->();
2151
1559 video_init; 2152 video_init;
1560 audio_init; 2153 audio_init;
1561} 2154}
1562 2155
2156show_tip_of_the_day if $CFG->{show_tips};
2157
1563Event::loop; 2158Event::loop;
2159#CFPlus::SDL_Quit;
2160#CFPlus::_exit 0;
1564 2161
1565END { CFClient::SDL_Quit } 2162END {
2163 CFPlus::SDL_Quit;
2164 CFPlus::DB::Server::stop;
2165}
1566 2166
1567=head1 NAME 2167=head1 NAME
1568 2168
1569cfplus - A Crossfire+ and Crossfire game client 2169cfplus - A Crossfire+ and Crossfire game client
1570 2170

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines