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.121 by root, Sun Oct 1 18:17:38 2006 UTC

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

Diff Legend

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