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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines