ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines