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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines