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.85 by elmex, Sun Jul 2 19:32:56 2006 UTC vs.
Revision 1.120 by root, Sun Oct 1 14:48:51 2006 UTC

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

Diff Legend

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