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.101 by elmex, Sun Jul 23 17:03:44 2006 UTC vs.
Revision 1.146 by root, Wed Apr 4 02:43:30 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines