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.79 by root, Fri Jun 23 23:54:31 2006 UTC vs.
Revision 1.118 by root, Tue Aug 22 06:37:30 2006 UTC

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

Diff Legend

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