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.80 by root, Mon Jun 26 21:59:04 2006 UTC vs.
Revision 1.118 by root, Tue Aug 22 06:37:30 2006 UTC

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

Diff Legend

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