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

Diff Legend

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