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.41 by root, Fri Jun 2 02:21:48 2006 UTC vs.
Revision 1.118 by root, Tue Aug 22 06:37:30 2006 UTC

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

Diff Legend

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