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.59 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.121 by root, Sun Oct 1 18:17:38 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines