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.99 by root, Sun Jul 23 08:58:44 2006 UTC vs.
Revision 1.186 by elmex, Wed Jul 25 15:06:21 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines