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.69 by root, Mon Jun 12 13:26:15 2006 UTC vs.
Revision 1.137 by root, Sat Dec 9 02:21:25 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines