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.156 by root, Sun Jun 24 19:17:47 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines