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.70 by elmex, Tue Jun 13 10:28:38 2006 UTC vs.
Revision 1.162 by root, Thu Jul 5 07:06:05 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines