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.93 by root, Sat Jul 15 01:19:55 2006 UTC vs.
Revision 1.192 by root, Mon Jul 30 02:16:16 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines