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

Diff Legend

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