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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines