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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines