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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines