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

Diff Legend

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