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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines