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.93 by root, Sat Jul 15 01:19:55 2006 UTC vs.
Revision 1.121 by root, Sun Oct 1 18:17:38 2006 UTC

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

Diff Legend

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