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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines