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

Diff Legend

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