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

Diff Legend

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