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.89 by elmex, Sun Jul 9 21:11:48 2006 UTC vs.
Revision 1.191 by root, Sun Jul 29 21:31:48 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines