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.13 by root, Fri May 26 20:50:35 2006 UTC vs.
Revision 1.153 by root, Tue Apr 24 01:13:54 2007 UTC

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

Diff Legend

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