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

Diff Legend

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