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

Diff Legend

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