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.85 by elmex, Sun Jul 2 19:32:56 2006 UTC vs.
Revision 1.192 by root, Mon Jul 30 02:16:16 2007 UTC

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

Diff Legend

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