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

Diff Legend

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