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.59 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.131 by root, Sun Nov 19 20:31:29 2006 UTC

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

Diff Legend

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