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

Diff Legend

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