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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines