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.79 by root, Fri Jun 23 23:54:31 2006 UTC vs.
Revision 1.191 by root, Sun Jul 29 21:31:48 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 path => "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 0
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]; 0 },
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 }
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 }
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; 0 },
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 approximate 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 images, to ensure interactiveness. 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.",
1029 . "of faces being ready for display when you encounter them. "
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 }, 1122 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1034 ); 1123 );
1035 1124
1036 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1125 $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 1126 $table->add_at (1, 9, new CFPlus::UI::Entry
1038 text => $CFG->{output_count}, 1127 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.", 1128 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 }, 1129 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1041 ); 1130 );
1042 1131
1043 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1132 $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 1133 $table->add_at (1, 10, new CFPlus::UI::Entry
1045 text => $CFG->{output_sync}, 1134 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.", 1135 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 }, 1136 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1048 ); 1137 );
1049 1138
1050 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1139 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1051 expand => 1, 1140 expand => 1,
1052 align => 0, 1141 align => 0,
1053 text => "Login", 1142 text => "Login",
1054 on_activate => sub { 1143 on_activate => sub {
1055 $CONN ? stop_game 1144 $CONN ? stop_game
1056 : start_game; 1145 : start_game;
1057 0 1146 0
1058 }, 1147 },
1059 ); 1148 );
1060 1149
1150 $vbox->add (new CFPlus::UI::FancyFrame
1151 label => "Server Info",
1152 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1153 );
1154
1155 $vbox
1156}
1157
1158sub client_setup {
1159 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1160
1161 my $row = 0;
1162
1061 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1163 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1062 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1164 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1063 text => $CFG->{say_command}, 1165 state => $CFG->{show_tips},
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. " 1166 tooltip => "Show the <b>Tip of the day</b> window at startup?",
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 { 1167 on_changed => sub {
1068 my ($self, $value) = @_; 1168 my ($self, $value) = @_;
1069 $CFG->{say_command} = $value; 1169 $CFG->{show_tips} = $value;
1070 0 1170 0
1071 } 1171 }
1072 ); 1172 );
1073 1173
1074 $vbox->add (new CFClient::UI::Label 1174 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1075 text => "Server Info", 1175 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1076 fontsize => 1.2, 1176 text => $CFG->{logview_max_par},
1077 padding_y => 8, 1177 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1078 fg => [1, 1, 0, 1], 1178 . "sends more messages than this number, older messages get removed to save memory and "
1079 ); 1179 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
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 { 1180 on_changed => sub {
1107 my ($input, $prev_focus) = @_; 1181 my ($self, $value) = @_;
1108 1182 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
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 1183 0
1117 }, 1184 },
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 }; 1185 );
1146 1186
1147 $window 1187 $table
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} 1188}
1181 1189
1182sub autopickup_setup { 1190sub autopickup_setup {
1191 my $r = new CFPlus::UI::ScrolledWindow (
1192 expand => 1,
1193 scroll_y => 1
1194 );
1183 my $table = new CFClient::UI::Table; 1195 $r->add (my $table = new CFPlus::UI::Table
1196 row_expand => [0],
1197 col_expand => [0, 1, 0, 1],
1198 );
1184 1199
1185 for ( 1200 for (
1186 ["General", 0, 0, 1201 ["General", 0, 0,
1187 ["Enable autopickup" => PICKUP_NEWMODE], 1202 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1188 ["Inhibit autopickup" => PICKUP_INHIBIT], 1203 ["Inhibit autopickup" => PICKUP_INHIBIT],
1189 ["Stop before pickup" => PICKUP_STOP], 1204 ["Stop before pickup" => PICKUP_STOP],
1190 ["Debug autopickup" => PICKUP_DEBUG], 1205 ["Debug autopickup" => PICKUP_DEBUG],
1191 ], 1206 ],
1192 ["Weapons", 0, 6, 1207 ["Weapons", 0, 6,
… …
1202 ["Boots" => PICKUP_BOOTS], 1217 ["Boots" => PICKUP_BOOTS],
1203 ["Gloves" => PICKUP_GLOVES], 1218 ["Gloves" => PICKUP_GLOVES],
1204 ["Cloaks" => PICKUP_CLOAK], 1219 ["Cloaks" => PICKUP_CLOAK],
1205 ], 1220 ],
1206 1221
1207 ["Readables", 2, 2, 1222 ["Readables", 2, 0,
1208 ["Spellbooks" => PICKUP_SPELLBOOK], 1223 ["Spellbooks" => PICKUP_SPELLBOOK],
1209 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1224 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1210 ["Normal Books/Scrolls" => PICKUP_READABLES], 1225 ["Normal Books/Scrolls" => PICKUP_READABLES],
1211 ], 1226 ],
1212 ["Misc", 2, 7, 1227 ["Misc", 2, 5,
1213 ["Food" => PICKUP_FOOD], 1228 ["Food" => PICKUP_FOOD],
1214 ["Drinks" => PICKUP_DRINK], 1229 ["Drinks" => PICKUP_DRINK],
1215 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1230 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1216 ["Keys" => PICKUP_KEY], 1231 ["Keys" => PICKUP_KEY],
1217 ["Magical Items" => PICKUP_MAGICAL], 1232 ["Magical Items" => PICKUP_MAGICAL],
1218 ["Potions" => PICKUP_POTION], 1233 ["Potions" => PICKUP_POTION],
1219 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1234 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1220 ["Ignore cursed" => PICKUP_NOT_CURSED], 1235 ["Ignore cursed" => PICKUP_NOT_CURSED],
1221 ["Jewelery" => PICKUP_JEWELS], 1236 ["Jewelery" => PICKUP_JEWELS],
1237 ["Flesh" => PICKUP_FLESH],
1222 ], 1238 ],
1223 ["Weight/Value ratio", 2, 17] 1239 ["Weight/Value ratio", 2, 17]
1224 ) 1240 )
1225 { 1241 {
1226 my ($title, $x, $y, @bits) = @$_; 1242 my ($title, $x, $y, @bits) = @$_;
1227 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1243 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1228 1244
1229 for (@bits) { 1245 for (@bits) {
1230 ++$y; 1246 ++$y;
1231 1247
1232 my $mask = $_->[1]; 1248 my $mask = $_->[1];
1233 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1249 $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 1250 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1235 state => $CFG->{pickup} & $mask, 1251 state => $::CFG->{pickup} & $mask,
1236 on_changed => sub { 1252 on_changed => sub {
1237 my ($box, $value) = @_; 1253 my ($box, $value) = @_;
1238 1254
1239 if ($value) { 1255 if ($value) {
1240 $::CFG->{pickup} |= $mask; 1256 $::CFG->{pickup} |= $mask;
… …
1245 $::CONN->send_command ("pickup $::CFG->{pickup}") 1261 $::CONN->send_command ("pickup $::CFG->{pickup}")
1246 if defined $::CONN; 1262 if defined $::CONN;
1247 1263
1248 0 1264 0
1249 }); 1265 });
1266
1267 ${$_->[2]} = $checkbox if $_->[2];
1250 } 1268 }
1251 } 1269 }
1252 1270
1253 $table->add (2, 18, new CFClient::UI::ValSlider 1271 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1254 range => [0, 0, 16, 1, 1], 1272 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1273 template => ">= 99",
1255 to_value => sub { ">= " . 5 * $_[0] }, 1274 to_value => sub { ">= " . 5 * $_[0] },
1256 on_changed => sub { 1275 on_changed => sub {
1257 my ($slider, $value) = @_; 1276 my ($slider, $value) = @_;
1258 1277
1259 $::CFG->{pickup} &= ~0x7; 1278 $::CFG->{pickup} &= ~0xF;
1260 $::CFG->{pickup} |= int $value 1279 $::CFG->{pickup} |= int $value
1261 if $value; 1280 if $value;
1262 1; 1281 1;
1263 }); 1282 });
1283
1264 $table->add (3, 18, new CFClient::UI::Button 1284 $table->add_at (3, 18, new CFPlus::UI::Button
1265 text => "set", 1285 text => "set",
1266 on_activate => sub { 1286 on_activate => sub {
1267 $::CONN->send_command ("pickup $::CFG->{pickup}") 1287 $::CONN->send_command ("pickup $::CFG->{pickup}")
1268 if defined $::CONN; 1288 if defined $::CONN;
1269 0 1289 0
1270 }); 1290 });
1271 1291
1272 $table 1292 $r
1273} 1293}
1274 1294
1295my %SORT_ORDER = (
1296 type => undef,
1297 mtime => sub {
1298 my $NOW = time;
1299 sort {
1300 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1301 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1302
1303 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1304 or $btime <=> $atime
1305 or $a->{type} <=> $b->{type}
1306 } @_
1307 },
1308 weight => sub { sort {
1309 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1310 or $a->{type} <=> $b->{type}
1311 } @_ },
1312);
1313
1275sub inventory_window { 1314sub inventory_widget {
1276 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1315 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1316
1317 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1318 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1319
1320 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1321
1322 use sort 'stable';
1323
1324 $hb1->add (new CFPlus::UI::Selector
1325 value => $::CFG->{inv_sort},
1326 options => [
1327 [type => "Type/Name"],
1328 [mtime => "Recent/Normal/Locked"],
1329 [weight => "Weight/Type"],
1330 ],
1331 on_changed => sub {
1332 $::CFG->{inv_sort} = $_[1];
1333 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1334 },
1335 );
1336 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1337 #TODO# update to weigh/maxweight
1338 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1339
1340 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1341 $sw1->add ($INV = new CFPlus::UI::Inventory);
1342 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1343
1344 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1345
1346 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1347
1348 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1349 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1350
1351 # XXX: Call after $INVR = ... because set_opencont sets the items
1352 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1353
1354 $hb
1355}
1356
1357sub toggle_player_page {
1358 my ($widget) = @_;
1359
1360 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1361 $PL_WINDOW->hide;
1362 } else {
1363 $PL_NOTEBOOK->set_current_page ($widget);
1364 $PL_WINDOW->show;
1365 }
1366}
1367
1368sub player_window {
1369 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1277 x => "center", 1370 x => "center",
1278 y => "center", 1371 y => "center",
1279 force_w => $WIDTH * 9/10, 1372 force_w => $WIDTH * 9/10,
1280 force_h => $HEIGHT * 9/10, 1373 force_h => $HEIGHT * 9/10,
1281 title => "Inventory", 1374 title => "Player",
1375 name => "playerbook",
1282 has_close_button => 1, 1376 has_close_button => 1
1283 ; 1377 ;
1284 1378
1285 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1379 my $ntb =
1380 $PL_NOTEBOOK =
1381 new CFPlus::UI::Notebook expand => 1;
1286 1382
1287 $hb->add (my $vb1 = new CFClient::UI::VBox); 1383 $ntb->add_tab (
1288 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1384 "Statistics (F2)" => $STATS_PAGE = stats_window,
1289 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1385 "Shows statistics, where all your Stats and Resistances are shown."
1386 );
1387 $ntb->add_tab (
1388 "Skills (F3)" => $SKILL_PAGE = skill_window,
1389 "Shows all your Skills."
1390 );
1290 1391
1291 $hb->add (my $vb2 = new CFClient::UI::VBox); 1392 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1393 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1394 $ntb->add_tab (
1395 "Spellbook (F4)" => $spellsw,
1396 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1397 );
1398 $ntb->add_tab (
1399 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1400 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1401 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1402 );
1403 $ntb->add_tab (Pickup => autopickup_setup,
1404 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1292 1405
1293 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1406 $ntb->set_current_page ($INVENTORY_PAGE);
1294 1407
1295 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1408 $plwin->add ($ntb);
1296 1409 $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} 1410}
1310 1411
1311sub keyboard_setup { 1412sub keyboard_setup {
1312 my $binding_list = new CFClient::UI::VBox; 1413 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} 1414}
1418 1415
1419sub help_window { 1416sub help_window {
1420 my $win = new CFClient::UI::FancyFrame 1417 my $win = new CFPlus::UI::Toplevel
1421 x => 'center', 1418 x => 'center',
1422 y => 'center', 1419 y => 'center',
1423 z => 2, 1420 z => 4,
1424 name => 'doc_browser', 1421 name => 'doc_browser',
1425 force_w => int $WIDTH * 7/8, 1422 force_w => int $WIDTH * 7/8,
1426 force_h => int $HEIGHT * 7/8, 1423 force_h => int $HEIGHT * 7/8,
1427 title => "Documentation"; 1424 title => "Help Browser",
1425 has_close_button => 1;
1428 1426
1429 $win->add (my $vbox = new CFClient::UI::VBox); 1427 $win->add (my $vbox = new CFPlus::UI::VBox);
1430 1428
1431 $vbox->add (my $buttons = new CFClient::UI::HBox); 1429 $vbox->add (new CFPlus::UI::FancyFrame
1430 label => "Navigation",
1431 child => (my $buttons = new CFPlus::UI::HBox),
1432 );
1432 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1433 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1433 expand => 1, fontsize => 0.8, padding_x => 4); 1434 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1434 1435
1435 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1436 my @history;
1436 $buttons->add (my $combo = new CFClient::UI::Combobox 1437 my @future;
1437 value => undef, 1438 my $curnode;
1438 options => [ 1439
1439 [intro => "Introduction"], 1440 my $load_node; $load_node = sub {
1440 [manual => "Main Manual"], 1441 my ($node, $para) = @_;
1441 [skill_help => "Skill Reference"], 1442
1442 [command_help => "Command Reference"], 1443 $buttons->clear;
1443 [dmcommand_help => "DM Commands"], 1444
1444 [COPYING => "License Terms"], 1445 $buttons->add (new CFPlus::UI::Button
1445 ], 1446 text => "⇤",
1447 tooltip => "back to the starting page",
1446 on_changed => sub { 1448 on_activate => sub {
1447 my ($self, $pod) = @_; 1449 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1448 1450 unshift @future, @history;
1449 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1451 @history = ();
1450 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1452 $load_node->(@{shift @future});
1451
1452 $viewer->clear;
1453
1454# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1455# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1456# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1457# ]);#d#
1458 1453 },
1459 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1454 );
1460 for @$pom;
1461 1455
1462 $viewer->set_offset (0); 1456 if (@history) {
1463 1457 $buttons->add (new CFPlus::UI::Button
1458 text => "⋘",
1459 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1460 on_activate => sub {
1461 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1462 $load_node->(@{pop @history});
1463 },
1464 0 1464 );
1465 }, 1465 }
1466 on_visibility_change => sub { 1466
1467 my ($self, $visible) = @_; 1467 if (@future) {
1468 return unless $visible; 1468 $buttons->add (new CFPlus::UI::Button
1469 return if $self->{value}; 1469 text => "â‹™",
1470 $self->set_value ("intro"); 1470 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1471 on_activate => sub {
1472 push @history, [$curnode, $viewer->current_paragraph];
1473 $load_node->(@{shift @future});
1474 },
1471 0 1475 );
1472 }, 1476 }
1477
1478 $buttons->add (new CFPlus::UI::Label text => " ");
1479
1480 my @path = CFPlus::Pod::full_path_of $node;
1481 pop @path; # drop current node
1482
1483 for my $node (@path) {
1484 $buttons->add (new CFPlus::UI::Button
1485 text => $node->{kw}[0],
1486 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1487 on_activate => sub {
1488 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1489 $load_node->($node);
1490 },
1491 );
1492 $buttons->add (new CFPlus::UI::Label text => "/");
1493 }
1494
1495 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1496
1497 $curnode = $node;
1498
1499 $viewer->clear;
1500 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1501 $viewer->scroll_to ($para);
1473 ); 1502 };
1503
1504 $load_node->(CFPlus::Pod::find pod => "mainpage");
1505
1506 $CFPlus::Pod::goto_document = sub {
1507 my (@path) = @_;
1508
1509 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1510
1511 $load_node->((CFPlus::Pod::find @path)[0]);
1512 $win->show;
1513 };
1474 1514
1475 $win 1515 $win
1476} 1516}
1477 1517
1518sub open_string_query {
1519 my ($title, $cb, $txt, $tooltip) = @_;
1520 my $dialog = new CFPlus::UI::Toplevel
1521 x => "center",
1522 y => "center",
1523 z => 50,
1524 force_w => $WIDTH * 4/5,
1525 title => $title;
1526
1527 $dialog->add (
1528 my $e = new CFPlus::UI::Entry
1529 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1530 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1531 tooltip => $tooltip
1532 );
1533
1534 $e->grab_focus;
1535 $e->set_text ($txt) if $txt;
1536 $dialog->show;
1537}
1538
1539sub open_quit_dialog {
1540 unless ($QUIT_DIALOG) {
1541 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1542 x => "center",
1543 y => "center",
1544 z => 50,
1545 title => "Really Quit?",
1546 on_key_down => sub {
1547 my ($dialog, $ev) = @_;
1548 $ev->{sym} == 27 and $dialog->hide;
1549 }
1550 ;
1551
1552 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1553
1554 $vb->add (new CFPlus::UI::Label
1555 text => "You should find a savebed and apply it first!",
1556 max_w => $WIDTH * 0.25,
1557 ellipsize => 0,
1558 );
1559 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1560 $hb->add (new CFPlus::UI::Button
1561 text => "Ok",
1562 expand => 1,
1563 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1564 );
1565 $hb->add (new CFPlus::UI::Button
1566 text => "Quit anyway",
1567 expand => 1,
1568 on_activate => sub { exit },
1569 );
1570 }
1571
1572 $QUIT_DIALOG->show;
1573 $QUIT_DIALOG->grab_focus;
1574}
1575
1576sub show_tip_of_the_day {
1577 # find all tips
1578 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1579
1580 CFPlus::DB::get state => "tip_of_the_day", sub {
1581 my ($todindex) = @_;
1582 $todindex = 0 if $todindex >= @tod;
1583 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1584
1585 # create dialog
1586 my $dialog;
1587
1588 my $close = sub {
1589 $dialog->destroy;
1590 };
1591
1592 $dialog = new CFPlus::UI::Toplevel
1593 x => "center",
1594 y => "center",
1595 z => 3,
1596 name => 'tip_of_the_day',
1597 force_w => int $WIDTH * 4/9,
1598 force_h => int $WIDTH * 2/9,
1599 title => "Tip of the day #" . (1 + $todindex),
1600 child => my $vbox = new CFPlus::UI::VBox,
1601 has_close_button => 1,
1602 on_delete => $close,
1603 ;
1604
1605 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1606 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1607 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1608
1609 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1610
1611 $table->add_at (0, 0, new CFPlus::UI::Button
1612 text => "Close",
1613 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>.",
1614 on_activate => $close,
1615 );
1616
1617 $table->add_at (2, 0, new CFPlus::UI::Button
1618 text => "Next",
1619 tooltip => "Show the next <b>Tip of the day</b>.",
1620 on_activate => sub {
1621 $close->();
1622 &show_tip_of_the_day;
1623 },
1624 );
1625
1626 $dialog->show;
1627 };
1628}
1629
1478sub sdl_init { 1630sub sdl_init {
1479 CFClient::SDL_Init 1631 CFPlus::SDL_Init
1480 and die "SDL::Init failed!\n"; 1632 and die "SDL::Init failed!\n";
1481} 1633}
1482 1634
1483sub video_init { 1635sub video_init {
1484 sdl_init;
1485
1486 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1636 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1487 1637
1488 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1638 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1489 1639
1490 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1640 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1491 $FULLSCREEN = $CFG->{fullscreen}; 1641 $FULLSCREEN = $CFG->{fullscreen};
1492 $FAST = $CFG->{fast}; 1642 $FAST = $CFG->{fast};
1493 1643
1494 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1644 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1495 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1645 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1496 1646
1497 $SDL_ACTIVE = 1; 1647 $SDL_ACTIVE = 1;
1498 $LAST_REFRESH = time - 0.01; 1648 $LAST_REFRESH = time - 0.01;
1499 1649
1500 CFClient::OpenGL::init; 1650 CFPlus::OpenGL::init;
1501 1651
1502 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1652 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1503 1653
1504 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1654 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1505 1655
1506 ############################################################################# 1656 #############################################################################
1507 1657
1508 if ($DEBUG_STATUS) { 1658 if ($DEBUG_STATUS) {
1509 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1659 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1510 } else { 1660 } else {
1511 # create the widgets 1661 # create the widgets
1512 1662
1513 $DEBUG_STATUS = new CFClient::UI::Label 1663 $DEBUG_STATUS = new CFPlus::UI::Label
1514 padding => 0, 1664 padding => 0,
1515 z => 100, 1665 z => 100,
1516 force_x => "max", 1666 force_x => "max",
1517 force_y => 0; 1667 force_y => 0;
1518 $DEBUG_STATUS->show; 1668 $DEBUG_STATUS->show;
1519 1669
1520 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1521
1522 $STATUSBOX = new CFClient::UI::Statusbox; 1670 $STATUSBOX = new CFPlus::UI::Statusbox;
1523 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1671 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1524 1672
1525 (new CFClient::UI::Frame 1673 (new CFPlus::UI::Frame
1526 bg => [0, 0, 0, 0.4], 1674 bg => [0, 0, 0, 0.4],
1527 force_x => 0, 1675 force_x => 0,
1528 force_y => "max", 1676 force_y => "max",
1529 child => $STATUSBOX, 1677 child => $STATUSBOX,
1530 )->show; 1678 )->show;
1531 1679
1532 CFClient::UI::FancyFrame->new ( 1680 CFPlus::UI::Toplevel->new (
1533 title => "Map", 1681 title => "Map",
1534 name => "mapmap", 1682 name => "mapmap",
1535 x => 0, 1683 x => 0,
1536 y => $FONTSIZE + 8, 1684 y => $FONTSIZE + 8,
1537 border_bg => [1, 1, 1, 192/255], 1685 border_bg => [1, 1, 1, 192/255],
1538 bg => [1, 1, 1, 0], 1686 bg => [1, 1, 1, 0],
1539 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1687 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1540 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1688 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1541 ), 1689 ),
1542 )->show; 1690 )->show;
1543 1691
1544 $MAPWIDGET = new CFClient::MapWidget; 1692 $MAPWIDGET = new CFPlus::MapWidget;
1545 $MAPWIDGET->connect (activate_console => sub { 1693 $MAPWIDGET->connect (activate_console => sub {
1546 my ($mapwidget, $preset) = @_; 1694 my ($mapwidget, $preset) = @_;
1547 1695
1548 if ($CONSOLE) { 1696 $MESSAGE_WINDOW->activate_console ($preset)
1549 $CONSOLE->{input}->{auto_activated} = 1; 1697 if $MESSAGE_WINDOW;
1550 $CONSOLE->{input}->grab_focus;
1551
1552 if ($preset && $CONSOLE->{input}->get_text eq '') {
1553 $CONSOLE->{input}->set_text ($preset);
1554 }
1555 }
1556 }); 1698 });
1557 $MAPWIDGET->show; 1699 $MAPWIDGET->show;
1558 $MAPWIDGET->grab_focus; 1700 $MAPWIDGET->grab_focus;
1559 1701
1560 $LOGVIEW = new CFClient::UI::TextScroller
1561 expand => 1,
1562 font => $FONT_FIXED,
1563 fontsize => $::CFG->{log_fontsize},
1564 indent => -4,
1565 can_hover => 1,
1566 can_events => 1,
1567 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1568 ;
1569
1570 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1702 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1571 title => "Setup", 1703 title => "Setup",
1572 name => "setup_dialog", 1704 name => "setup_dialog",
1573 x => 'center', 1705 x => 'center',
1574 y => 'center', 1706 y => 'center',
1575 z => 2, 1707 z => 2,
1576 force_w => $::WIDTH * 0.6, 1708 force_w => $::WIDTH * 0.6,
1577 force_h => $::HEIGHT * 0.6, 1709 force_h => $::HEIGHT * 0.6,
1578 has_close_button => 1, 1710 has_close_button => 1,
1579 ; 1711 ;
1580 1712
1713 $METASERVER = metaserver_dialog;
1714 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1715
1581 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1716 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1582 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1717 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1583 1718
1584 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1719 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1585 "Configure the server to play on, your username, password and other server-related options."); 1720 "Configure the server to play on, your username, password and other server-related options.");
1586 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1721 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1587 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1722 "Configure various client-specific settings.");
1588 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1723 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1589 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1724 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1590 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1725 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1591 "Configure the use of audio, sound effects and background music."); 1726 "Configure the use of audio, sound effects and background music.");
1592 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1727 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1593 "Lets you define, edit and delete key bindings." 1728 "Lets you define, edit and delete key bindings."
1594 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1729 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1595 . "with nothing set and the recording started. After doing the actions you " 1730 . "with nothing set and the recording started. After doing the actions you "
1596 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1731 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1597 . "After pressing the combo the binding will be saved automatically and the " 1732 . "After pressing the combo the binding will be saved automatically and the "
1598 . "binding editor closes"); 1733 . "binding editor closes");
1599 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1600 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1601 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1734 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1602 "Some debuggin' options. Do not ask."); 1735 "Some debuggin' options. Do not ask.");
1603 1736
1604 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1737 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1605 1738
1606 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1739 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1607 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1740 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1608 1741
1609 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1742 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1610 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1743 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1611 1744
1612 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 1745 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
1613 1746
1614 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1615 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1616 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1747 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1617 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1748 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1618 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1619 1749
1620 $BUTTONBAR->add (new CFClient::UI::Button 1750 $BUTTONBAR->add (new CFPlus::UI::Button
1621 text => "Save Config", 1751 text => "Save Config",
1622 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1752 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1623 on_activate => sub { 1753 on_activate => sub {
1624 $::CFG->{layout} = CFClient::UI::get_layout; 1754 $::CFG->{layout} = CFPlus::UI::get_layout;
1625 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1755 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1626 status "Configuration Saved"; 1756 status "Configuration Saved";
1627 0 1757 0
1628 }, 1758 },
1629 ); 1759 );
1630 1760
1631 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1761 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1632 tooltip => "View Documentation"); 1762 tooltip => "View Documentation");
1633 1763
1764
1634 $BUTTONBAR->add (new CFClient::UI::Button 1765 $BUTTONBAR->add (new CFPlus::UI::Button
1635 text => "Quit", 1766 text => "Quit",
1636 tooltip => "Terminates the program", 1767 tooltip => "Terminates the program",
1637 on_activate => sub { 1768 on_activate => sub {
1638 if ($CONN) { 1769 if ($CONN) {
1639 open_quit_dialog; 1770 open_quit_dialog;
… …
1650 1781
1651 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1782 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1652} 1783}
1653 1784
1654sub video_shutdown { 1785sub video_shutdown {
1655 CFClient::OpenGL::shutdown; 1786 CFPlus::OpenGL::shutdown;
1656 1787
1657 undef $SDL_ACTIVE; 1788 undef $SDL_ACTIVE;
1658} 1789}
1659 1790
1660my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1661my $bgmusic;#TODO#hack#d#
1662
1663sub audio_channel_finished { 1791sub audio_channel_finished {
1664 my ($channel) = @_; 1792 my ($channel) = @_;
1665 1793
1666 #warn "channel $channel finished\n";#d# 1794# warn "channel $channel finished\n";#d#
1795}
1796
1797our %AUDIO_PLAY;
1798our %AUDIO_CHUNK;
1799
1800sub audio_sound_push($) {
1801 my ($face) = @_;
1802
1803 if (my $chunk = $AUDIO_CHUNK{$face}) {
1804 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
1805 my (undef, $dx, $dy, $vol) = @$_;
1806
1807 my $channel = $chunk->play
1808 or return;
1809
1810 $channel->volume (128 + $vol);
1811 $dx = $dx / 10 * 255;
1812 $channel->set_panning ((min 255, 255 - $dx), (min 255, 255 + $dx));
1813# my $angle = $dx ? : $dx < 0 ?
1814# my $distance = -$vol;
1815# $channel->set_position ($angle, $distance);
1816 }
1817 } else {
1818 # sound_meta not set means data is in flight either way
1819 my $meta = $CONN->{sound_meta}{$face}
1820 or return;
1821
1822 # fetch from database
1823 CFPlus::DB::get res_data => $meta->{name}, sub {
1824 my $vol = $meta->{meta}{volume} || 100;
1825 my $rwops = new CFPlus::RW $_[0];
1826 my $chunk = new CFPlus::MixChunk $rwops;
1827 $chunk->volume ($vol * 128 / 100);
1828 $AUDIO_CHUNK{$face} = $chunk;
1829
1830 audio_sound_push ($face);
1831 };
1832 }
1833}
1834
1835sub audio_sound_play {
1836 my ($face, $dx, $dy, $vol) = @_;
1837
1838 $SDL_MIXER
1839 or return;
1840
1841 my $queue = $AUDIO_PLAY{$face} ||= [];
1842 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
1843 audio_sound_push $face
1844 unless @$queue > 1;
1845}
1846
1847sub audio_music_set {
1848 my ($songs) = @_;
1849
1850 my @want =
1851 grep $_,
1852 map $CONN->{music_meta}{$_},
1853 @$songs;
1854
1855 if (@want) {
1856 @MUSIC_WANT = @want;
1857 &audio_music_changed ();
1858 }
1859}
1860
1861sub audio_music_start {
1862 my $meta = $MUSIC_PLAYING_META;
1863
1864 CFPlus::DB::get res_data => $meta->{name}, sub {
1865 return unless $SDL_MIXER;
1866
1867 # music might have changed...
1868 $meta eq $MUSIC_PLAYING_META
1869 or return &audio_music_start ();
1870
1871 $MUSIC_PLAYING_DATA = \$_[0];
1872
1873 my $rwops = $meta->{path}
1874 ? new_from_file CFPlus::RW $meta->{path}
1875 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
1876
1877 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
1878 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
1879
1880 my $NOW = time;
1881
1882 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
1883 my $pos = $MUSIC_PLAYING_META->{stop_pos};
1884 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1885 $MUSIC_START = time - $pos;
1886 } else {
1887 $MUSIC_PLAYER->play (0);
1888 $MUSIC_START = time;
1889 }
1890
1891 delete $MUSIC_PLAYING_META->{stop_time};
1892 delete $MUSIC_PLAYING_META->{stop_pos};
1893 }
1894}
1895
1896sub audio_music_changed {
1897 return unless $CFG->{bgm_enable};
1898 return unless $SDL_MIXER;
1899
1900 # default MUSIC_WANT == MUSIC_DEFAULT
1901 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
1902
1903 # if the currently playing song is acceptable, let it continue
1904 return if $MUSIC_PLAYING_META
1905 && grep $MUSIC_PLAYING_META == $_, @MUSIC_WANT;
1906
1907 my $NOW = time;
1908
1909 if ($MUSIC_PLAYING_META) {
1910 $MUSIC_PLAYING_META->{stop_time} = $NOW;
1911 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
1912 CFPlus::MixMusic::fade_out 1000;
1913 } else {
1914 # sort by stop time, oldest first
1915 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
1916
1917 # if the most recently-played piece played very recently,
1918 # resume it, else choose the oldest piece for rotation.
1919 $MUSIC_PLAYING_META =
1920 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
1921 ? $MUSIC_WANT[-1]
1922 : $MUSIC_WANT[0];
1923
1924 audio_music_start;
1925 }
1667} 1926}
1668 1927
1669sub audio_music_finished { 1928sub audio_music_finished {
1670 return unless $CFG->{bgm_enable}; 1929 undef $MUSIC_PLAYER;
1930 undef $MUSIC_PLAYING_META;
1931 undef $MUSIC_PLAYING_DATA;
1671 1932
1672 # TODO: hack, do play loop and mood music 1933 audio_music_changed;
1673 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
1674 $bgmusic->play (0);
1675
1676 push @bgmusic, shift @bgmusic;
1677} 1934}
1678 1935
1679sub audio_init { 1936sub audio_init {
1680 if ($CFG->{audio_enable}) { 1937 if ($CFG->{audio_enable}) {
1681 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1938 $ENV{MIX_EFFECTSMAXSPEED} = 1;
1682 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1939 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1683 1940
1684 unless ($SDL_MIXER) { 1941 unless ($SDL_MIXER) {
1685 status "Unable to open sound device: there will be no sound"; 1942 status "Unable to open sound device: there will be no sound";
1686 return; 1943 return;
1687 }
1688
1689 CFClient::Mix_AllocateChannels 8;
1690 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
1691
1692 audio_music_finished;
1693
1694 while (<$fh>) {
1695 next if /^\s*#/;
1696 next if /^\s*$/;
1697
1698 my ($file, $volume, $event) = split /\s+/, $_, 3;
1699
1700 push @SOUNDS, "$volume,$file";
1701
1702 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1703 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
1704 $chunk->volume ($volume * 128 / 100);
1705 $chunk
1706 };
1707 }
1708 } else {
1709 status "unable to open sound config: $!";
1710 } 1944 }
1945
1946 CFPlus::Mix_AllocateChannels 16;
1947 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1948
1949 audio_music_finished;
1950 } else {
1951 undef $SDL_MIXER;
1711 } 1952 }
1712} 1953}
1713 1954
1714sub audio_shutdown { 1955sub audio_shutdown {
1715 CFClient::Mix_CloseAudio if $SDL_MIXER; 1956 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1716 undef $SDL_MIXER; 1957 undef $SDL_MIXER;
1717 @SOUNDS = (); 1958 @SOUNDS = ();
1718 %AUDIO_CHUNKS = (); 1959 %AUDIO_CHUNKS = ();
1719} 1960}
1720 1961
… …
1727 1968
1728sub force_refresh { 1969sub force_refresh {
1729 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1970 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1730 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1971 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1731 1972
1732 $CFClient::UI::ROOT->draw; 1973 $CFPlus::UI::ROOT->draw;
1733 1974
1734 $WANT_REFRESH = 0; 1975 $WANT_REFRESH = 0;
1735 $CAN_REFRESH = 0; 1976 $CAN_REFRESH = 0;
1736 $LAST_REFRESH = $NOW; 1977 $LAST_REFRESH = $NOW;
1737 1978
17380 && do {
1739 # some weird model-drawing code, just a joke right now
1740 use CFClient::OpenGL;
1741
1742 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1743 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1744 $demo{r} ||= do {
1745 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1746 $mod->{v} = pack "f*", @{$mod->{v}};
1747 $_ = [scalar @$_, pack "S!*", @$_]
1748 for values %{$mod->{g}};
1749 $mod
1750 };
1751
1752 my $r = $demo{r} or die;
1753
1754 glDepthMask 1;
1755 glClear GL_DEPTH_BUFFER_BIT;
1756 glEnable GL_TEXTURE_2D;
1757 glEnable GL_DEPTH_TEST;
1758 glEnable GL_CULL_FACE;
1759 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1760
1761 glMatrixMode GL_PROJECTION;
1762 glLoadIdentity;
1763 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1764 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1765 glMatrixMode GL_MODELVIEW;
1766 glLoadIdentity;
1767
1768 glPushMatrix;
1769 glTranslate 0, 0, -800;
1770 glScale 1, -1, 1;
1771 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1772 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1773 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1774 glScale 50, 50, 50;
1775
1776 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1777 while (my ($k, $v) = each %{$r->{g}}) {
1778 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1779 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1780 }
1781
1782 glPopMatrix;
1783
1784 glShadeModel GL_FLAT;
1785 glDisable GL_DEPTH_TEST;
1786 glDisable GL_TEXTURE_2D;
1787 glDepthMask 0;
1788
1789 $WANT_REFRESH++;
1790};
1791
1792 CFClient::SDL_GL_SwapBuffers; 1979 CFPlus::SDL_GL_SwapBuffers;
1793} 1980}
1794 1981
1795my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1982my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1796 $NOW = time; 1983 $NOW = time;
1797 1984
1798 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1985 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1799 for CFClient::SDL_PollEvent; 1986 for CFPlus::poll_events;
1800 1987
1801 if (%animate_object) { 1988 if (%animate_object) {
1802 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1989 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1803 $WANT_REFRESH++; 1990 ++$WANT_REFRESH;
1804 } 1991 }
1805 1992
1806 if ($WANT_REFRESH) { 1993 if ($WANT_REFRESH) {
1807 force_refresh; 1994 force_refresh;
1808 } else { 1995 } else {
… …
1818sub animation_stop { 2005sub animation_stop {
1819 my ($widget) = @_; 2006 my ($widget) = @_;
1820 delete $animate_object{$widget}; 2007 delete $animate_object{$widget};
1821} 2008}
1822 2009
1823# check once/second for faces that need to be prefetched
1824# this should, of course, only run on demand, but
1825# SDL forces worse things on us....
1826
1827Event->timer (after => 1, interval => 0.25, cb => sub {
1828 $CONN->face_prefetch
1829 if $CONN;
1830});
1831
1832%SDL_CB = ( 2010%SDL_CB = (
1833 CFClient::SDL_QUIT => sub { 2011 CFPlus::SDL_QUIT => sub {
1834 Event::unloop -1; 2012 exit;
1835 }, 2013 },
1836 CFClient::SDL_VIDEORESIZE => sub { 2014 CFPlus::SDL_VIDEORESIZE => sub {
1837 }, 2015 },
1838 CFClient::SDL_VIDEOEXPOSE => sub { 2016 CFPlus::SDL_VIDEOEXPOSE => sub {
1839 CFClient::UI::full_refresh; 2017 CFPlus::UI::full_refresh;
1840 }, 2018 },
1841 CFClient::SDL_ACTIVEEVENT => sub { 2019 CFPlus::SDL_ACTIVEEVENT => sub {
1842# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2020# not useful, as APPACTIVE include sonly iconified state, not unmapped
2021# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2022# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2023# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2024# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2025# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1843 }, 2026 },
1844 CFClient::SDL_KEYDOWN => sub { 2027 CFPlus::SDL_KEYDOWN => sub {
1845 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2028 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1846 # alt-enter 2029 # alt-enter
2030 $FULLSCREEN_ENABLE->toggle;
1847 video_shutdown; 2031 video_shutdown;
1848 $CFG->{fullscreen} = !$CFG->{fullscreen};
1849 video_init; 2032 video_init;
1850 } else { 2033 } else {
1851 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2034 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1852 } 2035 }
1853 }, 2036 },
1854 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2037 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1855 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2038 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1856 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2039 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1857 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2040 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1858 CFClient::SDL_USEREVENT => sub { 2041 CFPlus::SDL_USEREVENT => sub {
1859 if ($_[0]{code} == 1) { 2042 if ($_[0]{code} == 1) {
1860 audio_channel_finished $_[0]{data1}; 2043 audio_channel_finished $_[0]{data1};
1861 } elsif ($_[0]{code} == 0) { 2044 } elsif ($_[0]{code} == 0) {
1862 audio_music_finished; 2045 audio_music_finished;
1863 } 2046 }
… …
1867############################################################################# 2050#############################################################################
1868 2051
1869$SIG{INT} = $SIG{TERM} = sub { exit }; 2052$SIG{INT} = $SIG{TERM} = sub { exit };
1870 2053
1871{ 2054{
1872 local $SIG{__DIE__} = sub {
1873 return unless defined $^S && !$^S;
1874 Carp::confess $_[1];#d#TODO: remove when stable
1875 CFClient::fatal $_[0];
1876 };
1877
1878 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2055 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2056 CFPlus::DB::Server::run;
2057
1879 CFClient::UI::set_layout ($::CFG->{layout}); 2058 CFPlus::UI::set_layout ($::CFG->{layout});
1880 2059
1881 my %DEF_CFG = ( 2060 my %DEF_CFG = (
1882 sdl_mode => 0, 2061 sdl_mode => 0,
1883 width => 640, 2062 width => 640,
1884 height => 480, 2063 height => 480,
1885 fullscreen => 0, 2064 fullscreen => 0,
1886 fast => 0, 2065 fast => 0,
1887 map_scale => 1, 2066 map_scale => 1,
1888 fow_enable => 1, 2067 fow_enable => 1,
1889 fow_intensity => 0.45, 2068 fow_intensity => 0,
1890 fow_smooth => 0, 2069 map_smoothing => 1,
1891 gui_fontsize => 1, 2070 gui_fontsize => 1,
1892 log_fontsize => 0.7, 2071 log_fontsize => 0.7,
1893 gauge_fontsize => 1, 2072 gauge_fontsize => 1,
1894 gauge_size => 0.35, 2073 gauge_size => 0.35,
1895 stat_fontsize => 0.7, 2074 stat_fontsize => 0.7,
1896 mapsize => 100, 2075 mapsize => 100,
1897 say_command => 'say',
1898 audio_enable => 1, 2076 audio_enable => 1,
1899 bgm_enable => 1, 2077 bgm_enable => 1,
1900 bgm_volume => 0.25, 2078 bgm_volume => 0.25,
1901 face_prefetch => 0,
1902 output_sync => 1, 2079 output_sync => 1,
1903 output_count => 1, 2080 output_count => 1,
2081 output_rate => "",
1904 pickup => 0, 2082 pickup => 0,
2083 inv_sort => "mtime",
1905 default => "profile", # default profile 2084 default => "profile", # default profile
2085 show_tips => 1,
2086 logview_max_par => 1000,
1906 ); 2087 );
1907 2088
1908 while (my ($k, $v) = each %DEF_CFG) { 2089 while (my ($k, $v) = each %DEF_CFG) {
1909 $CFG->{$k} = $v unless exists $CFG->{$k}; 2090 $CFG->{$k} = $v unless exists $CFG->{$k};
1910 } 2091 }
1911 2092
1912 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2093 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2094 $PROFILE = $CFG->{profile}{default};
2095
2096 # convert old bindings (only default profile matters)
2097 if (my $bindings = delete $PROFILE->{bindings}) {
2098 while (my ($mod, $syms) = each %$bindings) {
2099 while (my ($sym, $cmds) = each %$syms) {
2100 push @{ $PROFILE->{macro} }, {
2101 accelkey => [$mod*1, $sym*1],
2102 action => $cmds,
2103 };
2104 }
2105 }
2106 }
1913 2107
1914 sdl_init; 2108 sdl_init;
1915 2109
1916 @SDL_MODES = reverse 2110 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1917 grep $_->[0] >= 640 && $_->[1] >= 480, 2111 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1918 CFClient::SDL_ListModes;
1919
1920 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2112 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2113
2114 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
1921 2115
1922 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2116 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1923 2117
1924 { 2118 {
1925 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2119 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1926 DejaVuSans.ttf 2120 DejaVuSans.ttf
1927 DejaVuSansMono.ttf 2121 DejaVuSansMono.ttf
1928 DejaVuSans-Bold.ttf 2122 DejaVuSans-Bold.ttf
1929 DejaVuSansMono-Bold.ttf 2123 DejaVuSansMono-Bold.ttf
1930 DejaVuSans-Oblique.ttf 2124 DejaVuSans-Oblique.ttf
1931 DejaVuSansMono-Oblique.ttf 2125 DejaVuSansMono-Oblique.ttf
1932 DejaVuSans-BoldOblique.ttf 2126 DejaVuSans-BoldOblique.ttf
1933 DejaVuSansMono-BoldOblique.ttf 2127 DejaVuSansMono-BoldOblique.ttf
1934 ); 2128 );
1935 2129
1936 CFClient::add_font $_ for @fonts; 2130 CFPlus::add_font $_ for @fonts;
1937 2131
1938 CFClient::pango_init; 2132 CFPlus::pango_init;
1939 2133
1940 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2134 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1941 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2135 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1942 2136
1943 $FONT_PROP->make_default; 2137 $FONT_PROP->make_default;
1944 } 2138 }
1945 2139
1946# compare mono (ft) vs. rgba (cairo) 2140# compare mono (ft) vs. rgba (cairo)
1947# ft - 1.8s, cairo 3s, even in alpha-only mode 2141# ft - 1.8s, cairo 3s, even in alpha-only mode
1948# for my $rgba (0..1) { 2142# for my $rgba (0..1) {
1949# my $t1 = Time::HiRes::time; 2143# my $t1 = Time::HiRes::time;
1950# for (1..1000) { 2144# for (1..1000) {
1951# my $layout = CFClient::Layout->new ($rgba); 2145# my $layout = CFPlus::Layout->new ($rgba);
1952# $layout->set_text ("hallo" x 100); 2146# $layout->set_text ("hallo" x 100);
1953# $layout->render; 2147# $layout->render;
1954# } 2148# }
1955# my $t2 = Time::HiRes::time; 2149# my $t2 = Time::HiRes::time;
1956# warn $t2-$t1; 2150# warn $t2-$t1;
1957# } 2151# }
1958 2152
2153 $startup_done->();
2154
1959 video_init; 2155 video_init;
1960 audio_init; 2156 audio_init;
1961} 2157}
1962 2158
2159show_tip_of_the_day if $CFG->{show_tips};
2160
1963Event::loop; 2161Event::loop;
1964#CFClient::SDL_Quit; 2162#CFPlus::SDL_Quit;
1965#CFClient::_exit 0; 2163#CFPlus::_exit 0;
1966 2164
1967END { CFClient::SDL_Quit } 2165END {
2166 CFPlus::SDL_Quit;
2167 CFPlus::DB::Server::stop;
2168}
1968 2169
1969=head1 NAME 2170=head1 NAME
1970 2171
1971cfplus - A Crossfire+ and Crossfire game client 2172cfplus - A Crossfire+ and Crossfire game client
1972 2173

Diff Legend

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