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.76 by root, Tue Jun 20 08:49:40 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;
42use CFPlus::BindingEditor;
41use CFClient::MapWidget; 43use CFPlus::MapWidget;
42 44
43$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 45$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE';
44 47
48$Event::Eval = 0;
45$Event::DIED = sub { 49$Event::DIED = sub {
46 # TODO: display dialog box or so 50 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable 51 Carp::cluck $_[1];#d#TODO: remove when stable
48 CFClient::error $_[1]; 52 return;#d#
53 CFPlus::fatal ($_[1]);
49}; 54};
50
51#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
52
53our $VERSION = '0.1';
54 55
55my $MAX_FPS = 60; 56my $MAX_FPS = 60;
56my $MIN_FPS = 5; # unused as of yet 57my $MIN_FPS = 5; # unused as of yet
57 58
58our $META_SERVER = "crossfire.real-time.com:13326"; 59our $META_SERVER = "crossfire.real-time.com:13326";
… …
60our $LAST_REFRESH; 61our $LAST_REFRESH;
61our $NOW; 62our $NOW;
62 63
63our $CFG; 64our $CFG;
64our $CONN; 65our $CONN;
66our $PROFILE; # current profile
65our $FAST; # fast, low-quality mode, possibly useful for software-rendering 67our $FAST; # fast, low-quality mode, possibly useful for software-rendering
66 68
67our $WANT_REFRESH; 69our $WANT_REFRESH;
68our $CAN_REFRESH; 70our $CAN_REFRESH;
69 71
… …
84our $CONSOLE; 86our $CONSOLE;
85our $METASERVER; 87our $METASERVER;
86our $LOGIN_BUTTON; 88our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 89our $QUIT_DIALOG;
88our $HOST_ENTRY; 90our $HOST_ENTRY;
91our $FULLSCREEN_ENABLE;
92our $PICKUP_ENABLE;
89our $SERVER_INFO; 93our $SERVER_INFO;
90 94
91our $SETUP_DIALOG; 95our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK; 96our $SETUP_NOTEBOOK;
93our $SETUP_SERVER; 97our $SETUP_SERVER;
94our $SETUP_KEYBOARD; 98our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96 99
100our $PL_NOTEBOOK;
97our $STATS_WINDOW; 101our $PL_WINDOW;
102
103our $INVENTORY_PAGE;
104our $STATS_PAGE;
105our $SKILL_PAGE;
106our $SPELL_PAGE;
107
108our $HELP_WINDOW;
98our $MESSAGE_WINDOW; 109our $MESSAGE_WINDOW;
99our $FLOORBOX; 110our $FLOORBOX;
100our $GAUGES; 111our $GAUGES;
101our $STATWIDS; 112our $STATWIDS;
102 113
… …
109 120
110our $ALT_ENTER_MESSAGE; 121our $ALT_ENTER_MESSAGE;
111our $STATUSBOX; 122our $STATUSBOX;
112our $DEBUG_STATUS; 123our $DEBUG_STATUS;
113 124
114our $INV_WINDOW;
115our $INV; 125our $INV;
116our $INVR; 126our $INVR;
117our $INV_RIGHT_HB; 127our $INV_RIGHT_HB;
118 128
119our $BIND_EDITOR; 129our $BIND_EDITOR;
130our $BIND_UPD_CB;
120 131
121our $PICKUP_CFG; 132our $PICKUP_CFG;
122 133
123sub status { 134sub status {
124 $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]);
125} 136}
126 137
127sub debug { 138sub debug {
128 $DEBUG_STATUS->set_text ($_[0]); 139 $DEBUG_STATUS->set_text ($_[0]);
129} 140}
… …
135 146
136# server query dialog 147# server query dialog
137sub server_query { 148sub server_query {
138 my ($conn, $flags, $prompt) = @_; 149 my ($conn, $flags, $prompt) = @_;
139 150
140 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame 151 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
141 x => "center", 152 x => "center",
142 y => "center", 153 y => "center",
143 title => "Server Query", 154 title => "Server Query",
144 child => my $vbox = new CFClient::UI::VBox, 155 child => my $vbox = new CFPlus::UI::VBox,
145 ; 156 ;
146 157
147 my @dialog = my $label = new CFClient::UI::Label 158 my @dialog = my $label = new CFPlus::UI::Label
148 max_w => $::WIDTH * 0.4, 159 max_w => $::WIDTH * 0.4,
149 ellipsise => 0, 160 ellipsise => 0,
150 text => $prompt; 161 text => $prompt;
151 162
152 if ($flags & CS_QUERY_YESNO) { 163 if ($flags & CS_QUERY_YESNO) {
153 push @dialog, my $hbox = new CFClient::UI::HBox; 164 push @dialog, my $hbox = new CFPlus::UI::HBox;
154 165
155 $hbox->add (new CFClient::UI::Button 166 $hbox->add (new CFPlus::UI::Button
156 text => "No", 167 text => "No",
157 on_activate => sub { 168 on_activate => sub {
158 $conn->send ("reply n"); 169 $conn->send ("reply n");
159 $dialog->destroy; 170 $dialog->destroy;
160 0 171 0
161 } 172 }
162 ); 173 );
163 $hbox->add (new CFClient::UI::Button 174 $hbox->add (new CFPlus::UI::Button
164 text => "Yes", 175 text => "Yes",
165 on_activate => sub { 176 on_activate => sub {
166 $conn->send ("reply y"); 177 $conn->send ("reply y");
167 destroy_query_dialog $conn; 178 destroy_query_dialog $conn;
168 0 179 0
… …
170 ); 181 );
171 182
172 $dialog->grab_focus; 183 $dialog->grab_focus;
173 184
174 } elsif ($flags & CS_QUERY_SINGLECHAR) { 185 } elsif ($flags & CS_QUERY_SINGLECHAR) {
175 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 186 $dialog->{tooltip} = "#charcreation_focus";
176 187
177 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) {
178 $MESSAGE_WINDOW->show; 189 $MESSAGE_WINDOW->show;
179 190
180 unshift @dialog, new CFClient::UI::Label 191 unshift @dialog, new CFPlus::UI::Label
181 max_w => $::WIDTH * 0.4, 192 max_w => $::WIDTH * 0.4,
182 ellipsise => 0, 193 ellipsise => 0,
183 markup => "\nOr use your keyboard:\n"; 194 markup => "\nOr use your keyboard and the text entry below:\n";
184 195
185 unshift @dialog, my $table = new CFClient::UI::Table; 196 unshift @dialog, my $table = new CFPlus::UI::Table;
186 197
187 $table->add (0, 0, new CFClient::UI::Button 198 $table->add (0, 0, new CFPlus::UI::Button
188 text => "Next Race", 199 text => "Next Race",
189 on_activate => sub { 200 on_activate => sub {
190 $conn->send ("reply n"); 201 $conn->send ("reply n");
191 destroy_query_dialog $conn; 202 destroy_query_dialog $conn;
192 0 203 0
193 }, 204 },
194 ); 205 );
195 $table->add (2, 0, new CFClient::UI::Button 206 $table->add (2, 0, new CFPlus::UI::Button
196 text => "Accept", 207 text => "Accept",
197 on_activate => sub { 208 on_activate => sub {
198 $conn->send ("reply d"); 209 $conn->send ("reply d");
199 destroy_query_dialog $conn; 210 destroy_query_dialog $conn;
200 0 211 0
201 }, 212 },
202 ); 213 );
203 214
204 unshift @dialog, new CFClient::UI::Label 215 unshift @dialog, new CFPlus::UI::Label
205 max_w => $::WIDTH * 0.4, 216 max_w => $::WIDTH * 0.4,
206 ellipsise => 0, 217 ellipsise => 0,
207 markup => 218 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
208 "<big><b>Character Creation: Race</b></big>\n\n"
209 . "Look at the <b>Messages</b> window to see a description of this race "
210 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
211 . "and the center of the screen to see how this race looks like "
212 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
213 . "You can look at another race, or accept this race (you will come back to this race eventually, "
214 . "so you can take your time making this important choice."
215 ; 219 ;
216 220
217 } elsif ($prompt =~ /roll new stats/) { 221 } elsif ($prompt =~ /roll new stats/) {
218 if (my $stat = delete $conn->{stat_change_with}) { 222 if (my $stat = delete $conn->{stat_change_with}) {
219 $conn->send ("reply $stat"); 223 $conn->send ("reply $stat");
220 destroy_query_dialog $conn; 224 destroy_query_dialog $conn;
221 return; 225 return;
222 } 226 }
223 227
224 $STATS_WINDOW->show; 228 $STATS_PAGE->show;
225 $MESSAGE_WINDOW->hide; 229 $MESSAGE_WINDOW->hide;
226 230
227 unshift @dialog, new CFClient::UI::Label 231 unshift @dialog, new CFPlus::UI::Label
228 max_w => $::WIDTH * 0.4, 232 max_w => $::WIDTH * 0.4,
229 ellipsise => 0, 233 ellipsise => 0,
230 markup => "\nOr use your keyboard:\n"; 234 markup => "\nOr use your keyboard and the text entry below:\n";
231 235
232 unshift @dialog, my $table = new CFClient::UI::Table; 236 unshift @dialog, my $table = new CFPlus::UI::Table;
233 237
234 # left: re-roll 238 # left: re-roll
235 $table->add (0, 0, new CFClient::UI::Button 239 $table->add (0, 0, new CFPlus::UI::Button
236 text => "Roll Again", 240 text => "Roll Again",
237 on_activate => sub { 241 on_activate => sub {
238 $conn->send ("reply y"); 242 $conn->send ("reply y");
239 destroy_query_dialog $conn; 243 destroy_query_dialog $conn;
240 0 244 0
241 }, 245 },
242 ); 246 );
243 247
244 # center: swap stats 248 # center: swap stats
245 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 249 my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
250 expand => 1,
246 value => $_, 251 value => $_,
247 options => [ 252 options => [
248 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 253 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
249 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 254 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
250 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 255 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
… …
253 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 258 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
254 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 259 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
255 ], 260 ],
256 ), 1 .. 2; 261 ), 1 .. 2;
257 262
258 $table->add (2, 0, new CFClient::UI::Button 263 $table->add (2, 0, new CFPlus::UI::Button
259 text => "Swap Stats", 264 text => "Swap Stats",
260 on_activate => sub { 265 on_activate => sub {
261 $conn->{stat_change_with} = $sw2->{value}; 266 $conn->{stat_change_with} = $sw2->{value};
262 $conn->send ("reply $sw1->{value}"); 267 $conn->send ("reply $sw1->{value}");
263 destroy_query_dialog $conn; 268 destroy_query_dialog $conn;
264 0 269 0
265 }, 270 },
266 ); 271 );
267 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 272 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
268 273
269 # right: accept 274 # right: accept
270 $table->add (4, 0, new CFClient::UI::Button 275 $table->add (4, 0, new CFPlus::UI::Button
271 text => "Accept", 276 text => "Accept",
272 on_activate => sub { 277 on_activate => sub {
273 $conn->send ("reply n"); 278 $conn->send ("reply n");
274 $STATS_WINDOW->hide; 279 $STATS_PAGE->hide;
275 destroy_query_dialog $conn; 280 destroy_query_dialog $conn;
276 0 281 0
277 }, 282 },
278 ); 283 );
279 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
280 unshift @dialog, new CFClient::UI::Label 306 unshift @dialog, new CFPlus::UI::Label
281 max_w => $::WIDTH * 0.4, 307 max_w => $::WIDTH * 0.4,
282 ellipsise => 0, 308 ellipsise => 0,
283 markup => 309 markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
284 "<big><b>Character Creation: Stats</b></big>\n\n"
285 . "Look at the <b>Stats</b> window to see your basic stats "
286 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
287 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
288 . "Race selection will influence those values later on."
289 ; 310 ;
290 } 311 }
291 312
292 push @dialog, my $entry = new CFClient::UI::Entry 313 push @dialog, my $entry = new CFPlus::UI::Entry
293 on_changed => sub { 314 on_changed => sub {
294 $conn->send ("reply $_[1]"); 315 $conn->send ("reply $_[1]");
295 destroy_query_dialog $conn; 316 destroy_query_dialog $conn;
296 0 317 0
297 }, 318 },
… …
300 $entry->grab_focus; 321 $entry->grab_focus;
301 322
302 } else { 323 } else {
303 $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)";
304 325
305 push @dialog, my $entry = new CFClient::UI::Entry 326 push @dialog, my $entry = new CFPlus::UI::Entry
306 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 327 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
307 on_activate => sub { 328 on_activate => sub {
308 $conn->send ("reply $_[1]"); 329 $conn->send ("reply $_[1]");
309 destroy_query_dialog $conn; 330 destroy_query_dialog $conn;
310 0 331 0
… …
322 status "logging in..."; 343 status "logging in...";
323 344
324 $LOGIN_BUTTON->set_text ("Logout"); 345 $LOGIN_BUTTON->set_text ("Logout");
325 $SETUP_DIALOG->hide; 346 $SETUP_DIALOG->hide;
326 347
348 $PROFILE = $CFG->{profile}{default};
349
327 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;
328 351
329 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 352 my ($host, $port) = split /:/, $PROFILE->{host};
330 353
331 $MAP = new CFClient::Map $mapsize, $mapsize; 354 $MAP = new CFPlus::Map $mapsize, $mapsize;
332 355
333 $CONN = eval { 356 $CONN = eval {
334 new CFClient::Protocol 357 new CFPlus::Protocol
335 host => $host, 358 host => $host,
336 port => $port || 13327, 359 port => $port || 13327,
337 user => $CFG->{profile}{default}{user}, 360 user => $PROFILE->{user},
338 pass => $CFG->{profile}{default}{password}, 361 pass => $PROFILE->{password},
339 mapw => $mapsize, 362 mapw => $mapsize,
340 maph => $mapsize, 363 maph => $mapsize,
364
365 client => "cfplus $CFPlus::VERSION $] $^O",
341 366
342 map_widget => $MAPWIDGET, 367 map_widget => $MAPWIDGET,
343 logview => $LOGVIEW, 368 logview => $LOGVIEW,
344 statusbox => $STATUSBOX, 369 statusbox => $STATUSBOX,
345 map => $MAP, 370 map => $MAP,
… …
358 $chunk->play; 383 $chunk->play;
359 }, 384 },
360 }; 385 };
361 386
362 if ($CONN) { 387 if ($CONN) {
363 CFClient::lowdelay fileno $CONN->{fh}; 388 CFPlus::lowdelay fileno $CONN->{fh};
364 389
365 status "login successful"; 390 status "login successful";
366 } else { 391 } else {
367 status "unable to connect"; 392 status "unable to connect";
368 stop_game(); 393 stop_game();
… …
371 396
372sub stop_game { 397sub stop_game {
373 $LOGIN_BUTTON->set_text ("Login"); 398 $LOGIN_BUTTON->set_text ("Login");
374 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 399 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
375 $SETUP_DIALOG->show; 400 $SETUP_DIALOG->show;
376 $INV_WINDOW->hide; 401 $PL_WINDOW->hide;
377 $SETUP_SPELLS->clear_spells; 402 $SPELL_PAGE->clear_spells;
378 403
379 return unless $CONN; 404 return unless $CONN;
380 405
381 status "connection closed"; 406 status "connection closed";
382 407
… …
386 411
387 undef $MAP; 412 undef $MAP;
388} 413}
389 414
390sub graphics_setup { 415sub graphics_setup {
391 my $vbox = new CFClient::UI::VBox; 416 my $vbox = new CFPlus::UI::VBox;
392 417
393 $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]);
394 419
395 $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");
396 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 421 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
397 422
398 $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]);
399 $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");
400 425
401 $mode_slider->connect (changed => sub { 426 $mode_slider->connect (changed => sub {
402 my ($self, $value) = @_; 427 my ($self, $value) = @_;
403 428
404 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 429 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
… …
406 }); 431 });
407 $mode_slider->emit (changed => $mode_slider->{range}[0]); 432 $mode_slider->emit (changed => $mode_slider->{range}[0]);
408 433
409 my $row = 1; 434 my $row = 1;
410 435
411 $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");
412 $table->add (1, $row++, new CFClient::UI::CheckBox 437 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
413 state => $CFG->{fullscreen}, 438 state => $CFG->{fullscreen},
414 tooltip => "Bring the client into fullscreen mode.", 439 tooltip => "Bring the client into fullscreen mode.",
415 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 440 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
416 ); 441 );
417 442
418 $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");
419 $table->add (1, $row++, new CFClient::UI::CheckBox 444 $table->add (1, $row++, new CFPlus::UI::CheckBox
420 state => $CFG->{fast}, 445 state => $CFG->{fast},
421 tooltip => "Lower the visual quality considerably to speed up rendering.", 446 tooltip => "Lower the visual quality considerably to speed up rendering.",
422 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 447 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
423 ); 448 );
424 449
425 $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");
426 $table->add (1, $row++, new CFClient::UI::Slider 451 $table->add (1, $row++, new CFPlus::UI::Slider
427 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 452 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
428 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 453 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
429 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 }
430 ); 455 );
431 456
432 $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");
433 $table->add (1, $row++, new CFClient::UI::CheckBox 458 $table->add (1, $row++, new CFPlus::UI::CheckBox
434 state => $CFG->{fow_enable}, 459 state => $CFG->{fow_enable},
435 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.",
436 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 461 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
437 ); 462 );
438 463
439 $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");
440 $table->add (1, $row++, new CFClient::UI::Slider 465 $table->add (1, $row++, new CFPlus::UI::Slider
441 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 466 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
442 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.",
443 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 468 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
444 ); 469 );
445 470
446 $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");
447 $table->add (1, $row++, new CFClient::UI::CheckBox 472 $table->add (1, $row++, new CFPlus::UI::CheckBox
448 state => $CFG->{fow_smooth}, 473 state => $CFG->{fow_smooth},
449 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.",
450 on_changed => sub { 475 on_changed => sub {
451 my ($self, $value) = @_; 476 my ($self, $value) = @_;
452 $CFG->{fow_smooth} = $value; 477 $CFG->{fow_smooth} = $value;
453 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;
454 0 479 0
455 } 480 }
456 ); 481 );
457 482
458 $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");
459 $table->add (1, $row++, new CFClient::UI::Slider 484 $table->add (1, $row++, new CFPlus::UI::Slider
460 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 485 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
461 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.",
462 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 487 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
463 ); 488 );
464 489
465 $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");
466 $table->add (1, $row++, new CFClient::UI::Slider 491 $table->add (1, $row++, new CFPlus::UI::Slider
467 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 492 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
468 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.",
469 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 494 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
470 ); 495 );
471 496
472 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
473
474 $table->add (1, $row++, new CFClient::UI::Slider
475 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
476 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
477 on_changed => sub {
478 $CFG->{stat_fontsize} = $_[1];
479 &set_stats_window_fontsize;
480 0
481 }
482 );
483
484 $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");
485 $table->add (1, $row++, new CFClient::UI::Slider 498 $table->add (1, $row++, new CFPlus::UI::Slider
486 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 499 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
487 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.",
488 on_changed => sub { 501 on_changed => sub {
489 $CFG->{gauge_fontsize} = $_[1]; 502 $CFG->{gauge_fontsize} = $_[1];
490 &set_gauge_window_fontsize; 503 &set_gauge_window_fontsize;
491 0 504 0
492 } 505 }
493 ); 506 );
494 507
495 $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");
496 $table->add (1, $row++, new CFClient::UI::Slider 509 $table->add (1, $row++, new CFPlus::UI::Slider
497 range => [$CFG->{gauge_size}, 0.2, 0.8], 510 range => [$CFG->{gauge_size}, 0.2, 0.8],
498 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.",
499 on_changed => sub { 512 on_changed => sub {
500 $CFG->{gauge_size} = $_[1]; 513 $CFG->{gauge_size} = $_[1];
501 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 514 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
502 0 515 0
503 } 516 }
504 ); 517 );
505 518
506 $table->add (1, $row++, new CFClient::UI::Button 519 $table->add (1, $row++, new CFPlus::UI::Button
507 expand => 1, align => 0, text => "Apply", 520 expand => 1, align => 0, text => "Apply",
508 tooltip => "Apply the video settings", 521 tooltip => "Apply the video settings",
509 on_activate => sub { 522 on_activate => sub {
510 video_shutdown (); 523 video_shutdown ();
511 video_init (); 524 video_init ();
… …
515 528
516 $vbox 529 $vbox
517} 530}
518 531
519sub audio_setup { 532sub audio_setup {
520 my $vbox = new CFClient::UI::VBox; 533 my $vbox = new CFPlus::UI::VBox;
521 534
522 $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]);
523 536
524 my $row = 0; 537 my $row = 0;
525 538
526 $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");
527 $table->add (1, $row++, new CFClient::UI::CheckBox 540 $table->add (1, $row++, new CFPlus::UI::CheckBox
528 state => $CFG->{audio_enable}, 541 state => $CFG->{audio_enable},
529 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.",
530 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 543 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
531 ); 544 );
532# $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");
533# $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 {
534# $CFG->{effects_volume} = $_[1]; 547# $CFG->{effects_volume} = $_[1];
535# }); 548# });
536 $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");
537 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 550 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
538 $hbox->add (new CFClient::UI::CheckBox 551 $hbox->add (new CFPlus::UI::CheckBox
539 expand => 1, state => $CFG->{bgm_enable}, 552 expand => 1, state => $CFG->{bgm_enable},
540 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.",
541 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 554 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
542 ); 555 );
543 $hbox->add (new CFClient::UI::Slider 556 $hbox->add (new CFPlus::UI::Slider
544 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 557 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
545 tooltip => "The volume of the background music. Changes are instant.", 558 tooltip => "The volume of the background music. Changes are instant.",
546 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 }
547 ); 560 );
548 561
549 $table->add (1, $row++, new CFClient::UI::Button 562 $table->add (1, $row++, new CFPlus::UI::Button
550 expand => 1, align => 0, text => "Apply", 563 expand => 1, align => 0, text => "Apply",
551 tooltip => "Apply the audio settings", 564 tooltip => "Apply the audio settings",
552 on_activate => sub { 565 on_activate => sub {
553 audio_shutdown (); 566 audio_shutdown ();
554 audio_init (); 567 audio_init ();
… …
557 ); 570 );
558 571
559 $vbox 572 $vbox
560} 573}
561 574
562sub set_stats_window_fontsize {
563 for (values %{$STATWIDS}) {
564 $_->set_fontsize ($::CFG->{stat_fontsize});
565 }
566}
567
568sub set_gauge_window_fontsize { 575sub set_gauge_window_fontsize {
569 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 576 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
570 $_->set_fontsize ($::CFG->{gauge_fontsize}); 577 $_->set_fontsize ($::CFG->{gauge_fontsize});
571 } 578 }
572} 579}
573 580
574sub make_gauge_window { 581sub make_gauge_window {
575 my $gh = int $HEIGHT * $CFG->{gauge_size}; 582 my $gh = int $HEIGHT * $CFG->{gauge_size};
576 583
577 my $win = new CFClient::UI::Frame ( 584 my $win = new CFPlus::UI::Frame (
578 force_x => 0, 585 force_x => 0,
579 force_y => "max", 586 force_y => "max",
580 force_w => $WIDTH, 587 force_w => $WIDTH,
581 force_h => $gh, 588 force_h => $gh,
582 ); 589 );
583 590
584 $win->add (my $hbox = new CFClient::UI::HBox 591 $win->add (my $hbox = new CFPlus::UI::HBox
585 children => [ 592 children => [
586 (new CFClient::UI::HBox expand => 1), 593 (new CFPlus::UI::HBox expand => 1),
587 (new CFClient::UI::VBox children => [ 594 (new CFPlus::UI::VBox children => [
588 (new CFClient::UI::Empty expand => 1), 595 (new CFPlus::UI::Empty expand => 1),
589 (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)),
590 ]), 597 ]),
591 (my $vbox = new CFClient::UI::VBox), 598 (my $vbox = new CFPlus::UI::VBox),
592 ], 599 ],
593 ); 600 );
594 601
595 $vbox->add (new CFClient::UI::HBox 602 $vbox->add (new CFPlus::UI::HBox
596 expand => 1, 603 expand => 1,
597 children => [ 604 children => [
598 (new CFClient::UI::Empty expand => 1), 605 (new CFPlus::UI::Empty expand => 1),
599 (my $hb = new CFClient::UI::HBox), 606 (my $hb = new CFPlus::UI::HBox),
600 ], 607 ],
601 ); 608 );
602 609
603 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 610 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
604 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.");
605 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 611 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
606 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.");
607 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 612 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
608 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.");
609 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 613 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
610 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.");
611 614
612 $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");
613 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.");
614 $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");
615 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
616 617
617 $GAUGES = { 618 $GAUGES = {
618 exp => $exp, win => $win, range => $rng, 619 exp => $exp, win => $win, range => $rng,
619 food => $fg, mana => $mg, hp => $hg, grace => $gg 620 food => $fg, mana => $mg, hp => $hg, grace => $gg
620 }; 621 };
… …
623 624
624 $win 625 $win
625} 626}
626 627
627sub debug_setup { 628sub debug_setup {
628 my $table = new CFClient::UI::Table; 629 my $table = new CFPlus::UI::Table;
629 630
630 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 631 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
631 $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 });
632 $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");
633 $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 });
634 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 635 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
635 $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 });
636 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 637 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
637 $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 });
638 639
639 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);
640 641
641 for my $x (0..2) { 642 for my $x (0..2) {
642 for my $y (0 .. 2) { 643 for my $y (0 .. 2) {
643 $table->add ($x + 3, $y, 644 $table->add ($x + 3, $y,
644 new CFClient::UI::Entry 645 new CFPlus::UI::Entry
645 text => $default_smooth[$x * 3 + $y], 646 text => $default_smooth[$x * 3 + $y],
646 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 },
647 ); 648 );
648 } 649 }
649 } 650 }
… …
651 652
652 $table 653 $table
653} 654}
654 655
655sub stats_window { 656sub stats_window {
656 my $tgw = new CFClient::UI::FancyFrame 657 my $r = new CFPlus::UI::ScrolledWindow (
657 y => $HEIGHT * (2/8), 658 expand => 1,
658 x => "max", 659 scroll_y => 1
659 title => "Stats", 660 );
660 name => "stats_window", 661 $r->add (my $vb = new CFPlus::UI::VBox);
661 has_close_button => 1;
662 662
663 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 663 $vb->add (new CFPlus::UI::FancyFrame
664 label => "Player",
665 child => (my $pi = new CFPlus::UI::VBox),
666 );
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."], 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)"],
726 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 748 phys => ["Physical",
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 image => "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_ARMOUR});
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 {
818 my ($metaserver_dialog) = @_;
819
820 $METASERVER = $metaserver_dialog
821 if defined $metaserver_dialog;
822
845 return if $METASERVER_ATIME > time; 823 return if $METASERVER_ATIME > time;
846 $METASERVER_ATIME = time + 60; 824 $METASERVER_ATIME = time + 60;
847 825
848 my $table = $METASERVER->{table}; 826 my $table = $METASERVER->{table};
849 $table->clear; 827 $table->clear;
850 $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...");
851 829
852 my $buf; 830 my $buf;
853 831
854 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 832 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
855 833
… …
878 "The time this server has been running without being restarted.", 856 "The time this server has been running without being restarted.",
879 "The server software version - a '+' indicates a Crossfire+ server.", 857 "The server software version - a '+' indicates a Crossfire+ server.",
880 "Short information about this server provided by its admins.", 858 "Short information about this server provided by its admins.",
881 ); 859 );
882 my @col = qw(#Users Host Uptime Version Description); 860 my @col = qw(#Users Host Uptime Version Description);
883 $table->add ($_, 0, new CFClient::UI::Label 861 $table->add ($_, 0, new CFPlus::UI::Label
884 can_hover => 1, can_events => 1, 862 can_hover => 1, can_events => 1,
885 align => 0, fg => [1, 1, 0], 863 align => 0, fg => [1, 1, 0],
886 text => $col[$_], tooltip => $tip[$_]) 864 text => $col[$_], tooltip => $tip[$_])
887 for 0 .. $#col; 865 for 0 .. $#col;
888 866
… …
909 887
910 $m = [$users, $host, $uptime, $version, $desc]; 888 $m = [$users, $host, $uptime, $version, $desc];
911 889
912 $y++; 890 $y++;
913 891
914 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 892 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
915 (new CFClient::UI::Button 893 (new CFPlus::UI::Button
916 text => "Use", 894 text => "Use",
917 tooltip => "Put this server into the <b>Host:Port</b> field", 895 tooltip => "Put this server into the <b>Host:Port</b> field",
918 on_activate => sub { 896 on_activate => sub {
919 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 897 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
920 $METASERVER->hide; 898 $METASERVER->hide;
921 0 899 0
922 }, 900 },
923 ), 901 ),
924 (new CFClient::UI::Empty expand => 1), 902 (new CFPlus::UI::Empty expand => 1),
925 ]); 903 ]);
926 904
927 $table->add ($_, $y, new CFClient::UI::Label 905 $table->add ($_, $y, new CFPlus::UI::Label
928 ellipsise => 0, 906 ellipsise => 0,
929 align => $align[$_], 907 align => $align[$_],
930 text => $m->[$_], 908 text => $m->[$_],
931 tooltip => $tip[$_], 909 tooltip => $tip[$_],
932 can_hover => 1, 910 can_hover => 1,
… …
937 } 915 }
938 }); 916 });
939} 917}
940 918
941sub metaserver_dialog { 919sub metaserver_dialog {
942 my $dialog = new CFClient::UI::FancyFrame 920 my $vbox = new CFPlus::UI::VBox;
921 my $table = new CFPlus::UI::Table;
922 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
923
924 my $dialog = new CFPlus::UI::Toplevel
943 title => "Server List", 925 title => "Server List",
944 name => 'metaserver_dialog', 926 name => 'metaserver_dialog',
945 x => 'center', 927 x => 'center',
946 y => 'center', 928 y => 'center',
947 z => 3, 929 z => 3,
948 force_h => $::HEIGHT * 0.4, 930 force_h => $::HEIGHT * 0.4,
949 child => (my $vbox = new CFClient::UI::VBox), 931 child => $vbox,
932 has_close_button => 1,
933 table => $table,
950 on_visibility_change => sub { 934 on_visibility_change => sub {
951 update_metaserver if $_[1]; 935 update_metaserver ($_[0]) if $_[1];
952 0 936 0
953 }, 937 },
954 ; 938 ;
955 939
956 $dialog->{table} = new CFClient::UI::Table;
957
958 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
959
960 $dialog 940 $dialog
961} 941}
962 942
963sub server_setup { 943sub server_setup {
964 my $vbox = new CFClient::UI::VBox; 944 my $vbox = new CFPlus::UI::VBox;
965 945
946 $vbox->add (new CFPlus::UI::FancyFrame
947 label => "Connection Settings",
966 $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 );
967 $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");
968 951
969 { 952 {
970 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 953 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
971 954
972 $vbox->add ( 955 $vbox->add (
973 $HOST_ENTRY = new CFClient::UI::Entry 956 $HOST_ENTRY = new CFPlus::UI::Entry
974 expand => 1, 957 expand => 1,
975 text => $CFG->{profile}{default}{host}, 958 text => $CFG->{profile}{default}{host},
976 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",
977 on_changed => sub { 960 on_changed => sub {
978 my ($self, $value) = @_; 961 my ($self, $value) = @_;
979 $CFG->{profile}{default}{host} = $value; 962 $CFG->{profile}{default}{host} = $value;
980 0 963 0
981 } 964 }
982 ); 965 );
983 966
984 $METASERVER = metaserver_dialog;
985
986 $vbox->add (new CFClient::UI::Button 967 $vbox->add (new CFPlus::UI::Button
987 expand => 1, 968 expand => 1,
988 text => "Server List", 969 text => "Server List",
989 other => $METASERVER, 970 other => $METASERVER,
990 tooltip => "Show a list of available crossfire servers", 971 tooltip => "Show a list of available crossfire servers",
991 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 972 on_activate => sub { $METASERVER->toggle_visibility; 0 },
992 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 973 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
993 ); 974 );
994 } 975 }
995 976
996 $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");
997 $table->add (1, 4, new CFClient::UI::Entry 978 $table->add (1, 4, new CFPlus::UI::Entry
998 text => $CFG->{profile}{default}{user}, 979 text => $CFG->{profile}{default}{user},
999 tooltip => "The name of your character on the server", 980 tooltip => "The name of your character on the server",
1000 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 981 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1001 ); 982 );
1002 983
1003 $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");
1004 $table->add (1, 5, new CFClient::UI::Entry 985 $table->add (1, 5, new CFPlus::UI::Entry
1005 text => $CFG->{profile}{default}{password}, 986 text => $CFG->{profile}{default}{password},
1006 hidden => 1, 987 hidden => 1,
1007 tooltip => "The password for your character", 988 tooltip => "The password for your character",
1008 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 989 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1009 ); 990 );
1010 991
1011 $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");
1012 $table->add (1, 7, new CFClient::UI::Slider 993 $table->add (1, 7, new CFPlus::UI::Slider
1013 force_w => 100, 994 force_w => 100,
1014 range => [$CFG->{mapsize}, 10, 100, 0, 1], 995 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1015 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. "
1016 . "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, "
1017 . "but you also increase bandwidth requirements and latency. " 998 . "but you also increase bandwidth requirements and latency. "
1018 . "This option is only used once at log-in.", 999 . "This option is only used once at log-in.",
1019 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 },
1020 ); 1001 );
1021 1002
1022 $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");
1023 $table->add (1, 8, new CFClient::UI::CheckBox 1004 $table->add (1, 8, new CFPlus::UI::CheckBox
1024 state => $CFG->{face_prefetch}, 1005 state => $CFG->{face_prefetch},
1025 tooltip => "<b>Background Image Prefetch</b>\n\n" 1006 tooltip => "<b>Background Image Prefetch</b>\n\n"
1026 . "If enabled, the client automatically pre-fetches images from the server. " 1007 . "If enabled, the client automatically pre-fetches images from the server. "
1027 . "This might increase or create lag, but increases the chances " 1008 . "This might increase or create lag, but increases the chances "
1028 . "of faces being ready for display when you encounter them. " 1009 . "of faces being ready for display when you encounter them. "
… …
1030 . "so only set it if you really need to prefetch images. " 1011 . "so only set it if you really need to prefetch images. "
1031 . "This option can be set and unset any time.", 1012 . "This option can be set and unset any time.",
1032 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1013 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1033 ); 1014 );
1034 1015
1035 $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");
1036 $table->add (1, 9, new CFClient::UI::Entry 1017 $table->add (1, 9, new CFPlus::UI::Entry
1037 text => $CFG->{output_count}, 1018 text => $CFG->{output_count},
1038 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.",
1039 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1020 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1040 ); 1021 );
1041 1022
1042 $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");
1043 $table->add (1, 10, new CFClient::UI::Entry 1024 $table->add (1, 10, new CFPlus::UI::Entry
1044 text => $CFG->{output_sync}, 1025 text => $CFG->{output_sync},
1045 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.",
1046 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1027 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1047 ); 1028 );
1048 1029
1049 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1030 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1050 expand => 1, 1031 expand => 1,
1051 align => 0, 1032 align => 0,
1052 text => "Login", 1033 text => "Login",
1053 on_activate => sub { 1034 on_activate => sub {
1054 $CONN ? stop_game 1035 $CONN ? stop_game
1055 : start_game; 1036 : start_game;
1056 0 1037 0
1057 }, 1038 },
1058 ); 1039 );
1059 1040
1060 $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");
1061 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1042 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1062 text => $CFG->{say_command}, 1043 text => $CFG->{say_command},
1063 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. "
1064 . "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. "
1065 . "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.",
1066 on_changed => sub { 1047 on_changed => sub {
1067 my ($self, $value) = @_; 1048 my ($self, $value) = @_;
1068 $CFG->{say_command} = $value; 1049 $CFG->{say_command} = $value;
1069 0 1050 0
1070 } 1051 }
1071 ); 1052 );
1072 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
1073 $vbox->add (new CFClient::UI::Label 1065 $vbox->add (new CFPlus::UI::FancyFrame
1074 text => "Server Info", 1066 label => "Server Info",
1075 fontsize => 1.2,
1076 padding_y => 8,
1077 fg => [1, 1, 0, 1],
1078 );
1079
1080 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0); 1067 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1068 );
1081 1069
1082 $vbox 1070 $vbox
1083} 1071}
1084 1072
1085sub message_window { 1073sub message_window {
1086 my $window = new CFClient::UI::FancyFrame 1074 my $window = new CFPlus::UI::Toplevel
1087 name => "message_window", 1075 name => "message_window",
1088 title => "Messages", 1076 title => "Messages",
1089 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
1090 bg => [0, 0, 0, 0.75],
1091 x => "max", 1078 x => "max",
1092 y => 0, 1079 y => 0,
1093 force_w => $::WIDTH * 0.4, 1080 force_w => $::WIDTH * 0.4,
1094 force_h => $::HEIGHT * 0.5, 1081 force_h => $::HEIGHT * 0.5,
1095 child => (my $vbox = new CFClient::UI::VBox), 1082 child => (my $vbox = new CFPlus::UI::VBox),
1096 has_close_button => 1; 1083 has_close_button => 1;
1097 1084
1098 $vbox->add ($LOGVIEW); 1085 $vbox->add ($LOGVIEW);
1099 1086
1100 $vbox->add (my $input = new CFClient::UI::Entry 1087 $vbox->add (my $input = new CFPlus::UI::Entry
1101 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> "
1102 . "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>...). "
1103 . "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). "
1104 . "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.",
1105 on_focus_in => sub { 1092 on_focus_in => sub {
… …
1144 }; 1131 };
1145 1132
1146 $window 1133 $window
1147} 1134}
1148 1135
1149sub open_quit_dialog {
1150 unless ($QUIT_DIALOG) {
1151 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1152 x => "center",
1153 y => "center",
1154 z => 50,
1155 title => "Really Quit?",
1156 ;
1157
1158 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1159
1160 $vb->add (new CFClient::UI::Label
1161 text => "You should find a savebed and apply it first!",
1162 max_w => $WIDTH * 0.25,
1163 ellipsize => 0,
1164 );
1165 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1166 $hb->add (new CFClient::UI::Button
1167 text => "Ok",
1168 expand => 1,
1169 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1170 );
1171 $hb->add (new CFClient::UI::Button
1172 text => "Quit anyway",
1173 expand => 1,
1174 on_activate => sub { exit },
1175 );
1176 }
1177
1178 $QUIT_DIALOG->show;
1179}
1180
1181sub autopickup_setup { 1136sub autopickup_setup {
1182 my $table = new CFClient::UI::Table; 1137 my $table = new CFPlus::UI::Table;
1183 1138
1184 for ( 1139 for (
1185 ["General", 0, 0, 1140 ["General", 0, 0,
1186 ["Enable autopickup" => PICKUP_NEWMODE], 1141 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1187 ["Inhibit autopickup" => PICKUP_INHIBIT], 1142 ["Inhibit autopickup" => PICKUP_INHIBIT],
1188 ["Stop before pickup" => PICKUP_STOP], 1143 ["Stop before pickup" => PICKUP_STOP],
1189 ["Debug autopickup" => PICKUP_DEBUG], 1144 ["Debug autopickup" => PICKUP_DEBUG],
1190 ], 1145 ],
1191 ["Weapons", 0, 6, 1146 ["Weapons", 0, 6,
… …
1221 ], 1176 ],
1222 ["Weight/Value ratio", 2, 17] 1177 ["Weight/Value ratio", 2, 17]
1223 ) 1178 )
1224 { 1179 {
1225 my ($title, $x, $y, @bits) = @$_; 1180 my ($title, $x, $y, @bits) = @$_;
1226 $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]);
1227 1182
1228 for (@bits) { 1183 for (@bits) {
1229 ++$y; 1184 ++$y;
1230 1185
1231 my $mask = $_->[1]; 1186 my $mask = $_->[1];
1232 $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);
1233 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1188 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1234 state => $CFG->{pickup} & $mask, 1189 state => $::CFG->{pickup} & $mask,
1235 on_changed => sub { 1190 on_changed => sub {
1236 my ($box, $value) = @_; 1191 my ($box, $value) = @_;
1237 1192
1238 if ($value) { 1193 if ($value) {
1239 $::CFG->{pickup} |= $mask; 1194 $::CFG->{pickup} |= $mask;
… …
1244 $::CONN->send_command ("pickup $::CFG->{pickup}") 1199 $::CONN->send_command ("pickup $::CFG->{pickup}")
1245 if defined $::CONN; 1200 if defined $::CONN;
1246 1201
1247 0 1202 0
1248 }); 1203 });
1204
1205 ${$_->[2]} = $checkbox if $_->[2];
1249 } 1206 }
1250 } 1207 }
1251 1208
1252 $table->add (2, 18, new CFClient::UI::ValSlider 1209 $table->add (2, 18, new CFPlus::UI::ValSlider
1253 range => [0, 0, 16, 1, 1], 1210 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1211 template => ">= 99",
1254 to_value => sub { ">= " . 5 * $_[0] }, 1212 to_value => sub { ">= " . 5 * $_[0] },
1255 on_changed => sub { 1213 on_changed => sub {
1256 my ($slider, $value) = @_; 1214 my ($slider, $value) = @_;
1257 1215
1258 $::CFG->{pickup} &= ~0x7; 1216 $::CFG->{pickup} &= ~0xF;
1259 $::CFG->{pickup} |= int $value 1217 $::CFG->{pickup} |= int $value
1260 if $value; 1218 if $value;
1261 1; 1219 1;
1262 }); 1220 });
1221
1263 $table->add (3, 18, new CFClient::UI::Button 1222 $table->add (3, 18, new CFPlus::UI::Button
1264 text => "set", 1223 text => "set",
1265 on_activate => sub { 1224 on_activate => sub {
1266 $::CONN->send_command ("pickup $::CFG->{pickup}") 1225 $::CONN->send_command ("pickup $::CFG->{pickup}")
1267 if defined $::CONN; 1226 if defined $::CONN;
1268 0 1227 0
1269 }); 1228 });
1270 1229
1271 $table 1230 $table
1272} 1231}
1273 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
1274sub inventory_window { 1246sub inventory_widget {
1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1247 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1248
1249 $hb->add (my $vb1 = new CFPlus::UI::VBox);
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);
1273 $sw1->add ($INV = new CFPlus::UI::Inventory);
1274
1275 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1276
1277 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1278
1279 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1280 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1281
1282 # XXX: Call after $INVR = ... because set_opencont sets the items
1283 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1284
1285 $hb
1286}
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
1299sub player_window {
1300 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1276 x => "center", 1301 x => "center",
1277 y => "center", 1302 y => "center",
1278 force_w => $WIDTH * 9/10, 1303 force_w => $WIDTH * 9/10,
1279 force_h => $HEIGHT * 9/10, 1304 force_h => $HEIGHT * 9/10,
1280 title => "Inventory", 1305 title => "Player",
1306 name => "playerbook",
1281 has_close_button => 1, 1307 has_close_button => 1
1282 ; 1308 ;
1283 1309
1284 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1310 my $ntb =
1311 $PL_NOTEBOOK =
1312 new CFPlus::UI::Notebook expand => 1, debug => 1;
1285 1313
1286 $hb->add (my $vb1 = new CFClient::UI::VBox); 1314 $ntb->add (
1287 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1315 "Statistics (F2)" => $STATS_PAGE = stats_window,
1288 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 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 );
1289 1322
1290 $hb->add (my $vb2 = new CFClient::UI::VBox); 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,
1331 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1332 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1333 );
1291 1334
1292 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1335 $ntb->set_current_page ($INVENTORY_PAGE);
1293 1336
1294 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1337 $plwin->add ($ntb);
1295 1338 $plwin
1296 # XXX: Call after $INVR = ... because set_opencont sets the items
1297 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1298
1299 $invwin
1300} 1339}
1301 1340
1302sub spell_setup { 1341sub update_bindings {
1303 new CFClient::UI::SpellList 1342 $BIND_UPD_CB->() if $BIND_UPD_CB;
1304} 1343}
1305 1344
1306sub keyboard_setup { 1345sub keyboard_setup {
1307 my $binding_list = new CFClient::UI::VBox; 1346 my $binding_list = new CFPlus::UI::VBox;
1308 1347
1309 my $refresh; 1348 my $refresh;
1310 $refresh = sub { 1349 $refresh = $BIND_UPD_CB = sub {
1311 $binding_list->clear (); 1350 $binding_list->clear ();
1312 1351
1352 return unless $PROFILE;
1353
1313 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1354 for my $mod (keys %{$PROFILE->{bindings}}) {
1314 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1355 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1315 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1356 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1316 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1357 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1317 1358
1318 my $lbl = join "; ", @$cmds; 1359 my $lbl = join "; ", @$cmds;
1319 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1360 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1320 $binding_list->add (my $hb = new CFClient::UI::HBox); 1361 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1321 $hb->add (new CFClient::UI::Button 1362 $hb->add (new CFPlus::UI::Button
1322 text => "delete", 1363 text => "delete",
1323 tooltip => "Deletes the binding", 1364 tooltip => "Deletes the binding",
1324 on_activate => sub { 1365 on_activate => sub {
1325 $binding_list->remove ($hb); 1366 $binding_list->remove ($hb);
1326 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1367 delete $PROFILE->{bindings}{$mod}{$sym};
1327 0 1368 0
1328 }); 1369 });
1329 1370
1330 $hb->add (new CFClient::UI::Button 1371 $hb->add (new CFPlus::UI::Button
1331 text => "edit", 1372 text => "edit",
1332 tooltip => "Edits the binding", 1373 tooltip => "Edits the binding",
1333 on_activate => sub { 1374 on_activate => sub {
1334 $::BIND_EDITOR->set_binding ( 1375 $::BIND_EDITOR->set_binding (
1335 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1376 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1336 sub { 1377 sub {
1337 my ($nmod, $nsym, $ncmds) = @_; 1378 my ($nmod, $nsym, $ncmds) = @_;
1338 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1379 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1339 $::CFG->{profile}{default}{bindings}{$nmod}{$nsym} = $ncmds; 1380 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1340 $refresh->(); 1381 $refresh->();
1341 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1382 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1342 $SETUP_DIALOG->show; 1383 $SETUP_DIALOG->show;
1343 }, 1384 },
1344 sub { 1385 sub {
… …
1348 $::BIND_EDITOR->show; 1389 $::BIND_EDITOR->show;
1349 $SETUP_DIALOG->hide; 1390 $SETUP_DIALOG->hide;
1350 0 1391 0
1351 }); 1392 });
1352 1393
1353 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1394 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1354 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1395 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1355 } 1396 }
1356 } 1397 }
1357 }; 1398 };
1358 1399
1359 my $vb = new CFClient::UI::VBox; 1400 my $vb = new CFPlus::UI::VBox;
1360 $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 );
1361 $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");
1362 $hb->add (new CFClient::UI::CheckBox 1406 $hb->add (new CFPlus::UI::CheckBox
1363 expand => 1, 1407 expand => 1,
1364 state => $CFG->{shift_fire_stop}, 1408 state => $CFG->{shift_fire_stop},
1365 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",
1366 on_changed => sub { 1410 on_changed => sub {
1367 my ($cbox, $value) = @_; 1411 my ($cbox, $value) = @_;
1368 $CFG->{shift_fire_stop} = $value; 1412 $CFG->{shift_fire_stop} = $value;
1369 0 1413 0
1370 }); 1414 });
1371 1415
1372 $vb->add ($binding_list); 1416 $vb->add (new CFPlus::UI::FancyFrame
1417 label => "Bindings",
1418 child => $binding_list);
1373 $vb->add (my $hb = new CFClient::UI::HBox); 1419 $vb->add (my $hb = new CFPlus::UI::HBox);
1374 1420
1375 $hb->add (new CFClient::UI::Button 1421 $hb->add (new CFPlus::UI::Button
1376 text => "record new", 1422 text => "record new",
1377 expand => 1, 1423 expand => 1,
1378 tooltip => "This button opens the binding editor with an empty binding.", 1424 tooltip => "This button opens the binding editor with an empty binding.",
1379 on_activate => sub { 1425 on_activate => sub {
1380 $::BIND_EDITOR->set_binding (undef, undef, [], 1426 $::BIND_EDITOR->set_binding (undef, undef, [],
1381 sub { 1427 sub {
1382 my ($mod, $sym, $cmds) = @_; 1428 my ($mod, $sym, $cmds) = @_;
1383 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds; 1429 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1384 $refresh->(); 1430 $refresh->();
1385 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1431 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1386 $SETUP_DIALOG->show; 1432 $SETUP_DIALOG->show;
1387 }, 1433 },
1388 sub { 1434 sub {
… …
1394 $::BIND_EDITOR->show; 1440 $::BIND_EDITOR->show;
1395 0 1441 0
1396 }, 1442 },
1397 ); 1443 );
1398 1444
1399 $hb->add (new CFClient::UI::Button 1445 $hb->add (new CFPlus::UI::Button
1400 text => "close", 1446 text => "close",
1401 tooltip => "Closes the binding window", 1447 tooltip => "Closes the binding window",
1402 expand => 1, 1448 expand => 1,
1403 on_activate => sub { 1449 on_activate => sub {
1404 $SETUP_DIALOG->hide; 1450 $SETUP_DIALOG->hide;
… …
1410 1456
1411 $vb 1457 $vb
1412} 1458}
1413 1459
1414sub help_window { 1460sub help_window {
1415 my $win = new CFClient::UI::FancyFrame 1461 my $win = new CFPlus::UI::Toplevel
1416 x => 'center', 1462 x => 'center',
1417 y => 'center', 1463 y => 'center',
1418 z => 2, 1464 z => 4,
1419 name => 'doc_browser', 1465 name => 'doc_browser',
1420 force_w => int $WIDTH * 7/8, 1466 force_w => int $WIDTH * 7/8,
1421 force_h => int $HEIGHT * 7/8, 1467 force_h => int $HEIGHT * 7/8,
1422 title => "Documentation"; 1468 title => "Help Browser",
1469 has_close_button => 1;
1423 1470
1424 $win->add (my $vbox = new CFClient::UI::VBox); 1471 $win->add (my $vbox = new CFPlus::UI::VBox);
1425 1472
1426 $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 );
1427 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1477 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1428 expand => 1, fontsize => 0.8, padding_x => 4); 1478 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1429 1479
1430 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1480 my @history;
1431 $buttons->add (my $combo = new CFClient::UI::Combobox 1481 my @future;
1432 value => undef, 1482 my $curnode;
1433 options => [ 1483
1434 [intro => "Introduction"], 1484 my $load_node; $load_node = sub {
1435 [manual => "Manual"], 1485 my ($node, $para) = @_;
1436 [skill_help => "Skills"], 1486
1437 [command_help => "Commands"], 1487 $buttons->clear;
1438 [dmcommand_help => "DM Commands"], 1488
1439 [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 );
1440 ], 1509 }
1441 on_changed => sub {
1442 my ($self, $pod) = @_;
1443 1510
1444 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1511 if (@future) {
1445 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 }
1446 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
1447 $viewer->clear; 1543 $viewer->clear;
1544 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1545 $viewer->scroll_to ($para);
1546 };
1547
1548 $load_node->(CFPlus::Pod::find pod => "mainpage");
1549
1550 $CFPlus::Pod::goto_document = sub {
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;
1448 1593 }
1449 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1594 ;
1450 for @$pom;
1451 1595
1452 $viewer->set_offset (0); 1596 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1453 0 1597
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;
1454 }, 1666 },
1455 on_visibility_change => sub {
1456 my ($self, $visible) = @_;
1457 return unless $visible;
1458 return if $self->{value};
1459 $self->set_value ("intro");
1460 0
1461 },
1462 ); 1667 );
1463 1668
1464 $win 1669 $dialog->show;
1465} 1670}
1466 1671
1467sub sdl_init { 1672sub sdl_init {
1468 CFClient::SDL_Init 1673 CFPlus::SDL_Init
1469 and die "SDL::Init failed!\n"; 1674 and die "SDL::Init failed!\n";
1470} 1675}
1471 1676
1472sub video_init { 1677sub video_init {
1473 sdl_init; 1678 sdl_init;
… …
1478 1683
1479 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1684 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1480 $FULLSCREEN = $CFG->{fullscreen}; 1685 $FULLSCREEN = $CFG->{fullscreen};
1481 $FAST = $CFG->{fast}; 1686 $FAST = $CFG->{fast};
1482 1687
1483 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1688 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1484 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1689 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1485 1690
1486 $SDL_ACTIVE = 1; 1691 $SDL_ACTIVE = 1;
1487 $LAST_REFRESH = time - 0.01; 1692 $LAST_REFRESH = time - 0.01;
1488 1693
1489 CFClient::OpenGL::init; 1694 CFPlus::OpenGL::init;
1490 1695
1491 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1696 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1492 1697
1493 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1698 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1494 1699
1495 ############################################################################# 1700 #############################################################################
1496 1701
1497 if ($DEBUG_STATUS) { 1702 if ($DEBUG_STATUS) {
1498 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1703 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1499 } else { 1704 } else {
1500 # create the widgets 1705 # create the widgets
1501 1706
1502 $DEBUG_STATUS = new CFClient::UI::Label 1707 $DEBUG_STATUS = new CFPlus::UI::Label
1503 padding => 0, 1708 padding => 0,
1504 z => 100, 1709 z => 100,
1505 force_x => "max", 1710 force_x => "max",
1506 force_y => 0; 1711 force_y => 0;
1507 $DEBUG_STATUS->show; 1712 $DEBUG_STATUS->show;
1508 1713
1509 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1714 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1510 1715
1511 $STATUSBOX = new CFClient::UI::Statusbox; 1716 $STATUSBOX = new CFPlus::UI::Statusbox;
1512 $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]);
1513 1718
1514 (new CFClient::UI::Frame 1719 (new CFPlus::UI::Frame
1515 bg => [0, 0, 0, 0.4], 1720 bg => [0, 0, 0, 0.4],
1516 force_x => 0, 1721 force_x => 0,
1517 force_y => "max", 1722 force_y => "max",
1518 child => $STATUSBOX, 1723 child => $STATUSBOX,
1519 )->show; 1724 )->show;
1520 1725
1521 CFClient::UI::FancyFrame->new ( 1726 CFPlus::UI::Toplevel->new (
1522 title => "Map", 1727 title => "Map",
1523 name => "mapmap", 1728 name => "mapmap",
1524 x => 0, 1729 x => 0,
1525 y => $FONTSIZE + 8, 1730 y => $FONTSIZE + 8,
1526 border_bg => [1, 1, 1, 192/255], 1731 border_bg => [1, 1, 1, 192/255],
1527 bg => [1, 1, 1, 0], 1732 bg => [1, 1, 1, 0],
1528 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1733 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1529 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.",
1530 ), 1735 ),
1531 )->show; 1736 )->show;
1532 1737
1533 $MAPWIDGET = new CFClient::MapWidget; 1738 $MAPWIDGET = new CFPlus::MapWidget;
1534 $MAPWIDGET->connect (activate_console => sub { 1739 $MAPWIDGET->connect (activate_console => sub {
1535 my ($mapwidget, $preset) = @_; 1740 my ($mapwidget, $preset) = @_;
1536 1741
1537 if ($CONSOLE) { 1742 if ($CONSOLE) {
1538 $CONSOLE->{input}->{auto_activated} = 1; 1743 $CONSOLE->{input}->{auto_activated} = 1;
… …
1544 } 1749 }
1545 }); 1750 });
1546 $MAPWIDGET->show; 1751 $MAPWIDGET->show;
1547 $MAPWIDGET->grab_focus; 1752 $MAPWIDGET->grab_focus;
1548 1753
1549 $LOGVIEW = new CFClient::UI::TextScroller 1754 $LOGVIEW = new CFPlus::UI::TextScroller
1550 expand => 1, 1755 expand => 1,
1551 font => $FONT_FIXED, 1756 font => $FONT_FIXED,
1552 fontsize => $::CFG->{log_fontsize}, 1757 fontsize => $::CFG->{log_fontsize},
1553 indent => -4, 1758 indent => -4,
1554 can_hover => 1, 1759 can_hover => 1,
1555 can_events => 1, 1760 can_events => 1,
1556 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.",
1557 ; 1762 ;
1558 1763
1559 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1764 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1560 title => "Setup", 1765 title => "Setup",
1561 name => "setup_dialog", 1766 name => "setup_dialog",
1562 x => 'center', 1767 x => 'center',
1563 y => 'center', 1768 y => 'center',
1564 z => 2, 1769 z => 2,
1565 force_w => $::WIDTH * 0.6, 1770 force_w => $::WIDTH * 0.6,
1566 force_h => $::HEIGHT * 0.6, 1771 force_h => $::HEIGHT * 0.6,
1567 has_close_button => 1, 1772 has_close_button => 1,
1568 ; 1773 ;
1569 1774
1775 $METASERVER = metaserver_dialog;
1776
1570 $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,
1571 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1778 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1572 1779
1573 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1780 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1574 "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.");
1575 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1782 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1576 "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.");
… …
1583 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1790 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1584 . "with nothing set and the recording started. After doing the actions you " 1791 . "with nothing set and the recording started. After doing the actions you "
1585 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1792 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1586 . "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 "
1587 . "binding editor closes"); 1794 . "binding editor closes");
1588 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1589 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1590 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1795 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1591 "Some debuggin' options. Do not ask."); 1796 "Some debuggin' options. Do not ask.");
1592 1797
1593 $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
1594 1799
1595 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1800 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1596 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.");
1597 1802
1598 $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,
1599 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.");
1600 1805
1601 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
1602 1807
1603 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1604 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1605 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1808 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1606 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1809 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1607 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1608 1810
1609 $BUTTONBAR->add (new CFClient::UI::Button 1811 $BUTTONBAR->add (new CFPlus::UI::Button
1610 text => "Save Config", 1812 text => "Save Config",
1611 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.",
1612 on_activate => sub { 1814 on_activate => sub {
1613 $::CFG->{layout} = CFClient::UI::get_layout; 1815 $::CFG->{layout} = CFPlus::UI::get_layout;
1614 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1816 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1615 status "Configuration Saved"; 1817 status "Configuration Saved";
1616 0 1818 0
1617 }, 1819 },
1618 ); 1820 );
1619 1821
1620 $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,
1621 tooltip => "View Documentation"); 1823 tooltip => "View Documentation");
1622 1824
1623 $BUTTONBAR->add (new CFClient::UI::Button 1825 $BUTTONBAR->add (new CFPlus::UI::Button
1624 text => "Quit", 1826 text => "Quit",
1625 tooltip => "Terminates the program", 1827 tooltip => "Terminates the program",
1626 on_activate => sub { 1828 on_activate => sub {
1627 if ($CONN) { 1829 if ($CONN) {
1628 open_quit_dialog; 1830 open_quit_dialog;
… …
1639 1841
1640 $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]);
1641} 1843}
1642 1844
1643sub video_shutdown { 1845sub video_shutdown {
1644 CFClient::OpenGL::shutdown; 1846 CFPlus::OpenGL::shutdown;
1645 1847
1646 undef $SDL_ACTIVE; 1848 undef $SDL_ACTIVE;
1647} 1849}
1648 1850
1649my @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#
… …
1657 1859
1658sub audio_music_finished { 1860sub audio_music_finished {
1659 return unless $CFG->{bgm_enable}; 1861 return unless $CFG->{bgm_enable};
1660 1862
1661 # TODO: hack, do play loop and mood music 1863 # TODO: hack, do play loop and mood music
1662 $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]";
1663 $bgmusic->play (0); 1865 $bgmusic->play (0);
1664 1866
1665 push @bgmusic, shift @bgmusic; 1867 push @bgmusic, shift @bgmusic;
1666} 1868}
1667 1869
1668sub audio_init { 1870sub audio_init {
1669 if ($CFG->{audio_enable}) { 1871 if ($CFG->{audio_enable}) {
1670 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1872 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1671 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1873 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1672 1874
1673 unless ($SDL_MIXER) { 1875 unless ($SDL_MIXER) {
1674 status "Unable to open sound device: there will be no sound"; 1876 status "Unable to open sound device: there will be no sound";
1675 return; 1877 return;
1676 } 1878 }
1677 1879
1678 CFClient::Mix_AllocateChannels 8; 1880 CFPlus::Mix_AllocateChannels 8;
1679 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1881 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1680 1882
1681 audio_music_finished; 1883 audio_music_finished;
1682 1884
1683 while (<$fh>) { 1885 while (<$fh>) {
1684 next if /^\s*#/; 1886 next if /^\s*#/;
… …
1687 my ($file, $volume, $event) = split /\s+/, $_, 3; 1889 my ($file, $volume, $event) = split /\s+/, $_, 3;
1688 1890
1689 push @SOUNDS, "$volume,$file"; 1891 push @SOUNDS, "$volume,$file";
1690 1892
1691 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1893 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1692 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";
1693 $chunk->volume ($volume * 128 / 100); 1895 $chunk->volume ($volume * 128 / 100);
1694 $chunk 1896 $chunk
1695 }; 1897 };
1696 } 1898 }
1697 } else { 1899 } else {
… …
1699 } 1901 }
1700 } 1902 }
1701} 1903}
1702 1904
1703sub audio_shutdown { 1905sub audio_shutdown {
1704 CFClient::Mix_CloseAudio if $SDL_MIXER; 1906 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1705 undef $SDL_MIXER; 1907 undef $SDL_MIXER;
1706 @SOUNDS = (); 1908 @SOUNDS = ();
1707 %AUDIO_CHUNKS = (); 1909 %AUDIO_CHUNKS = ();
1708} 1910}
1709 1911
… …
1716 1918
1717sub force_refresh { 1919sub force_refresh {
1718 $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;
1719 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1921 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1720 1922
1721 $CFClient::UI::ROOT->draw; 1923 $CFPlus::UI::ROOT->draw;
1722 1924
1723 $WANT_REFRESH = 0; 1925 $WANT_REFRESH = 0;
1724 $CAN_REFRESH = 0; 1926 $CAN_REFRESH = 0;
1725 $LAST_REFRESH = $NOW; 1927 $LAST_REFRESH = $NOW;
1726 1928
17270 && do {
1728 # some weird model-drawing code, just a joke right now
1729 use CFClient::OpenGL;
1730
1731 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1732 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1733 $demo{r} ||= do {
1734 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1735 $mod->{v} = pack "f*", @{$mod->{v}};
1736 $_ = [scalar @$_, pack "S!*", @$_]
1737 for values %{$mod->{g}};
1738 $mod
1739 };
1740
1741 my $r = $demo{r} or die;
1742
1743 glDepthMask 1;
1744 glClear GL_DEPTH_BUFFER_BIT;
1745 glEnable GL_TEXTURE_2D;
1746 glEnable GL_DEPTH_TEST;
1747 glEnable GL_CULL_FACE;
1748 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1749
1750 glMatrixMode GL_PROJECTION;
1751 glLoadIdentity;
1752 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1753 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1754 glMatrixMode GL_MODELVIEW;
1755 glLoadIdentity;
1756
1757 glPushMatrix;
1758 glTranslate 0, 0, -800;
1759 glScale 1, -1, 1;
1760 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1761 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1762 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1763 glScale 50, 50, 50;
1764
1765 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1766 while (my ($k, $v) = each %{$r->{g}}) {
1767 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1768 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1769 }
1770
1771 glPopMatrix;
1772
1773 glShadeModel GL_FLAT;
1774 glDisable GL_DEPTH_TEST;
1775 glDisable GL_TEXTURE_2D;
1776 glDepthMask 0;
1777
1778 $WANT_REFRESH++;
1779};
1780
1781 CFClient::SDL_GL_SwapBuffers; 1929 CFPlus::SDL_GL_SwapBuffers;
1782} 1930}
1783 1931
1784my $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 {
1785 $NOW = time; 1933 $NOW = time;
1786 1934
1787 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1935 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1788 for CFClient::SDL_PollEvent; 1936 for CFPlus::SDL_PollEvent;
1789 1937
1790 if (%animate_object) { 1938 if (%animate_object) {
1791 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1939 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1792 $WANT_REFRESH++; 1940 $WANT_REFRESH++;
1793 } 1941 }
… …
1817 $CONN->face_prefetch 1965 $CONN->face_prefetch
1818 if $CONN; 1966 if $CONN;
1819}); 1967});
1820 1968
1821%SDL_CB = ( 1969%SDL_CB = (
1822 CFClient::SDL_QUIT => sub { 1970 CFPlus::SDL_QUIT => sub {
1823 Event::unloop -1; 1971 Event::unloop -1;
1824 }, 1972 },
1825 CFClient::SDL_VIDEORESIZE => sub { 1973 CFPlus::SDL_VIDEORESIZE => sub {
1826 }, 1974 },
1827 CFClient::SDL_VIDEOEXPOSE => sub { 1975 CFPlus::SDL_VIDEOEXPOSE => sub {
1828 CFClient::UI::full_refresh; 1976 CFPlus::UI::full_refresh;
1829 }, 1977 },
1830 CFClient::SDL_ACTIVEEVENT => sub { 1978 CFPlus::SDL_ACTIVEEVENT => sub {
1831# 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#
1832 }, 1980 },
1833 CFClient::SDL_KEYDOWN => sub { 1981 CFPlus::SDL_KEYDOWN => sub {
1834 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1982 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1835 # alt-enter 1983 # alt-enter
1984 $FULLSCREEN_ENABLE->toggle;
1836 video_shutdown; 1985 video_shutdown;
1837 $CFG->{fullscreen} = !$CFG->{fullscreen};
1838 video_init; 1986 video_init;
1839 } else { 1987 } else {
1840 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1988 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1841 } 1989 }
1842 }, 1990 },
1843 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1991 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1844 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1992 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1845 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1993 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1846 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1994 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1847 CFClient::SDL_USEREVENT => sub { 1995 CFPlus::SDL_USEREVENT => sub {
1848 if ($_[0]{code} == 1) { 1996 if ($_[0]{code} == 1) {
1849 audio_channel_finished $_[0]{data1}; 1997 audio_channel_finished $_[0]{data1};
1850 } elsif ($_[0]{code} == 0) { 1998 } elsif ($_[0]{code} == 0) {
1851 audio_music_finished; 1999 audio_music_finished;
1852 } 2000 }
… …
1856############################################################################# 2004#############################################################################
1857 2005
1858$SIG{INT} = $SIG{TERM} = sub { exit }; 2006$SIG{INT} = $SIG{TERM} = sub { exit };
1859 2007
1860{ 2008{
1861 local $SIG{__DIE__} = sub {
1862 return unless defined $^S && !$^S;
1863 Carp::confess $_[1];#d#TODO: remove when stable
1864 CFClient::fatal $_[0];
1865 };
1866
1867 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2009 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1868 CFClient::UI::set_layout ($::CFG->{layout}); 2010 CFPlus::UI::set_layout ($::CFG->{layout});
1869 2011
1870 my %DEF_CFG = ( 2012 my %DEF_CFG = (
1871 sdl_mode => 0, 2013 sdl_mode => 0,
1872 width => 640, 2014 width => 640,
1873 height => 480, 2015 height => 480,
… …
1889 bgm_volume => 0.25, 2031 bgm_volume => 0.25,
1890 face_prefetch => 0, 2032 face_prefetch => 0,
1891 output_sync => 1, 2033 output_sync => 1,
1892 output_count => 1, 2034 output_count => 1,
1893 pickup => 0, 2035 pickup => 0,
2036 inv_sort => "mtime",
1894 default => "profile", # default profile 2037 default => "profile", # default profile
2038 show_tips => 1,
1895 ); 2039 );
1896 2040
1897 while (my ($k, $v) = each %DEF_CFG) { 2041 while (my ($k, $v) = each %DEF_CFG) {
1898 $CFG->{$k} = $v unless exists $CFG->{$k}; 2042 $CFG->{$k} = $v unless exists $CFG->{$k};
1899 } 2043 }
… …
1902 2046
1903 sdl_init; 2047 sdl_init;
1904 2048
1905 @SDL_MODES = reverse 2049 @SDL_MODES = reverse
1906 grep $_->[0] >= 640 && $_->[1] >= 480, 2050 grep $_->[0] >= 640 && $_->[1] >= 480,
1907 CFClient::SDL_ListModes; 2051 CFPlus::SDL_ListModes;
1908 2052
1909 @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)";
1910 2054
1911 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2055 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1912 2056
1913 { 2057 {
1914 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2058 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1915 DejaVuSans.ttf 2059 DejaVuSans.ttf
1916 DejaVuSansMono.ttf 2060 DejaVuSansMono.ttf
1917 DejaVuSans-Bold.ttf 2061 DejaVuSans-Bold.ttf
1918 DejaVuSansMono-Bold.ttf 2062 DejaVuSansMono-Bold.ttf
1919 DejaVuSans-Oblique.ttf 2063 DejaVuSans-Oblique.ttf
1920 DejaVuSansMono-Oblique.ttf 2064 DejaVuSansMono-Oblique.ttf
1921 DejaVuSans-BoldOblique.ttf 2065 DejaVuSans-BoldOblique.ttf
1922 DejaVuSansMono-BoldOblique.ttf 2066 DejaVuSansMono-BoldOblique.ttf
1923 ); 2067 );
1924 2068
1925 CFClient::add_font $_ for @fonts; 2069 CFPlus::add_font $_ for @fonts;
1926 2070
1927 CFClient::pango_init; 2071 CFPlus::pango_init;
1928 2072
1929 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2073 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1930 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2074 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1931 2075
1932 $FONT_PROP->make_default; 2076 $FONT_PROP->make_default;
1933 } 2077 }
1934 2078
1935# compare mono (ft) vs. rgba (cairo) 2079# compare mono (ft) vs. rgba (cairo)
1936# ft - 1.8s, cairo 3s, even in alpha-only mode 2080# ft - 1.8s, cairo 3s, even in alpha-only mode
1937# for my $rgba (0..1) { 2081# for my $rgba (0..1) {
1938# my $t1 = Time::HiRes::time; 2082# my $t1 = Time::HiRes::time;
1939# for (1..1000) { 2083# for (1..1000) {
1940# my $layout = CFClient::Layout->new ($rgba); 2084# my $layout = CFPlus::Layout->new ($rgba);
1941# $layout->set_text ("hallo" x 100); 2085# $layout->set_text ("hallo" x 100);
1942# $layout->render; 2086# $layout->render;
1943# } 2087# }
1944# my $t2 = Time::HiRes::time; 2088# my $t2 = Time::HiRes::time;
1945# warn $t2-$t1; 2089# warn $t2-$t1;
… …
1947 2091
1948 video_init; 2092 video_init;
1949 audio_init; 2093 audio_init;
1950} 2094}
1951 2095
2096show_tip_of_the_day if $CFG->{show_tips};
2097
1952Event::loop; 2098Event::loop;
1953#CFClient::SDL_Quit; 2099#CFPlus::SDL_Quit;
1954#CFClient::_exit 0; 2100#CFPlus::_exit 0;
1955 2101
1956END { CFClient::SDL_Quit } 2102END { CFPlus::SDL_Quit }
1957 2103
1958=head1 NAME 2104=head1 NAME
1959 2105
1960cfplus - A Crossfire+ and Crossfire game client 2106cfplus - A Crossfire+ and Crossfire game client
1961 2107

Diff Legend

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