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.91 by root, Tue Jul 11 13:51:38 2006 UTC vs.
Revision 1.190 by root, Sun Jul 29 18:56:03 2007 UTC

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

Diff Legend

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