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.23 by root, Sun May 28 02:31:04 2006 UTC vs.
Revision 1.139 by root, Sat Dec 9 22:06:51 2006 UTC

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

Diff Legend

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