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.87 by root, Sun Jul 2 21:41:34 2006 UTC vs.
Revision 1.192 by root, Mon Jul 30 02:16:16 2007 UTC

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

Diff Legend

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