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.10 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.118 by root, Tue Aug 22 06:37:30 2006 UTC

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

Diff Legend

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