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.85 by elmex, Sun Jul 2 19:32:56 2006 UTC vs.
Revision 1.110 by root, Sun Aug 13 18:48:57 2006 UTC

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

Diff Legend

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