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

Diff Legend

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