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.102 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.141 by elmex, Sat Dec 16 17:33:26 2006 UTC

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

Diff Legend

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