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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines