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

Diff Legend

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