ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.70 by elmex, Tue Jun 13 10:28:38 2006 UTC vs.
Revision 1.178 by root, Fri Jul 20 16:32:04 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines