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.100 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.142 by root, Mon Mar 12 22:23:09 2007 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::Combobox 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
693 735 $vb->add (new CFPlus::UI::FancyFrame
736 label => "Primary/Secondary Statistics",
694 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 737 child => (my $hb = new CFPlus::UI::HBox expand => 1),
738 );
695 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 739 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
696 740
697 my $color2 = [1, 1, 0]; 741 my $color2 = [1, 1, 0];
698 742
699 for ( 743 for (
700 [0, 0, st_str => "Str", 30], 744 [0, 0, st_str => "Str", 30],
712 [2, 4, st_spd => "Spd", 10.54], 756 [2, 4, st_spd => "Spd", 10.54],
713 [2, 5, st_wspd => "WSp", 10.54], 757 [2, 5, st_wspd => "WSp", 10.54],
714 ) { 758 ) {
715 my ($col, $row, $id, $label, $template) = @$_; 759 my ($col, $row, $id, $label, $template) = @$_;
716 760
717 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 761 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
718 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 762 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
719 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label}); 763 align => +1, template => $template, tooltip => "#stat_$label");
720 $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
721 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,
722 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label}); 766 align => -1, text => $label, tooltip => "#stat_$label");
723 } 767 }
724 768
769 $vb->add (new CFPlus::UI::FancyFrame
770 label => "Resistancies",
725 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 771 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
772 );
726 773
727 my $row = 0; 774 my $row = 0;
728 my $col = 0; 775 my $col = 0;
729 776
730 my %resist_names = ( 777 my %resist_names = (
769 drain acid pois para deat phys 816 drain acid pois para deat phys
770 blind fear tund elec cold ghit/) 817 blind fear tund elec cold ghit/)
771 { 818 {
772 $tbl2->add ($col, $row, 819 $tbl2->add ($col, $row,
773 $STATWIDS->{"res_$_"} = 820 $STATWIDS->{"res_$_"} =
774 new CFClient::UI::Label 821 new CFPlus::UI::Label
775 font => $FONT_FIXED, 822 font => $FONT_FIXED,
776 template => "-100%", 823 template => "-100%",
777 align => +1, 824 align => +1,
778 valign => 0, 825 valign => 0,
779 can_events => 1, 826 can_events => 1,
780 can_hover => 1, 827 can_hover => 1,
781 tooltip => $resist_names{$_}->[1], 828 tooltip => $resist_names{$_}->[1],
782 ); 829 );
783 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 830 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
784 font => $FONT_FIXED, 831 font => $FONT_FIXED,
785 can_hover => 1, 832 can_hover => 1,
786 can_events => 1, 833 can_events => 1,
787 path => "ui/resist/resist_$_.png", 834 path => "ui/resist/resist_$_.png",
788 tooltip => $resist_names{$_}->[1], 835 tooltip => $resist_names{$_}->[1],
789 ); 836 );
790 $tbl2->add ($col + 2, $row, new CFClient::UI::Label 837 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label
791 text => $resist_names{$_}->[0], 838 text => $resist_names{$_}->[0],
792 font => $FONT_FIXED, 839 font => $FONT_FIXED,
793 can_hover => 1, 840 can_hover => 1,
794 can_events => 1, 841 can_events => 1,
795 tooltip => $resist_names{$_}->[1], 842 tooltip => $resist_names{$_}->[1],
806 853
807 $r 854 $r
808} 855}
809 856
810sub skill_window { 857sub skill_window {
811 my $sw = new CFClient::UI::ScrolledWindow (expand => 1); 858 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
812 $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]);
813 $sw 860 $sw
814} 861}
815 862
816sub formsep($) { 863sub formsep($) {
817 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 864 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
828 return if $METASERVER_ATIME > time; 875 return if $METASERVER_ATIME > time;
829 $METASERVER_ATIME = time + 60; 876 $METASERVER_ATIME = time + 60;
830 877
831 my $table = $METASERVER->{table}; 878 my $table = $METASERVER->{table};
832 $table->clear; 879 $table->clear;
833 $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...");
834 881
835 my $buf; 882 my $ok = 0;
836 883
837 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 884 CFPlus::background {
885 my $ua = CFPlus::lwp_useragent;
838 886
839 unless ($fh) { 887 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
840 $label->set_text ("unable to contact metaserver: $!"); 888 } sub {
841 return; 889 my ($msg) = @_;
842 } 890 if ($msg) {
843
844 Event->io (fd => $fh, poll => 'r', cb => sub {
845 my $res = sysread $fh, $buf, 8192, length $buf;
846
847 if (!defined $res) {
848 $_[0]->w->cancel;
849 $label->set_text ("error while retrieving server list: $!");
850 } elsif ($res == 0) {
851 $_[0]->w->cancel;
852 status "server list retrieved";
853
854 utf8::decode $buf if utf8::valid $buf;
855
856 $table->clear; 891 $table->clear;
857 892
858 my @tip = ( 893 my @tip = (
859 "The current number of users logged in on the server.", 894 "The current number of users logged in on the server.",
860 "The hostname of the server.", 895 "The hostname of the server.",
861 "The time this server has been running without being restarted.", 896 "The time this server has been running without being restarted.",
862 "The server software version - a '+' indicates a Crossfire+ server.", 897 "The server software version - a '+' indicates a Crossfire+ server.",
863 "Short information about this server provided by its admins.", 898 "Short information about this server provided by its admins.",
864 ); 899 );
865 my @col = qw(#Users Host Uptime Version Description); 900 my @col = qw(#Users Host Uptime Version Description);
866 $table->add ($_, 0, new CFClient::UI::Label 901 $table->add ($_, 0, new CFPlus::UI::Label
867 can_hover => 1, can_events => 1, 902 can_hover => 1, can_events => 1,
868 align => 0, fg => [1, 1, 0], 903 align => 0, fg => [1, 1, 0],
869 text => $col[$_], tooltip => $tip[$_]) 904 text => $col[$_], tooltip => $tip[$_])
870 for 0 .. $#col; 905 for 0 .. $#col;
871 906
872 my @align = qw(1 0 1 1 -1); 907 my @align = qw(1 0 1 1 -1);
873 908
874 my $y = 0; 909 my $y = 0;
875 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 910 for my $m (@{ $msg->{servers} }) {
876 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 911 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
912 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
877 913
878 for ($desc) { 914 for ($desc) {
879 s/<br>/\n/gi; 915 s/<br>/\n/gi;
880 s/<li>/\n· /gi; 916 s/<li>/\n· /gi;
881 s/<.*?>//sgi; 917 s/<.*?>//sgi;
882 s/&/&amp;/g; 918 s/&amp;/&/g;
883 s/</&lt;/g; 919 s/&lt;/</g;
884 s/>/&gt;/g; 920 s/&gt;/>/g;
885 } 921 }
886 922
887 $uptime = sprintf "%dd %02d:%02d:%02d", 923 $uptime = sprintf "%dd %02d:%02d:%02d",
888 (int $m->[8] / 86400), 924 (int $uptime / 86400),
889 (int $m->[8] / 3600) % 24, 925 (int $uptime / 3600) % 24,
890 (int $m->[8] / 60) % 60, 926 (int $uptime / 60) % 60,
891 $m->[8] % 60; 927 $uptime % 60;
892 928
893 $m = [$users, $host, $uptime, $version, $desc]; 929 $m = [$users, $host, $uptime, $version, $desc];
894 930
895 $y++; 931 $y++;
896 932
897 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 933 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
898 (new CFClient::UI::Button 934 (new CFPlus::UI::Button
899 text => "Use", 935 text => "Use",
900 tooltip => "Put this server into the <b>Host:Port</b> field", 936 tooltip => "Put this server into the <b>Host:Port</b> field",
901 on_activate => sub { 937 on_activate => sub {
902 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 938 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
903 $METASERVER->hide; 939 $METASERVER->hide;
904 0 940 0
905 }, 941 },
906 ), 942 ),
907 (new CFClient::UI::Empty expand => 1), 943 (new CFPlus::UI::Empty expand => 1),
908 ]); 944 ]);
909 945
910 $table->add ($_, $y, new CFClient::UI::Label 946 $table->add ($_, $y, new CFPlus::UI::Label
947 max_w => $::WIDTH * 0.4,
911 ellipsise => 0, 948 ellipsise => 0,
912 align => $align[$_], 949 align => $align[$_],
913 text => $m->[$_], 950 text => $m->[$_],
914 tooltip => $tip[$_], 951 tooltip => $tip[$_],
952 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
915 can_hover => 1, 953 can_hover => 1,
916 can_events => 1, 954 can_events => 1,
917 fontsize => 0.8) 955 fontsize => 0.8)
918 for 0 .. $#$m; 956 for 0 .. $#$m;
919 } 957 }
958 } else {
959 $ok or $label->set_text ("error while contacting metaserver");
920 } 960 }
921 }); 961 };
962
922} 963}
923 964
924sub metaserver_dialog { 965sub metaserver_dialog {
925 my $vbox = new CFClient::UI::VBox; 966 my $vbox = new CFPlus::UI::VBox;
926 my $table = new CFClient::UI::Table; 967 my $table = new CFPlus::UI::Table;
927 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table); 968 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
928 969
929 my $dialog = new CFClient::UI::FancyFrame 970 my $dialog = new CFPlus::UI::Toplevel
930 title => "Server List", 971 title => "Server List",
931 name => 'metaserver_dialog', 972 name => 'metaserver_dialog',
932 x => 'center', 973 x => 'center',
933 y => 'center', 974 y => 'center',
934 z => 3, 975 z => 3,
976 force_w => $::WIDTH * 0.9,
935 force_h => $::HEIGHT * 0.4, 977 force_h => $::HEIGHT * 0.7,
936 child => $vbox, 978 child => $vbox,
937 has_close_button => 1, 979 has_close_button => 1,
938 table => $table, 980 table => $table,
939 on_visibility_change => sub { 981 on_visibility_change => sub {
940 update_metaserver ($_[0]) if $_[1]; 982 update_metaserver ($_[0]) if $_[1];
944 986
945 $dialog 987 $dialog
946} 988}
947 989
948sub server_setup { 990sub server_setup {
949 my $vbox = new CFClient::UI::VBox; 991 my $vbox = new CFPlus::UI::VBox;
950 992
993 $vbox->add (new CFPlus::UI::FancyFrame
994 label => "Connection Settings",
951 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 995 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
996 );
952 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 997 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
953 998
954 { 999 {
955 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1000 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
956 1001
957 $vbox->add ( 1002 $vbox->add (
958 $HOST_ENTRY = new CFClient::UI::Entry 1003 $HOST_ENTRY = new CFPlus::UI::Entry
959 expand => 1, 1004 expand => 1,
960 text => $CFG->{profile}{default}{host}, 1005 text => $CFG->{profile}{default}{host},
961 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1006 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
962 on_changed => sub { 1007 on_changed => sub {
963 my ($self, $value) = @_; 1008 my ($self, $value) = @_;
964 $CFG->{profile}{default}{host} = $value; 1009 $CFG->{profile}{default}{host} = $value;
965 0 1010 0
966 } 1011 }
967 ); 1012 );
968 1013
969 $vbox->add (new CFClient::UI::Button 1014 $vbox->add (new CFPlus::UI::Button
970 expand => 1, 1015 expand => 1,
971 text => "Server List", 1016 text => "Server List",
972 other => $METASERVER, 1017 other => $METASERVER,
973 tooltip => "Show a list of available crossfire servers", 1018 tooltip => "Show a list of available crossfire servers",
974 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1019 on_activate => sub { $METASERVER->toggle_visibility; 0 },
975 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1020 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
976 ); 1021 );
977 } 1022 }
978 1023
979 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1024 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
980 $table->add (1, 4, new CFClient::UI::Entry 1025 $table->add (1, 4, new CFPlus::UI::Entry
981 text => $CFG->{profile}{default}{user}, 1026 text => $CFG->{profile}{default}{user},
982 tooltip => "The name of your character on the server", 1027 tooltip => "The name of your character on the server",
983 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1028 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
984 ); 1029 );
985 1030
986 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1031 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
987 $table->add (1, 5, new CFClient::UI::Entry 1032 $table->add (1, 5, new CFPlus::UI::Entry
988 text => $CFG->{profile}{default}{password}, 1033 text => $CFG->{profile}{default}{password},
989 hidden => 1, 1034 hidden => 1,
990 tooltip => "The password for your character", 1035 tooltip => "The password for your character",
991 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1036 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
992 ); 1037 );
993 1038
994 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1039 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
995 $table->add (1, 7, new CFClient::UI::Slider 1040 $table->add (1, 7, new CFPlus::UI::Slider
996 force_w => 100, 1041 force_w => 100,
997 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1042 range => [$CFG->{mapsize}, 10, 100, 0, 1],
998 tooltip => "This is the size of the portion of the map update the server sends you. " 1043 tooltip => "This is the size of the portion of the map update the server sends you. "
999 . "If you set this to a high value you will be able to see further, " 1044 . "If you set this to a high value you will be able to see further, "
1000 . "but you also increase bandwidth requirements and latency. " 1045 . "but you also increase bandwidth requirements and latency. "
1001 . "This option is only used once at log-in.", 1046 . "This option is only used once at log-in.",
1002 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1047 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1003 ); 1048 );
1004 1049
1005 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1050 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1006 $table->add (1, 8, new CFClient::UI::CheckBox 1051 $table->add (1, 8, new CFPlus::UI::CheckBox
1007 state => $CFG->{face_prefetch}, 1052 state => $CFG->{face_prefetch},
1008 tooltip => "<b>Background Image Prefetch</b>\n\n" 1053 tooltip => "<b>Background Image Prefetch</b>\n\n"
1009 . "If enabled, the client automatically pre-fetches images from the server. " 1054 . "If enabled, the client automatically pre-fetches images from the server. "
1010 . "This might increase or create lag, but increases the chances " 1055 . "This might increase or create lag, but increases the chances "
1011 . "of faces being ready for display when you encounter them. " 1056 . "of faces being ready for display when you encounter them. "
1013 . "so only set it if you really need to prefetch images. " 1058 . "so only set it if you really need to prefetch images. "
1014 . "This option can be set and unset any time.", 1059 . "This option can be set and unset any time.",
1015 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1060 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1016 ); 1061 );
1017 1062
1018 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1063 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1019 $table->add (1, 9, new CFClient::UI::Entry 1064 $table->add (1, 9, new CFPlus::UI::Entry
1020 text => $CFG->{output_count}, 1065 text => $CFG->{output_count},
1021 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1066 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1022 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1067 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1023 ); 1068 );
1024 1069
1025 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1070 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1026 $table->add (1, 10, new CFClient::UI::Entry 1071 $table->add (1, 10, new CFPlus::UI::Entry
1027 text => $CFG->{output_sync}, 1072 text => $CFG->{output_sync},
1028 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1073 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1029 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1074 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1030 ); 1075 );
1031 1076
1032 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1077 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1033 expand => 1, 1078 expand => 1,
1034 align => 0, 1079 align => 0,
1035 text => "Login", 1080 text => "Login",
1036 on_activate => sub { 1081 on_activate => sub {
1037 $CONN ? stop_game 1082 $CONN ? stop_game
1038 : start_game; 1083 : start_game;
1039 0 1084 0
1040 }, 1085 },
1041 ); 1086 );
1042 1087
1043 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1088 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1044 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1089 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1045 text => $CFG->{say_command}, 1090 text => $CFG->{say_command},
1046 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. " 1091 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. "
1047 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1092 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1048 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1093 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1049 on_changed => sub { 1094 on_changed => sub {
1050 my ($self, $value) = @_; 1095 my ($self, $value) = @_;
1051 $CFG->{say_command} = $value; 1096 $CFG->{say_command} = $value;
1052 0 1097 0
1053 } 1098 }
1054 ); 1099 );
1055 1100
1101 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1102 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1103 state => $CFG->{show_tips},
1104 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1105 on_changed => sub {
1106 my ($self, $value) = @_;
1107 $CFG->{show_tips} = $value;
1108 0
1109 }
1110 );
1111
1056 $vbox->add (new CFClient::UI::Label 1112 $vbox->add (new CFPlus::UI::FancyFrame
1057 text => "Server Info", 1113 label => "Server Info",
1058 fontsize => 1.2,
1059 padding_y => 8,
1060 fg => [1, 1, 0, 1],
1061 );
1062
1063 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0); 1114 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1115 );
1064 1116
1065 $vbox 1117 $vbox
1066} 1118}
1067 1119
1068sub message_window { 1120sub message_window {
1069 my $window = new CFClient::UI::FancyFrame 1121 my $window = new CFPlus::UI::Toplevel
1070 name => "message_window", 1122 name => "message_window",
1071 title => "Messages", 1123 title => "Messages",
1072 border_bg => [1, 1, 1, 1], 1124 border_bg => [1, 1, 1, 1],
1073 x => "max", 1125 x => "max",
1074 y => 0, 1126 y => 0,
1075 force_w => $::WIDTH * 0.4, 1127 force_w => $::WIDTH * 0.4,
1076 force_h => $::HEIGHT * 0.5, 1128 force_h => $::HEIGHT * 0.5,
1077 child => (my $vbox = new CFClient::UI::VBox), 1129 child => (my $vbox = new CFPlus::UI::VBox),
1078 has_close_button => 1; 1130 has_close_button => 1;
1079 1131
1080 $vbox->add ($LOGVIEW); 1132 $vbox->add ($LOGVIEW);
1081 1133
1082 $vbox->add (my $input = new CFClient::UI::Entry 1134 $vbox->add (my $input = new CFPlus::UI::Entry
1083 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1135 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1084 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1136 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1085 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1137 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1086 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 1138 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1087 on_focus_in => sub { 1139 on_focus_in => sub {
1126 }; 1178 };
1127 1179
1128 $window 1180 $window
1129} 1181}
1130 1182
1131sub open_quit_dialog {
1132 unless ($QUIT_DIALOG) {
1133 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1134 x => "center",
1135 y => "center",
1136 z => 50,
1137 title => "Really Quit?",
1138 ;
1139
1140 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1141
1142 $vb->add (new CFClient::UI::Label
1143 text => "You should find a savebed and apply it first!",
1144 max_w => $WIDTH * 0.25,
1145 ellipsize => 0,
1146 );
1147 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1148 $hb->add (new CFClient::UI::Button
1149 text => "Ok",
1150 expand => 1,
1151 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1152 );
1153 $hb->add (new CFClient::UI::Button
1154 text => "Quit anyway",
1155 expand => 1,
1156 on_activate => sub { exit },
1157 );
1158 }
1159
1160 $QUIT_DIALOG->show;
1161}
1162
1163sub autopickup_setup { 1183sub autopickup_setup {
1164 my $table = new CFClient::UI::Table; 1184 my $table = new CFPlus::UI::Table;
1165 1185
1166 for ( 1186 for (
1167 ["General", 0, 0, 1187 ["General", 0, 0,
1168 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1188 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1169 ["Inhibit autopickup" => PICKUP_INHIBIT], 1189 ["Inhibit autopickup" => PICKUP_INHIBIT],
1183 ["Boots" => PICKUP_BOOTS], 1203 ["Boots" => PICKUP_BOOTS],
1184 ["Gloves" => PICKUP_GLOVES], 1204 ["Gloves" => PICKUP_GLOVES],
1185 ["Cloaks" => PICKUP_CLOAK], 1205 ["Cloaks" => PICKUP_CLOAK],
1186 ], 1206 ],
1187 1207
1188 ["Readables", 2, 2, 1208 ["Readables", 2, 0,
1189 ["Spellbooks" => PICKUP_SPELLBOOK], 1209 ["Spellbooks" => PICKUP_SPELLBOOK],
1190 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1210 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1191 ["Normal Books/Scrolls" => PICKUP_READABLES], 1211 ["Normal Books/Scrolls" => PICKUP_READABLES],
1192 ], 1212 ],
1193 ["Misc", 2, 7, 1213 ["Misc", 2, 5,
1194 ["Food" => PICKUP_FOOD], 1214 ["Food" => PICKUP_FOOD],
1195 ["Drinks" => PICKUP_DRINK], 1215 ["Drinks" => PICKUP_DRINK],
1196 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1216 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1197 ["Keys" => PICKUP_KEY], 1217 ["Keys" => PICKUP_KEY],
1198 ["Magical Items" => PICKUP_MAGICAL], 1218 ["Magical Items" => PICKUP_MAGICAL],
1199 ["Potions" => PICKUP_POTION], 1219 ["Potions" => PICKUP_POTION],
1200 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1220 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1201 ["Ignore cursed" => PICKUP_NOT_CURSED], 1221 ["Ignore cursed" => PICKUP_NOT_CURSED],
1202 ["Jewelery" => PICKUP_JEWELS], 1222 ["Jewelery" => PICKUP_JEWELS],
1223 ["Flesh" => PICKUP_FLESH],
1203 ], 1224 ],
1204 ["Weight/Value ratio", 2, 17] 1225 ["Weight/Value ratio", 2, 17]
1205 ) 1226 )
1206 { 1227 {
1207 my ($title, $x, $y, @bits) = @$_; 1228 my ($title, $x, $y, @bits) = @$_;
1208 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1229 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1209 1230
1210 for (@bits) { 1231 for (@bits) {
1211 ++$y; 1232 ++$y;
1212 1233
1213 my $mask = $_->[1]; 1234 my $mask = $_->[1];
1214 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1235 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1215 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox 1236 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1216 state => $::CFG->{pickup} & $mask, 1237 state => $::CFG->{pickup} & $mask,
1217 on_changed => sub { 1238 on_changed => sub {
1218 my ($box, $value) = @_; 1239 my ($box, $value) = @_;
1219 1240
1220 if ($value) { 1241 if ($value) {
1231 1252
1232 ${$_->[2]} = $checkbox if $_->[2]; 1253 ${$_->[2]} = $checkbox if $_->[2];
1233 } 1254 }
1234 } 1255 }
1235 1256
1236 $table->add (2, 18, new CFClient::UI::ValSlider 1257 $table->add (2, 18, new CFPlus::UI::ValSlider
1237 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1258 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1238 template => ">= 99", 1259 template => ">= 99",
1239 to_value => sub { ">= " . 5 * $_[0] }, 1260 to_value => sub { ">= " . 5 * $_[0] },
1240 on_changed => sub { 1261 on_changed => sub {
1241 my ($slider, $value) = @_; 1262 my ($slider, $value) = @_;
1244 $::CFG->{pickup} |= int $value 1265 $::CFG->{pickup} |= int $value
1245 if $value; 1266 if $value;
1246 1; 1267 1;
1247 }); 1268 });
1248 1269
1249 $table->add (3, 18, new CFClient::UI::Button 1270 $table->add (3, 18, new CFPlus::UI::Button
1250 text => "set", 1271 text => "set",
1251 on_activate => sub { 1272 on_activate => sub {
1252 $::CONN->send_command ("pickup $::CFG->{pickup}") 1273 $::CONN->send_command ("pickup $::CFG->{pickup}")
1253 if defined $::CONN; 1274 if defined $::CONN;
1254 0 1275 0
1255 }); 1276 });
1256 1277
1257 $table 1278 $table
1258} 1279}
1259 1280
1281my %SORT_ORDER = (
1282 type => undef,
1283 mtime => sub {
1284 my $NOW = time;
1285 sort {
1286 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1287 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1288
1289 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1290 or $btime <=> $atime
1291 or $a->{type} <=> $b->{type}
1292 } @_
1293 },
1294 weight => sub { sort {
1295 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1296 or $a->{type} <=> $b->{type}
1297 } @_ },
1298);
1299
1260sub inventory_widget { 1300sub inventory_widget {
1261 my $hb = new CFClient::UI::HBox homogeneous => 1; 1301 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1262 1302
1263 $hb->add (my $vb1 = new CFClient::UI::VBox); 1303 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1264 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1304 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1265 1305
1266 $vb1->add (my $hb1 = new CFClient::UI::HBox); 1306 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1267 1307
1268 use sort 'stable'; 1308 use sort 'stable';
1269 1309
1270 $hb1->add (new CFClient::UI::Combobox 1310 $hb1->add (new CFPlus::UI::Selector
1271 value => undef, 1311 value => $::CFG->{inv_sort},
1272 options => [ 1312 options => [
1273 [undef, "Type/Name"], 1313 [type => "Type/Name"],
1274 [ 1314 [mtime => "Recent/Normal/Locked"],
1275 sub { sort {
1276 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1277 or $a->{type} <=> $b->{type}
1278 } @_ },
1279 "Weight/Type", 1315 [weight => "Weight/Type"],
1280 ],
1281 [sub { } => "#TODO#"],
1282 ], 1316 ],
1283 on_changed => sub { 1317 on_changed => sub {
1318 $::CFG->{inv_sort} = $_[1];
1284 $INV->set_sort_order ($_[1]); 1319 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1285 }, 1320 },
1286 ); 1321 );
1287 $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1); 1322 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1288 #TODO# update to weigh/maxweight 1323 #TODO# update to weigh/maxweight
1289 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1); 1324 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1290 1325
1291 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1326 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1292 $sw1->add ($INV = new CFClient::UI::Inventory); 1327 $sw1->add ($INV = new CFPlus::UI::Inventory);
1328 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1293 1329
1294 $hb->add (my $vb2 = new CFClient::UI::VBox); 1330 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1295 1331
1296 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1332 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1297 1333
1298 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1334 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1299 $sw2->add ($INVR = new CFClient::UI::Inventory); 1335 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1300 1336
1301 # XXX: Call after $INVR = ... because set_opencont sets the items 1337 # XXX: Call after $INVR = ... because set_opencont sets the items
1302 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1338 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1303 1339
1304 $hb 1340 $hb
1305} 1341}
1306 1342
1307sub toggle_player_page { 1343sub toggle_player_page {
1314 $PL_WINDOW->show; 1350 $PL_WINDOW->show;
1315 } 1351 }
1316} 1352}
1317 1353
1318sub player_window { 1354sub player_window {
1319 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1355 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1320 x => "center", 1356 x => "center",
1321 y => "center", 1357 y => "center",
1322 force_w => $WIDTH * 9/10, 1358 force_w => $WIDTH * 9/10,
1323 force_h => $HEIGHT * 9/10, 1359 force_h => $HEIGHT * 9/10,
1324 title => "Player", 1360 title => "Player",
1326 has_close_button => 1 1362 has_close_button => 1
1327 ; 1363 ;
1328 1364
1329 my $ntb = 1365 my $ntb =
1330 $PL_NOTEBOOK = 1366 $PL_NOTEBOOK =
1331 new CFClient::UI::Notebook expand => 1, debug => 1; 1367 new CFPlus::UI::Notebook expand => 1, debug => 1;
1332 1368
1333 $ntb->add ( 1369 $ntb->add (
1334 "Statistics (F2)" => $STATS_PAGE = stats_window, 1370 "Statistics (F2)" => $STATS_PAGE = stats_window,
1335 "Shows statistics, where all your Stats and Resistances are shown." 1371 "Shows statistics, where all your Stats and Resistances are shown."
1336 ); 1372 );
1337 $ntb->add ( 1373 $ntb->add (
1338 "Skills (F3)" => $SKILL_PAGE = skill_window, 1374 "Skills (F3)" => $SKILL_PAGE = skill_window,
1339 "Shows all your Skills." 1375 "Shows all your Skills."
1340 ); 1376 );
1341 1377
1342 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1378 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1343 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList); 1379 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1344 $ntb->add ( 1380 $ntb->add (
1345 "Spellbook (F4)" => $spellsw, 1381 "Spellbook (F4)" => $spellsw,
1346 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1382 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1347 ); 1383 );
1348 $ntb->add ( 1384 $ntb->add (
1355 1391
1356 $plwin->add ($ntb); 1392 $plwin->add ($ntb);
1357 $plwin 1393 $plwin
1358} 1394}
1359 1395
1360sub update_bindings {
1361 $BIND_UPD_CB->() if $BIND_UPD_CB;
1362}
1363
1364sub keyboard_setup { 1396sub keyboard_setup {
1365 my $binding_list = new CFClient::UI::VBox; 1397 CFPlus::Macro::keyboard_setup
1366
1367 my $refresh;
1368 $refresh = $BIND_UPD_CB = sub {
1369 $binding_list->clear ();
1370
1371 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1372 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1373 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1374 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1375
1376 my $lbl = join "; ", @$cmds;
1377 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1378 $binding_list->add (my $hb = new CFClient::UI::HBox);
1379 $hb->add (new CFClient::UI::Button
1380 text => "delete",
1381 tooltip => "Deletes the binding",
1382 on_activate => sub {
1383 $binding_list->remove ($hb);
1384 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1385 0
1386 });
1387
1388 $hb->add (new CFClient::UI::Button
1389 text => "edit",
1390 tooltip => "Edits the binding",
1391 on_activate => sub {
1392 $::BIND_EDITOR->set_binding (
1393 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1394 sub {
1395 my ($nmod, $nsym, $ncmds) = @_;
1396 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1397 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1398 $refresh->();
1399 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1400 $SETUP_DIALOG->show;
1401 },
1402 sub {
1403 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1404 $SETUP_DIALOG->show;
1405 });
1406 $::BIND_EDITOR->show;
1407 $SETUP_DIALOG->hide;
1408 0
1409 });
1410
1411 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1412 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1413 }
1414 }
1415 };
1416
1417 my $vb = new CFClient::UI::VBox;
1418 $vb->add (my $hb = new CFClient::UI::HBox);
1419 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1420 $hb->add (new CFClient::UI::CheckBox
1421 expand => 1,
1422 state => $CFG->{shift_fire_stop},
1423 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1424 on_changed => sub {
1425 my ($cbox, $value) = @_;
1426 $CFG->{shift_fire_stop} = $value;
1427 0
1428 });
1429
1430 $vb->add ($binding_list);
1431 $vb->add (my $hb = new CFClient::UI::HBox);
1432
1433 $hb->add (new CFClient::UI::Button
1434 text => "record new",
1435 expand => 1,
1436 tooltip => "This button opens the binding editor with an empty binding.",
1437 on_activate => sub {
1438 $::BIND_EDITOR->set_binding (undef, undef, [],
1439 sub {
1440 my ($mod, $sym, $cmds) = @_;
1441 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1442 $refresh->();
1443 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1444 $SETUP_DIALOG->show;
1445 },
1446 sub {
1447 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1448 $SETUP_DIALOG->show;
1449 },
1450 );
1451 $SETUP_DIALOG->hide;
1452 $::BIND_EDITOR->show;
1453 0
1454 },
1455 );
1456
1457 $hb->add (new CFClient::UI::Button
1458 text => "close",
1459 tooltip => "Closes the binding window",
1460 expand => 1,
1461 on_activate => sub {
1462 $SETUP_DIALOG->hide;
1463 0
1464 }
1465 );
1466
1467 $refresh->();
1468
1469 $vb
1470}
1471
1472# just weirdness, pls. ignore
1473sub load_html_page {
1474 my ($viewer, $base) = @_;
1475
1476 $viewer->clear;
1477
1478 require LWP::Simple;
1479 require HTML::Parser;
1480 require URI;
1481
1482 my $page = LWP::Simple::get ($base)
1483 or return;
1484
1485 my @s = { };
1486 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1487
1488 my $parser = HTML::Parser->new (
1489 text_h => [sub {
1490 my ($text) = @_;
1491 $text =~ s/\s+/ /g;
1492 $s[-1]{text} .= CFClient::asxml $text;
1493 }, "dtext"],
1494 start_h => [sub {
1495 my ($tag, $attr) = @_;
1496 if ($passthrough{$tag}) {
1497 $s[-1]{text} .= "<$tag>";
1498 } elsif ($tag eq "h1") {
1499 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1500 } elsif ($tag eq "h2") {
1501 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1502 } elsif ($tag eq "h3") {
1503 push @s, { text => "<span size='large'>" };
1504 } elsif ($tag eq "a") {
1505 push @s, { text => "", url => $attr->{href} };
1506 } elsif ($tag eq "p") {
1507 push @s, { };
1508 } elsif ($tag eq "img") {
1509 eval {
1510 push @{$s[-1]{obj}}, new CFClient::UI::Image
1511 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1512 $s[-1]{text} .= "\x{fffc}";
1513 };
1514 }
1515 }, "tagname, attr"],
1516 end_h => [sub {
1517 my ($tag) = @_;
1518 if ($passthrough{$tag}) {
1519 $s[-1]{text} .= "</$tag>";
1520 } elsif ($tag =~ /^h\d$/) {
1521 $s[-1]{text} .= "</span>";
1522 push @s, { };
1523 } elsif ($tag eq "a") {
1524 my $S = pop @s;
1525 $s[-1]{text} .= "\x{fffc}";
1526 push @{$s[-1]{obj}}, new CFClient::UI::Label
1527 fg => [0.8, 0.8, 1],
1528 markup => "<u>$S->{text}</u>",
1529 fontsize => 0.8,
1530 can_events => 1,
1531 can_focus => 1,
1532 on_button_up => sub {
1533 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1534 },
1535 ;
1536 }
1537 }, "tagname"],
1538 );
1539
1540 $parser->parse ($page);
1541 $parser->eof;
1542
1543 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1544 for @s;
1545
1546 $viewer->set_offset (0);
1547} 1398}
1548 1399
1549sub help_window { 1400sub help_window {
1550 my $win = new CFClient::UI::FancyFrame 1401 my $win = new CFPlus::UI::Toplevel
1551 x => 'center', 1402 x => 'center',
1552 y => 'center', 1403 y => 'center',
1553 z => 2, 1404 z => 4,
1554 name => 'doc_browser', 1405 name => 'doc_browser',
1555 force_w => int $WIDTH * 7/8, 1406 force_w => int $WIDTH * 7/8,
1556 force_h => int $HEIGHT * 7/8, 1407 force_h => int $HEIGHT * 7/8,
1557 title => "Help Browser", 1408 title => "Help Browser",
1558 has_close_button => 1; 1409 has_close_button => 1;
1559 1410
1560 $win->add (my $vbox = new CFClient::UI::VBox); 1411 $win->add (my $vbox = new CFPlus::UI::VBox);
1561 1412
1562 $vbox->add (my $buttons = new CFClient::UI::HBox); 1413 $vbox->add (new CFPlus::UI::FancyFrame
1414 label => "Navigation",
1415 child => (my $buttons = new CFPlus::UI::HBox),
1416 );
1563 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1417 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1564 expand => 1, fontsize => 0.8, padding_x => 4); 1418 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1565 1419
1566 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1420 my @history;
1567 $buttons->add (my $combo = new CFClient::UI::Combobox 1421 my @future;
1568 value => undef, 1422 my $curnode;
1569 options => [ 1423
1570 [intro => "Introduction"], 1424 my $load_node; $load_node = sub {
1571 [manual => "Main Manual"], 1425 my ($node, $para) = @_;
1572 [skill_help => "Skill Reference"], 1426
1573 [command_help => "Command Reference"], 1427 $buttons->clear;
1574 [dmcommand_help => "DM Commands"], 1428
1575 [COPYING => "License Terms"], 1429 $buttons->add (new CFPlus::UI::Button
1576 [test => "test (do not select)"], #d#TODO 1430 text => "⇤",
1577 ], 1431 tooltip => "back to the starting page",
1578 on_changed => sub { 1432 on_activate => sub {
1579 my ($self, $pod) = @_; 1433 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1434 unshift @future, @history;
1435 @history = ();
1436 $load_node->(@{shift @future});
1437 },
1438 );
1580 1439
1581 if ($pod eq "test") {#d#TODO 1440 if (@history) {
1582 eval { 1441 $buttons->add (new CFPlus::UI::Button
1583 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html"; 1442 text => "⋘",
1443 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1444 on_activate => sub {
1445 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1446 $load_node->(@{pop @history});
1584 }; 1447 },
1585 warn "$@" if $@; 1448 );
1586 return; 1449 }
1450
1451 if (@future) {
1452 $buttons->add (new CFPlus::UI::Button
1453 text => "⋙",
1454 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1455 on_activate => sub {
1456 push @history, [$curnode, $viewer->current_paragraph];
1457 $load_node->(@{shift @future});
1458 },
1459 );
1460 }
1461
1462 $buttons->add (new CFPlus::UI::Label text => " ");
1463
1464 my @path = CFPlus::Pod::full_path_of $node;
1465 pop @path; # drop current node
1466
1467 for my $node (@path) {
1468 $buttons->add (new CFPlus::UI::Button
1469 text => $node->{kw}[0],
1470 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1471 on_activate => sub {
1472 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1473 $load_node->($node);
1474 },
1475 );
1476 $buttons->add (new CFPlus::UI::Label text => "/");
1477 }
1478
1479 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1480
1481 $curnode = $node;
1482
1483 $viewer->clear;
1484 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1485 $viewer->scroll_to ($para);
1486 };
1487
1488 $load_node->(CFPlus::Pod::find pod => "mainpage");
1489
1490 $CFPlus::Pod::goto_document = sub {
1491 my (@path) = @_;
1492
1493 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1494
1495 $load_node->((CFPlus::Pod::find @path)[0]);
1496 $win->show;
1497 };
1498
1499 $win
1500}
1501
1502sub open_string_query {
1503 my ($title, $cb, $txt, $tooltip) = @_;
1504 my $dialog = new CFPlus::UI::Toplevel
1505 x => "center",
1506 y => "center",
1507 z => 50,
1508 force_w => $WIDTH * 4/5,
1509 title => $title;
1510
1511 $dialog->add (
1512 my $e = new CFPlus::UI::Entry
1513 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1514 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1515 tooltip => $tooltip
1516 );
1517
1518 $e->grab_focus;
1519 $e->set_text ($txt) if $txt;
1520 $dialog->show;
1521}
1522
1523sub open_quit_dialog {
1524 unless ($QUIT_DIALOG) {
1525 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1526 x => "center",
1527 y => "center",
1528 z => 50,
1529 title => "Really Quit?",
1530 on_key_down => sub {
1531 my ($dialog, $ev) = @_;
1532 $ev->{sym} == 27 and $dialog->hide;
1587 } 1533 }
1588
1589 my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",
1590 doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
1591
1592 #use Data::Dumper; warn Dumper $pom;#d#
1593
1594 $viewer->clear;
1595
1596# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1597# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1598# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1599# ]);#d#
1600 1534 ;
1601 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1602 for @$pom;
1603 1535
1604 $viewer->set_offset (0); 1536 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1605 1537
1606 0 1538 $vb->add (new CFPlus::UI::Label
1539 text => "You should find a savebed and apply it first!",
1540 max_w => $WIDTH * 0.25,
1541 ellipsize => 0,
1542 );
1543 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1544 $hb->add (new CFPlus::UI::Button
1545 text => "Ok",
1546 expand => 1,
1547 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1548 );
1549 $hb->add (new CFPlus::UI::Button
1550 text => "Quit anyway",
1551 expand => 1,
1552 on_activate => sub { exit },
1553 );
1554 }
1555
1556 $QUIT_DIALOG->show;
1557 $QUIT_DIALOG->grab_focus;
1558}
1559
1560sub show_tip_of_the_day {
1561 # find all tips
1562 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1563
1564 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1565 $todindex = 0 if $todindex >= @tod;
1566 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1567
1568 # create dialog
1569 my $dialog;
1570
1571 my $close = sub {
1572 $dialog->destroy;
1573 };
1574
1575 $dialog = new CFPlus::UI::Toplevel
1576 x => "center",
1577 y => "center",
1578 z => 3,
1579 name => 'tip_of_the_day',
1580 force_w => int $WIDTH * 4/9,
1581 force_h => int $WIDTH * 2/9,
1582 title => "Tip of the day #" . (1 + $todindex),
1583 child => my $vbox = new CFPlus::UI::VBox,
1584 has_close_button => 1,
1585 on_delete => $close,
1586 ;
1587
1588 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1589 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1590 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1591
1592 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1593
1594 $table->add (0, 0, new CFPlus::UI::Button
1595 text => "Close",
1596 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>.",
1597 on_activate => $close,
1598 );
1599
1600 $table->add (2, 0, new CFPlus::UI::Button
1601 text => "Next",
1602 tooltip => "Show the next <b>Tip of the day</b>.",
1603 on_activate => sub {
1604 $close->();
1605 &show_tip_of_the_day;
1607 }, 1606 },
1608 on_visibility_change => sub {
1609 my ($self, $visible) = @_;
1610 return unless $visible;
1611 return if $self->{value};
1612 $self->set_value ("intro");
1613 0
1614 },
1615 ); 1607 );
1616 1608
1617 $win 1609 $dialog->show;
1618} 1610}
1619 1611
1620sub sdl_init { 1612sub sdl_init {
1621 CFClient::SDL_Init 1613 CFPlus::SDL_Init
1622 and die "SDL::Init failed!\n"; 1614 and die "SDL::Init failed!\n";
1623} 1615}
1624 1616
1625sub video_init { 1617sub video_init {
1626 sdl_init; 1618 sdl_init;
1631 1623
1632 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1624 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1633 $FULLSCREEN = $CFG->{fullscreen}; 1625 $FULLSCREEN = $CFG->{fullscreen};
1634 $FAST = $CFG->{fast}; 1626 $FAST = $CFG->{fast};
1635 1627
1636 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1628 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1637 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1629 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1638 1630
1639 $SDL_ACTIVE = 1; 1631 $SDL_ACTIVE = 1;
1640 $LAST_REFRESH = time - 0.01; 1632 $LAST_REFRESH = time - 0.01;
1641 1633
1642 CFClient::OpenGL::init; 1634 CFPlus::OpenGL::init;
1643 1635
1644 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1636 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1645 1637
1646 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1638 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1647 1639
1648 ############################################################################# 1640 #############################################################################
1649 1641
1650 if ($DEBUG_STATUS) { 1642 if ($DEBUG_STATUS) {
1651 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1643 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1652 } else { 1644 } else {
1653 # create the widgets 1645 # create the widgets
1654 1646
1655 $DEBUG_STATUS = new CFClient::UI::Label 1647 $DEBUG_STATUS = new CFPlus::UI::Label
1656 padding => 0, 1648 padding => 0,
1657 z => 100, 1649 z => 100,
1658 force_x => "max", 1650 force_x => "max",
1659 force_y => 0; 1651 force_y => 0;
1660 $DEBUG_STATUS->show; 1652 $DEBUG_STATUS->show;
1661 1653
1662 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1663
1664 $STATUSBOX = new CFClient::UI::Statusbox; 1654 $STATUSBOX = new CFPlus::UI::Statusbox;
1665 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1655 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1666 1656
1667 (new CFClient::UI::Frame 1657 (new CFPlus::UI::Frame
1668 bg => [0, 0, 0, 0.4], 1658 bg => [0, 0, 0, 0.4],
1669 force_x => 0, 1659 force_x => 0,
1670 force_y => "max", 1660 force_y => "max",
1671 child => $STATUSBOX, 1661 child => $STATUSBOX,
1672 )->show; 1662 )->show;
1673 1663
1674 CFClient::UI::FancyFrame->new ( 1664 CFPlus::UI::Toplevel->new (
1675 title => "Map", 1665 title => "Map",
1676 name => "mapmap", 1666 name => "mapmap",
1677 x => 0, 1667 x => 0,
1678 y => $FONTSIZE + 8, 1668 y => $FONTSIZE + 8,
1679 border_bg => [1, 1, 1, 192/255], 1669 border_bg => [1, 1, 1, 192/255],
1680 bg => [1, 1, 1, 0], 1670 bg => [1, 1, 1, 0],
1681 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1671 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1682 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1672 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1683 ), 1673 ),
1684 )->show; 1674 )->show;
1685 1675
1686 $MAPWIDGET = new CFClient::MapWidget; 1676 $MAPWIDGET = new CFPlus::MapWidget;
1687 $MAPWIDGET->connect (activate_console => sub { 1677 $MAPWIDGET->connect (activate_console => sub {
1688 my ($mapwidget, $preset) = @_; 1678 my ($mapwidget, $preset) = @_;
1689 1679
1690 if ($CONSOLE) { 1680 if ($CONSOLE) {
1691 $CONSOLE->{input}->{auto_activated} = 1; 1681 $CONSOLE->{input}->{auto_activated} = 1;
1697 } 1687 }
1698 }); 1688 });
1699 $MAPWIDGET->show; 1689 $MAPWIDGET->show;
1700 $MAPWIDGET->grab_focus; 1690 $MAPWIDGET->grab_focus;
1701 1691
1702 $LOGVIEW = new CFClient::UI::TextScroller 1692 $LOGVIEW = new CFPlus::UI::TextScroller
1703 expand => 1, 1693 expand => 1,
1704 font => $FONT_FIXED, 1694 font => $FONT_FIXED,
1705 fontsize => $::CFG->{log_fontsize}, 1695 fontsize => $::CFG->{log_fontsize},
1706 indent => -4, 1696 indent => -4,
1707 can_hover => 1, 1697 can_hover => 1,
1708 can_events => 1, 1698 can_events => 1,
1709 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1699 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1710 ; 1700 ;
1711 1701
1712 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1702 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1713 title => "Setup", 1703 title => "Setup",
1714 name => "setup_dialog", 1704 name => "setup_dialog",
1715 x => 'center', 1705 x => 'center',
1716 y => 'center', 1706 y => 'center',
1717 z => 2, 1707 z => 2,
1720 has_close_button => 1, 1710 has_close_button => 1,
1721 ; 1711 ;
1722 1712
1723 $METASERVER = metaserver_dialog; 1713 $METASERVER = metaserver_dialog;
1724 1714
1725 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1715 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1726 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1716 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1727 1717
1728 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1718 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1729 "Configure the server to play on, your username, password and other server-related options."); 1719 "Configure the server to play on, your username, password and other server-related options.");
1730 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1720 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1731 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1721 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1741 . "After pressing the combo the binding will be saved automatically and the " 1731 . "After pressing the combo the binding will be saved automatically and the "
1742 . "binding editor closes"); 1732 . "binding editor closes");
1743 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1733 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1744 "Some debuggin' options. Do not ask."); 1734 "Some debuggin' options. Do not ask.");
1745 1735
1746 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1736 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1747 1737
1748 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1738 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1749 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1739 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1750 1740
1751 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1741 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1752 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1742 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1753 1743
1754 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 1744 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
1755 1745
1756 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window, 1746 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1757 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 1747 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1758 1748
1759 $BUTTONBAR->add (new CFClient::UI::Button 1749 $BUTTONBAR->add (new CFPlus::UI::Button
1760 text => "Save Config", 1750 text => "Save Config",
1761 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1751 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1762 on_activate => sub { 1752 on_activate => sub {
1763 $::CFG->{layout} = CFClient::UI::get_layout; 1753 $::CFG->{layout} = CFPlus::UI::get_layout;
1764 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1754 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1765 status "Configuration Saved"; 1755 status "Configuration Saved";
1766 0 1756 0
1767 }, 1757 },
1768 ); 1758 );
1769 1759
1770 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1760 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1771 tooltip => "View Documentation"); 1761 tooltip => "View Documentation");
1772 1762
1763
1773 $BUTTONBAR->add (new CFClient::UI::Button 1764 $BUTTONBAR->add (new CFPlus::UI::Button
1774 text => "Quit", 1765 text => "Quit",
1775 tooltip => "Terminates the program", 1766 tooltip => "Terminates the program",
1776 on_activate => sub { 1767 on_activate => sub {
1777 if ($CONN) { 1768 if ($CONN) {
1778 open_quit_dialog; 1769 open_quit_dialog;
1788 } 1779 }
1789 1780
1790 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1781 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1791} 1782}
1792 1783
1784sub setup_build_button {
1785 my ($enabled) = @_;
1786 if ($enabled) {
1787 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1788 $BUILD_BUTTON ||= new CFPlus::UI::Button
1789 text => "Build",
1790 tooltip => "Opens the ingame builder",
1791 on_activate => sub {
1792 if ($CONN) {
1793 $CONN->send_ext_req (builder_player_items => sub {
1794 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1795 });
1796 }
1797 0
1798 };
1799 $BUTTONBAR->add ($BUILD_BUTTON);
1800 } else {
1801 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1802 }
1803}
1804
1805sub open_ingame_editor {
1806 my ($msg) = @_;
1807
1808 my $win = new CFPlus::UI::Toplevel
1809 x => 0,
1810 y => 'center',
1811 z => 4,
1812 name => 'builder_window',
1813 force_w => int $WIDTH * 1/4,
1814 force_h => int $HEIGHT * 3/4,
1815 title => "In game builder",
1816 has_close_button => 1;
1817
1818 my $r = new CFPlus::UI::ScrolledWindow (
1819 expand => 1,
1820 scroll_y => 1
1821 );
1822 $r->add (my $vb = new CFPlus::UI::VBox);
1823 $win->add ($r);
1824
1825
1826 $vb->add (
1827 new CFPlus::UI::Button
1828 text => "Disable build mode",
1829 on_activate => sub { $::IN_BUILD_MODE = undef }
1830 );
1831 $vb->add (
1832 new CFPlus::UI::Button
1833 text => "ERASE",
1834 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1835 );
1836
1837 for my $itemarchname (
1838 sort {
1839 $msg->{items}->{$a}->{build_arch_name}
1840 cmp $msg->{items}->{$b}->{build_arch_name}
1841 } keys %{$msg->{items}}
1842 ) {
1843 my $info = $msg->{items}->{$itemarchname};
1844 $vb->add (
1845 new CFPlus::UI::Button text => $info->{build_arch_name},
1846 on_activate => sub {
1847 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1848
1849 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1850 build_mode_query_arch_info ();
1851 }
1852 }
1853 );
1854 }
1855
1856 $win->show;
1857}
1858
1859sub build_mode_query_arch_info {
1860 my ($iteminfo) = $::IN_BUILD_MODE;
1861 my $itemarchname = $iteminfo->{item};
1862 my $info = $iteminfo->{info};
1863
1864 my $dialog = new CFPlus::UI::Toplevel
1865 x => "center",
1866 y => "center",
1867 z => 50,
1868 force_w => int $WIDTH * 1/2,
1869 title => "Enter information for placement of '$itemarchname'",
1870 has_close_button => 1;
1871
1872 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1873
1874 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1875 my $row = 0;
1876 if ($info->{has_name}) {
1877 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1878 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1879 }
1880 if ($info->{has_text}) {
1881 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1882 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1883 }
1884 if ($info->{has_connection}) {
1885 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1886 $table->add (1, $row++,
1887 new CFPlus::UI::Entry
1888 expand => 1,
1889 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1890 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1891 );
1892 }
1893
1894 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1895 $hb->add (new CFPlus::UI::Button
1896 text => "Close",
1897 expand => 1,
1898 on_activate => sub { $dialog->hide; 0 },
1899 );
1900 $dialog->show;
1901}
1902
1793sub video_shutdown { 1903sub video_shutdown {
1794 CFClient::OpenGL::shutdown; 1904 CFPlus::OpenGL::shutdown;
1795 1905
1796 undef $SDL_ACTIVE; 1906 undef $SDL_ACTIVE;
1797} 1907}
1798 1908
1799my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1909my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1807 1917
1808sub audio_music_finished { 1918sub audio_music_finished {
1809 return unless $CFG->{bgm_enable}; 1919 return unless $CFG->{bgm_enable};
1810 1920
1811 # TODO: hack, do play loop and mood music 1921 # TODO: hack, do play loop and mood music
1812 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]"; 1922 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1813 $bgmusic->play (0); 1923 $bgmusic->play (0);
1814 1924
1815 push @bgmusic, shift @bgmusic; 1925 push @bgmusic, shift @bgmusic;
1816} 1926}
1817 1927
1818sub audio_init { 1928sub audio_init {
1819 if ($CFG->{audio_enable}) { 1929 if ($CFG->{audio_enable}) {
1820 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1930 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1821 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1931 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1822 1932
1823 unless ($SDL_MIXER) { 1933 unless ($SDL_MIXER) {
1824 status "Unable to open sound device: there will be no sound"; 1934 status "Unable to open sound device: there will be no sound";
1825 return; 1935 return;
1826 } 1936 }
1827 1937
1828 CFClient::Mix_AllocateChannels 8; 1938 CFPlus::Mix_AllocateChannels 8;
1829 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1939 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1830 1940
1831 audio_music_finished; 1941 audio_music_finished;
1832 1942
1943 local $_;
1833 while (<$fh>) { 1944 while (<$fh>) {
1834 next if /^\s*#/; 1945 next if /^\s*#/;
1835 next if /^\s*$/; 1946 next if /^\s*$/;
1836 1947
1837 my ($file, $volume, $event) = split /\s+/, $_, 3; 1948 my ($file, $volume, $event) = split /\s+/, $_, 3;
1838 1949
1839 push @SOUNDS, "$volume,$file"; 1950 push @SOUNDS, "$volume,$file";
1840 1951
1841 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1952 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1842 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; 1953 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1843 $chunk->volume ($volume * 128 / 100); 1954 $chunk->volume ($volume * 128 / 100);
1844 $chunk 1955 $chunk
1845 }; 1956 };
1846 } 1957 }
1847 } else { 1958 } else {
1849 } 1960 }
1850 } 1961 }
1851} 1962}
1852 1963
1853sub audio_shutdown { 1964sub audio_shutdown {
1854 CFClient::Mix_CloseAudio if $SDL_MIXER; 1965 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1855 undef $SDL_MIXER; 1966 undef $SDL_MIXER;
1856 @SOUNDS = (); 1967 @SOUNDS = ();
1857 %AUDIO_CHUNKS = (); 1968 %AUDIO_CHUNKS = ();
1858} 1969}
1859 1970
1866 1977
1867sub force_refresh { 1978sub force_refresh {
1868 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1979 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1869 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1980 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1870 1981
1871 $CFClient::UI::ROOT->draw; 1982 $CFPlus::UI::ROOT->draw;
1872 1983
1873 $WANT_REFRESH = 0; 1984 $WANT_REFRESH = 0;
1874 $CAN_REFRESH = 0; 1985 $CAN_REFRESH = 0;
1875 $LAST_REFRESH = $NOW; 1986 $LAST_REFRESH = $NOW;
1876 1987
1877 CFClient::SDL_GL_SwapBuffers; 1988 CFPlus::SDL_GL_SwapBuffers;
1878} 1989}
1879 1990
1880my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1991my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1881 $NOW = time; 1992 $NOW = time;
1882 1993
1883 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1994 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1884 for CFClient::SDL_PollEvent; 1995 for CFPlus::SDL_PollEvent;
1885 1996
1886 if (%animate_object) { 1997 if (%animate_object) {
1887 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1998 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1888 $WANT_REFRESH++; 1999 $WANT_REFRESH++;
1889 } 2000 }
1913 $CONN->face_prefetch 2024 $CONN->face_prefetch
1914 if $CONN; 2025 if $CONN;
1915}); 2026});
1916 2027
1917%SDL_CB = ( 2028%SDL_CB = (
1918 CFClient::SDL_QUIT => sub { 2029 CFPlus::SDL_QUIT => sub {
1919 Event::unloop -1; 2030 Event::unloop -1;
1920 }, 2031 },
1921 CFClient::SDL_VIDEORESIZE => sub { 2032 CFPlus::SDL_VIDEORESIZE => sub {
1922 }, 2033 },
1923 CFClient::SDL_VIDEOEXPOSE => sub { 2034 CFPlus::SDL_VIDEOEXPOSE => sub {
1924 CFClient::UI::full_refresh; 2035 CFPlus::UI::full_refresh;
1925 }, 2036 },
1926 CFClient::SDL_ACTIVEEVENT => sub { 2037 CFPlus::SDL_ACTIVEEVENT => sub {
1927# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2038# not useful, as APPACTIVE include sonly iconified state, not unmapped
2039# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2040# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2041# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2042# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1928 }, 2043 },
1929 CFClient::SDL_KEYDOWN => sub { 2044 CFPlus::SDL_KEYDOWN => sub {
1930 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2045 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1931 # alt-enter 2046 # alt-enter
1932 $FULLSCREEN_ENABLE->toggle; 2047 $FULLSCREEN_ENABLE->toggle;
1933 video_shutdown; 2048 video_shutdown;
1934 video_init; 2049 video_init;
1935 } else { 2050 } else {
1936 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2051 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1937 } 2052 }
1938 }, 2053 },
1939 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2054 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1940 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2055 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1941 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2056 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1942 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2057 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1943 CFClient::SDL_USEREVENT => sub { 2058 CFPlus::SDL_USEREVENT => sub {
1944 if ($_[0]{code} == 1) { 2059 if ($_[0]{code} == 1) {
1945 audio_channel_finished $_[0]{data1}; 2060 audio_channel_finished $_[0]{data1};
1946 } elsif ($_[0]{code} == 0) { 2061 } elsif ($_[0]{code} == 0) {
1947 audio_music_finished; 2062 audio_music_finished;
1948 } 2063 }
1952############################################################################# 2067#############################################################################
1953 2068
1954$SIG{INT} = $SIG{TERM} = sub { exit }; 2069$SIG{INT} = $SIG{TERM} = sub { exit };
1955 2070
1956{ 2071{
1957 local $SIG{__DIE__} = sub {
1958 return unless defined $^S && !$^S;
1959 Carp::confess $_[0];#d#TODO: remove when stable
1960 CFClient::fatal $_[0];
1961 };
1962
1963 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2072 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1964 CFClient::UI::set_layout ($::CFG->{layout}); 2073 CFPlus::UI::set_layout ($::CFG->{layout});
1965 2074
1966 my %DEF_CFG = ( 2075 my %DEF_CFG = (
1967 sdl_mode => 0, 2076 sdl_mode => 0,
1968 width => 640, 2077 width => 640,
1969 height => 480, 2078 height => 480,
1977 log_fontsize => 0.7, 2086 log_fontsize => 0.7,
1978 gauge_fontsize => 1, 2087 gauge_fontsize => 1,
1979 gauge_size => 0.35, 2088 gauge_size => 0.35,
1980 stat_fontsize => 0.7, 2089 stat_fontsize => 0.7,
1981 mapsize => 100, 2090 mapsize => 100,
1982 say_command => 'say', 2091 say_command => 'chat',
1983 audio_enable => 1, 2092 audio_enable => 1,
1984 bgm_enable => 1, 2093 bgm_enable => 1,
1985 bgm_volume => 0.25, 2094 bgm_volume => 0.25,
1986 face_prefetch => 0, 2095 face_prefetch => 0,
1987 output_sync => 1, 2096 output_sync => 1,
1988 output_count => 1, 2097 output_count => 1,
1989 pickup => 0, 2098 pickup => 0,
2099 inv_sort => "mtime",
1990 default => "profile", # default profile 2100 default => "profile", # default profile
2101 show_tips => 1,
1991 ); 2102 );
1992 2103
1993 while (my ($k, $v) = each %DEF_CFG) { 2104 while (my ($k, $v) = each %DEF_CFG) {
1994 $CFG->{$k} = $v unless exists $CFG->{$k}; 2105 $CFG->{$k} = $v unless exists $CFG->{$k};
1995 } 2106 }
1996 2107
1997 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2108 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2109 $PROFILE = $CFG->{profile}{default};
2110
2111 # convert old bindings (only default profile matters)
2112 if (my $bindings = delete $PROFILE->{bindings}) {
2113 while (my ($mod, $syms) = each %$bindings) {
2114 while (my ($sym, $cmds) = each %$syms) {
2115 push @{ $PROFILE->{macro} }, {
2116 accelkey => [$mod*1, $sym*1],
2117 action => $cmds,
2118 };
2119 }
2120 }
2121 }
1998 2122
1999 sdl_init; 2123 sdl_init;
2000 2124
2001 @SDL_MODES = reverse 2125 @SDL_MODES = reverse
2002 grep $_->[0] >= 640 && $_->[1] >= 480, 2126 grep $_->[0] >= 640 && $_->[1] >= 480,
2003 CFClient::SDL_ListModes; 2127 CFPlus::SDL_ListModes;
2004 2128
2005 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2129 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2006 2130
2007 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2131 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2008 2132
2009 { 2133 {
2010 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2134 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2011 DejaVuSans.ttf 2135 DejaVuSans.ttf
2012 DejaVuSansMono.ttf 2136 DejaVuSansMono.ttf
2013 DejaVuSans-Bold.ttf 2137 DejaVuSans-Bold.ttf
2014 DejaVuSansMono-Bold.ttf 2138 DejaVuSansMono-Bold.ttf
2015 DejaVuSans-Oblique.ttf 2139 DejaVuSans-Oblique.ttf
2016 DejaVuSansMono-Oblique.ttf 2140 DejaVuSansMono-Oblique.ttf
2017 DejaVuSans-BoldOblique.ttf 2141 DejaVuSans-BoldOblique.ttf
2018 DejaVuSansMono-BoldOblique.ttf 2142 DejaVuSansMono-BoldOblique.ttf
2019 ); 2143 );
2020 2144
2021 CFClient::add_font $_ for @fonts; 2145 CFPlus::add_font $_ for @fonts;
2022 2146
2023 CFClient::pango_init; 2147 CFPlus::pango_init;
2024 2148
2025 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2149 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2026 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2150 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2027 2151
2028 $FONT_PROP->make_default; 2152 $FONT_PROP->make_default;
2029 } 2153 }
2030 2154
2031# compare mono (ft) vs. rgba (cairo) 2155# compare mono (ft) vs. rgba (cairo)
2032# ft - 1.8s, cairo 3s, even in alpha-only mode 2156# ft - 1.8s, cairo 3s, even in alpha-only mode
2033# for my $rgba (0..1) { 2157# for my $rgba (0..1) {
2034# my $t1 = Time::HiRes::time; 2158# my $t1 = Time::HiRes::time;
2035# for (1..1000) { 2159# for (1..1000) {
2036# my $layout = CFClient::Layout->new ($rgba); 2160# my $layout = CFPlus::Layout->new ($rgba);
2037# $layout->set_text ("hallo" x 100); 2161# $layout->set_text ("hallo" x 100);
2038# $layout->render; 2162# $layout->render;
2039# } 2163# }
2040# my $t2 = Time::HiRes::time; 2164# my $t2 = Time::HiRes::time;
2041# warn $t2-$t1; 2165# warn $t2-$t1;
2042# } 2166# }
2043 2167
2168 $startup_done->();
2169
2044 video_init; 2170 video_init;
2045 audio_init; 2171 audio_init;
2046} 2172}
2047 2173
2174show_tip_of_the_day if $CFG->{show_tips};
2175
2048Event::loop; 2176Event::loop;
2049#CFClient::SDL_Quit; 2177#CFPlus::SDL_Quit;
2050#CFClient::_exit 0; 2178#CFPlus::_exit 0;
2051 2179
2052END { CFClient::SDL_Quit } 2180END { CFPlus::SDL_Quit }
2053 2181
2054=head1 NAME 2182=head1 NAME
2055 2183
2056cfplus - A Crossfire+ and Crossfire game client 2184cfplus - A Crossfire+ and Crossfire game client
2057 2185

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines