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.45 by elmex, Fri Jun 2 16:52:49 2006 UTC vs.
Revision 1.119 by root, Fri Sep 29 00:56:06 2006 UTC

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

Diff Legend

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