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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines