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.14 by elmex, Sat May 27 08:45:24 2006 UTC vs.
Revision 1.131 by root, Sun Nov 19 20:31:29 2006 UTC

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

Diff Legend

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