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

Diff Legend

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