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

Diff Legend

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