ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/pclient
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.200 by root, Mon May 8 17:23:08 2006 UTC vs.
Revision 1.249 by root, Thu May 25 02:23:14 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6# do things only needed for single-binary version (par)
6BEGIN { 7BEGIN {
7 if (%PAR::LibCache) { 8 if (%PAR::LibCache) {
8 @INC = grep ref, @INC; # weed out all paths except pars loader refs 9 @INC = grep ref, @INC; # weed out all paths except pars loader refs
9 10
10 while (my ($filename, $zip) = each %PAR::LibCache) { 11 while (my ($filename, $zip) = each %PAR::LibCache) {
… …
13 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
14 unless -e "$ENV{PAR_TEMP}/$1"; 15 unless -e "$ENV{PAR_TEMP}/$1";
15 } 16 }
16 } 17 }
17 18
19 # TODO: pango-rc file, anybody?
20
18 unshift @INC, $ENV{PAR_TEMP}; 21 unshift @INC, $ENV{PAR_TEMP};
19
20 if ($^O eq "MSWin32") {
21 $ENV{GTK_RC_FILES} = "$ENV{PAR_TEMP}/share/themes/MS-Windows/gtk-2.0/gtkrc";
22 }
23 } 22 }
24} 23}
25 24
26# 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
27unshift @INC, $ENV{PAR_TEMP}; 26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache;
28 28
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
30use Event; 31use Event;
31 32
32use Crossfire; 33use Crossfire;
33use Crossfire::Protocol; 34use Crossfire::Protocol;
34 35
… …
37use CFClient; 38use CFClient;
38use CFClient::UI; 39use CFClient::UI;
39use CFClient::MapWidget; 40use CFClient::MapWidget;
40 41
41$Event::DIED = sub { 42$Event::DIED = sub {
43 # TODO: display dialog box or so
42 CFClient::error $_[1]; 44 CFClient::error $_[1];
43}; 45};
44 46
45#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 47#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
46 48
… …
59our $NOW; 61our $NOW;
60 62
61our $CFG; 63our $CFG;
62our $CONN; 64our $CONN;
63our $FAST; # fast, low-quality mode, possibly useful for software-rendering 65our $FAST; # fast, low-quality mode, possibly useful for software-rendering
66
67our $WANT_REFRESH;
68our $CAN_REFRESH;
64 69
65our @SDL_MODES; 70our @SDL_MODES;
66our $WIDTH; 71our $WIDTH;
67our $HEIGHT; 72our $HEIGHT;
68our $FULLSCREEN; 73our $FULLSCREEN;
… …
77our $BUTTONBAR; 82our $BUTTONBAR;
78our $LOGVIEW; 83our $LOGVIEW;
79our $CONSOLE; 84our $CONSOLE;
80our $METASERVER; 85our $METASERVER;
81our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
87our $QUIT_DIALOG;
82 88
83our $FLOORBOX; 89our $FLOORBOX;
84our $GAUGES; 90our $GAUGES;
85our $STATWIDS; 91our $STATWIDS;
86 92
… …
90our $SDL_MIXER; 96our $SDL_MIXER;
91our @SOUNDS; # event => file mapping 97our @SOUNDS; # event => file mapping
92our %AUDIO_CHUNKS; # audio files 98our %AUDIO_CHUNKS; # audio files
93 99
94our $ALT_ENTER_MESSAGE; 100our $ALT_ENTER_MESSAGE;
95our $STATUS_LINE; 101our $STATUSBOX;
96our $DEBUG_STATUS; 102our $DEBUG_STATUS;
97 103
98our $INVWIN; 104our $INVWIN;
99our $INV; 105our $INV;
106our $INVR;
107our $INVR_LBL;
108our $OPENCONT;
100 109
101sub status { 110sub status {
102 $STATUS_LINE->set_text ($_[0]); 111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
103 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
104} 112}
105 113
106sub debug { 114sub debug {
107 $DEBUG_STATUS->set_text ($_[0]); 115 $DEBUG_STATUS->set_text ($_[0]);
108 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h}); 116 my ($w, $h) = $DEBUG_STATUS->size_request;
117 $DEBUG_STATUS->move ($WIDTH - $w, 0);
109} 118}
110 119
111sub start_game { 120sub start_game {
112 status "logging in..."; 121 status "logging in...";
113 122
… …
128 maph => $mapsize, 137 maph => $mapsize,
129 ; 138 ;
130 }; 139 };
131 140
132 if ($CONN) { 141 if ($CONN) {
142 CFClient::lowdelay fileno $CONN->{fh};
143
133 $LOGIN_BUTTON->set_text ("Logout"); 144 $LOGIN_BUTTON->set_text ("Logout");
134
135 status "login successful"; 145 status "login successful";
136 146
137 CFClient::lowdelay fileno $CONN->{fh}; 147 $BUTTONBAR->{children}[1]->emit ("activate")
148 if $BUTTONBAR->{children}[1]->{state};
149
138 } else { 150 } else {
139 status "unable to connect"; 151 status "unable to connect";
140 stop_game(); 152 stop_game();
141 } 153 }
142} 154}
… …
146 158
147 status "connection closed"; 159 status "connection closed";
148 $LOGIN_BUTTON->set_text ("Login"); 160 $LOGIN_BUTTON->set_text ("Login");
149 $CONN->destroy; 161 $CONN->destroy;
150 $CONN = 0; # false, does not autovivify 162 $CONN = 0; # false, does not autovivify
163
164 $BUTTONBAR->{children}[1]->emit ("activate")
165 unless $BUTTONBAR->{children}[1]->{state};
151 166
152 undef $MAPCACHE; 167 undef $MAPCACHE;
153 undef $MAP; 168 undef $MAP;
154} 169}
155 170
… …
160 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 175 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
161 176
162 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 177 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
163 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 178 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
164 179
165 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 180 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
166 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 181 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
167 182
168 $mode_slider->connect (changed => sub { 183 $mode_slider->connect (changed => sub {
169 my ($self, $value) = @_; 184 my ($self, $value) = @_;
170 185
… …
195 } 210 }
196 ); 211 );
197 212
198 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
199 $table->add (1, $row++, new CFClient::UI::Slider 214 $table->add (1, $row++, new CFClient::UI::Slider
200 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 215 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
201 tooltip => "Enlarge or shrink the displayed map", 216 tooltip => "Enlarge or shrink the displayed map",
202 connect_changed => sub { 217 connect_changed => sub {
203 my ($self, $value) = @_; 218 my ($self, $value) = @_;
204 $CFG->{map_scale} = 0.05 * int $value / 0.05; 219 $CFG->{map_scale} = 2 ** $value;
205 } 220 }
206 ); 221 );
207 222
208 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
209 $table->add (1, $row++, new CFClient::UI::CheckBox 224 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
215 } 230 }
216 ); 231 );
217 232
218 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
219 $table->add (1, $row++, new CFClient::UI::Slider 234 $table->add (1, $row++, new CFClient::UI::Slider
220 range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], 235 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
221 tooltip => "The higher the intensity, the lighter the Fog-of-War color", 236 tooltip => "The higher the intensity, the lighter the Fog-of-War color",
222 connect_changed => sub { 237 connect_changed => sub {
223 my ($self, $value) = @_; 238 my ($self, $value) = @_;
224 $CFG->{fow_intensity} = $value; 239 $CFG->{fow_intensity} = $value;
225 } 240 }
… …
236 } 251 }
237 ); 252 );
238 253
239 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 254 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
240 $table->add (1, $row++, new CFClient::UI::Slider 255 $table->add (1, $row++, new CFClient::UI::Slider
241 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 256 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
242 tooltip => "The font size used by most GUI elements", 257 tooltip => "The font size used by most GUI elements",
243 connect_changed => sub { 258 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
244 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
245# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
246 }
247 ); 259 );
248 260
249 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); 261 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
250 $table->add (1, $row++, new CFClient::UI::Slider 262 $table->add (1, $row++, new CFClient::UI::Slider
251 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 263 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
252 tooltip => "The font size used by the server log window only", 264 tooltip => "The font size used by the server log window only",
253 connect_changed => sub { 265 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
254 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
255 }
256 ); 266 );
257 267
258 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 268 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
259 269
260 $table->add (1, $row++, new CFClient::UI::Slider 270 $table->add (1, $row++, new CFClient::UI::Slider
261 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 271 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
262 tooltip => "The font size used by the statistics window only", 272 tooltip => "The font size used by the statistics window only",
263 connect_changed => sub { 273 connect_changed => sub {
264 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 274 $CFG->{stat_fontsize} = $_[1];
265 &set_stats_window_fontsize; 275 &set_stats_window_fontsize;
276 }
277 );
278
279 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
280 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
282 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
283 connect_changed => sub {
284 $CFG->{gauge_fontsize} = $_[1];
285 &set_gauge_window_fontsize;
266 } 286 }
267 ); 287 );
268 288
269 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
270 $table->add (1, $row++, new CFClient::UI::Slider 290 $table->add (1, $row++, new CFClient::UI::Slider
271 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 291 range => [$CFG->{gauge_size}, 0.2, 0.8],
272 tooltip => "Adjust the size of the stats gauges at the bottom right", 292 tooltip => "Adjust the size of the stats gauges at the bottom right",
273 connect_changed => sub { 293 connect_changed => sub {
274 $CFG->{gauge_size} = $_[1]; 294 $CFG->{gauge_size} = $_[1];
275 my $h = int $HEIGHT * $CFG->{gauge_size}; 295 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
276 $GAUGES->{win}->set_size ($WIDTH, $h);
277 $GAUGES->{win}->move (0, $HEIGHT - $h);
278 }
279 );
280
281 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
282 $table->add (1, $row++, new CFClient::UI::Slider
283 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
284 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
285 connect_changed => sub {
286 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
287 &set_gauge_window_fontsize;
288 } 296 }
289 ); 297 );
290 298
291 $table->add (1, $row++, new CFClient::UI::Button 299 $table->add (1, $row++, new CFClient::UI::Button
292 expand => 1, align => 0, text => "Apply", 300 expand => 1, align => 0, text => "Apply",
… …
317 connect_changed => sub { 325 connect_changed => sub {
318 $CFG->{bgm_enable} = $_[1]; 326 $CFG->{bgm_enable} = $_[1];
319 } 327 }
320 ); 328 );
321 $hbox->add (new CFClient::UI::Slider 329 $hbox->add (new CFClient::UI::Slider
322 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], 330 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
323 tooltip => "The volume of the background music", 331 tooltip => "The volume of the background music",
324 connect_changed => sub { 332 connect_changed => sub {
325 $CFG->{bgm_volume} = $_[1]; 333 $CFG->{bgm_volume} = $_[1];
326 CFClient::MixMusic::volume $_[1] * 128; 334 CFClient::MixMusic::volume $_[1] * 128;
327 } 335 }
… …
334 audio_shutdown (); 342 audio_shutdown ();
335 audio_init (); 343 audio_init ();
336 } 344 }
337 ); 345 );
338 346
339 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Communication cmd"); 347 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
340 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry 348 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
341 text => $CFG->{say_command}, 349 text => $CFG->{say_command},
342 tooltip => "This is the command that will be used if you write a line in the message window entry. " 350 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. "
343 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 351 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
344 ."But you could also set it to 'tell &lt;playername&gt;' to only chat with that user.", 352 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
345 connect_changed => sub { 353 connect_changed => sub {
346 my ($self, $value) = @_; 354 my ($self, $value) = @_;
347 $CFG->{say_command} = $value; 355 $CFG->{say_command} = $value;
348 } 356 }
349 ); 357 );
… …
359 367
360sub set_gauge_window_fontsize { 368sub set_gauge_window_fontsize {
361 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 369 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
362 $_->set_fontsize ($::CFG->{gauge_fontsize}); 370 $_->set_fontsize ($::CFG->{gauge_fontsize});
363 } 371 }
364
365# local $GAUGES->{win}{parent};#d#
366# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
367} 372}
368 373
369sub make_gauge_window { 374sub make_gauge_window {
370 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 375 my $gh = int $HEIGHT * $CFG->{gauge_size};
371# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
372 376
373 my $win = new CFClient::UI::Frame ( 377 my $win = new CFClient::UI::Frame (
374 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 378 req_y => -1,
379 user_w => $WIDTH,
380 user_h => $gh,
375 ); 381 );
382
376 $win->add (my $hbox = new CFClient::UI::HBox 383 $win->add (my $hbox = new CFClient::UI::HBox
377 children => [ 384 children => [
378 (new CFClient::UI::HBox expand => 1), 385 (new CFClient::UI::HBox expand => 1),
379 ($FLOORBOX = new CFClient::UI::VBox), 386 (new CFClient::UI::VBox children => [
387 (new CFClient::UI::Empty expand => 1),
388 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)),
389 ]),
380 (my $vbox = new CFClient::UI::VBox), 390 (my $vbox = new CFClient::UI::VBox),
381 ], 391 ],
382 ); 392 );
383 393
384 $vbox->add (new CFClient::UI::HBox 394 $vbox->add (new CFClient::UI::HBox
… …
388 (my $hb = new CFClient::UI::HBox), 398 (my $hb = new CFClient::UI::HBox),
389 ], 399 ],
390 ); 400 );
391 401
392 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 402 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
393 tooltip => "Health points. 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."); 403 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.");
394 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 404 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
395 tooltip => "Spell points. 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."); 405 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.");
396 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 406 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
397 tooltip => "Grace points - 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."); 407 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.");
398 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 408 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
399 tooltip => "Food. 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."); 409 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.");
400 410
401 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 411 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
402 tooltip => "Experience points and overall level - 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."); 412 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.");
403 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 413 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
404 tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)"); 414 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
405 415
406 $GAUGES = { 416 $GAUGES = {
407 exp => $exp, win => $win, range => $rng, 417 exp => $exp, win => $win, range => $rng,
408 food => $fg, mana => $mg, hp => $hg, grace => $gg 418 food => $fg, mana => $mg, hp => $hg, grace => $gg
409 }; 419 };
… …
412 422
413 $win 423 $win
414} 424}
415 425
416sub make_stats_window { 426sub make_stats_window {
417 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats"; 427 my $tgw = new CFClient::UI::FancyFrame title => "Stats";
418 428
419 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 429 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
420 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1); 430 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
431 can_hover => 1, can_events => 1,
432 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
421 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1); 433 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
434 can_hover => 1, can_events => 1,
435 tooltip => "The map you are currently on (if supported by the server).");
422 436
423 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 437 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
424
425 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 438 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
426 439
427 my $black = [0, 0, 0]; 440 my $color2 = [1, 1, 0];
428 441
429 for ( 442 for (
430 [0, 0, st_str => "Str", 30, "Physical Strength, determines damage dealt with weapons, how much you can carry, and how often you can attack"], 443 [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"],
431 [0, 1, st_dex => "Dex", 30, "Dexterity, your physical agility. Determines chance of being hit and affects armor class and speed"], 444 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"],
432 [0, 2, st_con => "Con", 30, "Constitution, physical health and toughness. Determines how many healthpoints you can have"], 445 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"],
433 [0, 3, st_int => "Int", 30, "Intelligence, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"], 446 [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"],
434 [0, 4, st_wis => "Wis", 30, "Wisdom, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"], 447 [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"],
435 [0, 5, st_pow => "Pow", 30, "Power, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"], 448 [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"],
436 [0, 6, st_cha => "Cha", 30, "Charisma, how well you are received by NPCs. Affects buying and selling prices in shops."], 449 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
437 450
438 [2, 0, st_wc => "Wc", -120, "Weapon Class, 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."], 451 [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."],
439 [2, 1, st_ac => "Ac", -120, "Armour Class, 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."], 452 [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."],
440 [2, 2, st_dam => "Dam", 120, "Damage, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 453 [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."],
441 [2, 3, st_arm => "Arm", 120, "Armour, 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."], 454 [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."],
442 [2, 4, st_spd => "Spd", 10.54, "Speed, 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."], 455 [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."],
443 [2, 5, st_wspd => "WSp", 10.54, "Weapon Speed, 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."], 456 [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."],
444 ) { 457 ) {
445 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 458 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
446 459
447 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 460 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
448 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 461 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
449 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 462 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
450 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $black, valign => 0, align => -1, text => $label, tooltip => $tooltip); 463 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);
451 } 464 }
452 465
453 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 466 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
454 467
455 my $row = 0; 468 my $row = 0;
456 my $col = 0; 469 my $col = 0;
457 470
458 my %resist_names = ( 471 my %resist_names = (
459 slow => "Slow (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.)", 472 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.)",
460 holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 473 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.)",
461 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)", 474 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)",
462 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 475 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
463 depl => "Depletion (some monsters and other effects can cause stats depletion)", 476 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)",
464 magic => "Magic (resistance to magic spells like magic missile or similar)", 477 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)",
465 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)", 478 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
466 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 479 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
467 pois => "Poison (resistance to getting poisoned)", 480 pois => "<b>Poison</b> (resistance to getting poisoned)",
468 para => "Paralysation (this resistance affects the chance you get paralysed)", 481 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
469 deat => "Death (resistance against death spells)", 482 deat => "<b>Death</b> (resistance against death spells)",
470 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 483 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
471 blind => "Blind (blind resistance affects the chance of a successful blinding attack)", 484 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
472 fear => "Fear (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)", 485 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)",
473 tund => "Turn undead", 486 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
474 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)", 487 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
475 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)", 488 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
476 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)", 489 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)",
477 ); 490 );
478 for (qw/slow holyw conf fire depl magic 491 for (qw/slow holyw conf fire depl magic
479 drain acid pois para deat phys 492 drain acid pois para deat phys
480 blind fear tund elec cold ghit/) 493 blind fear tund elec cold ghit/)
481 { 494 {
… …
661 $HOST->set_text ($CFG->{host} = $host); 674 $HOST->set_text ($CFG->{host} = $host);
662 }), 675 }),
663 (new CFClient::UI::Empty expand => 1), 676 (new CFClient::UI::Empty expand => 1),
664 ]); 677 ]);
665 678
666 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8) 679 $table->add ($_ + 1, $y, new CFClient::UI::Label
680 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)
667 for 0 .. $#$m; 681 for 0 .. $#$m;
668 } 682 }
669 } 683 }
670 }); 684 });
671} 685}
… …
727 ); 741 );
728 742
729 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 743 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
730 $table->add (1, 7, new CFClient::UI::Slider 744 $table->add (1, 7, new CFClient::UI::Slider
731 req_w => 100, 745 req_w => 100,
732 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 746 range => [$CFG->{mapsize}, 10, 100, 0, 1],
733 tooltip => "This is the size of the portion of the map update the server sends you. " 747 tooltip => "This is the size of the portion of the map update the server sends you. "
734 ."If you set this to a high value you will be able to see further for example.", 748 . "If you set this to a high value you will be able to see further for example.",
735 connect_changed => sub { 749 connect_changed => sub {
736 my ($self, $value) = @_; 750 my ($self, $value) = @_;
737 751
738 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 752 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
739 }, 753 },
740 ); 754 );
741 755
756 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
757 $table->add (1, 8, new CFClient::UI::Entry
758 text => $CFG->{output_count},
759 tooltip => "Should be set to 1 unless you know what you are doing",
760 connect_changed => sub { $CFG->{output_count} = $_[1] },
761 );
762
763 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
764 $table->add (1, 9, new CFClient::UI::Entry
765 text => $CFG->{output_sync},
766 tooltip => "Should be set to 1 unless you know what you are doing",
767 connect_changed => sub { $CFG->{output_sync} = $_[1] },
768 );
769
742 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button 770 $table->add (1, 10, $LOGIN_BUTTON = new CFClient::UI::Button
743 expand => 1, 771 expand => 1,
744 align => 0, 772 align => 0,
745 text => "Login", 773 text => "Login",
746 connect_activate => sub { 774 connect_activate => sub {
747 $CONN ? stop_game 775 $CONN ? stop_game
… …
754 782
755sub message_window { 783sub message_window {
756 my $window = new CFClient::UI::FancyFrame 784 my $window = new CFClient::UI::FancyFrame
757 title => "Messages", 785 title => "Messages",
758 border_bg => [1, 1, 1, 1], 786 border_bg => [1, 1, 1, 1],
759 bg => [0, 0, 0, 0.5], 787 bg => [0, 0, 0, 0.75],
760 user_w => int $::WIDTH / 3, 788 user_w => int $::WIDTH / 3,
761 user_h => int $::HEIGHT / 5, 789 user_h => int $::HEIGHT / 5,
762 child => (my $vbox = new CFClient::UI::VBox); 790 child => (my $vbox = new CFClient::UI::VBox);
763 791
764 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 792 $vbox->add ($LOGVIEW);
765 expand => 1,
766 font => $FONT_FIXED,
767 fontsize => $::CFG->{log_fontsize},
768 );
769 793
770 $vbox->add (my $input = new CFClient::UI::Entry 794 $vbox->add (my $input = new CFClient::UI::Entry
795 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
796 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
797 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
798 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
771 connect_focus_in => sub { 799 connect_focus_in => sub {
772 my ($input, $prev_focus) = @_; 800 my ($input, $prev_focus) = @_;
773 801
774 delete $input->{refocus_map}; 802 delete $input->{refocus_map};
775 803
… …
804 }; 832 };
805 833
806 $window 834 $window
807} 835}
808 836
837sub open_quit_dialog {
838 unless ($QUIT_DIALOG) {
839
840 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";
841
842 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
843
844 $vb->add (new CFClient::UI::Label
845 text => "You should find a savebed and apply it first!",
846 max_w => $WIDTH * 0.25,
847 ellipsize => 0,
848 );
849 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
850 $hb->add (new CFClient::UI::Button
851 text => "Ok",
852 expand => 1,
853 connect_activate => sub { $QUIT_DIALOG->hide },
854 );
855 $hb->add (new CFClient::UI::Button
856 text => "Quit anyway",
857 expand => 1,
858 connect_activate => sub { exit },
859 );
860
861 $QUIT_DIALOG->show_centered;
862 } else {
863 $QUIT_DIALOG->show_centered;
864 }
865}
866
809sub make_inventory_window { 867sub make_inventory_window {
810 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory"; 868 my $invwin = new CFClient::UI::FancyFrame
869 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory";
870
871 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
872
873 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
874 $vb1->add (my $lbl = new CFClient::UI::Label);
875 $lbl->set_text ("Player");
811 $invwin->add ($INV = new CFClient::UI::Inventory expand => 1); 876 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
877
878 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
879 $vb2->add ($INVR_LBL = new CFClient::UI::Label);
880 $INVR_LBL->set_text ("Floor");
881 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
882
812 $invwin 883 $invwin
884}
885
886sub make_help_window {
887 my $win = new CFClient::UI::FancyFrame
888 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";
889
890 $win->add (my $vbox = new CFClient::UI::VBox);
891
892 $vbox->add (my $buttons = new CFClient::UI::HBox);
893 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
894
895 for (
896 [intro => "Introduction"],
897 [manual => "Manual"],
898 [command_help => "Commands"],
899 [skill_help => "Skills"],
900 ) {
901 my ($pod, $label) = @$_;
902
903 $buttons->add (new CFClient::UI::Button
904 text => $label,
905 connect_activate => sub {
906 my $parser = new Pod::POM;
907 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
908
909 $viewer->clear;
910
911 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
912 for @{ CFClient::pod_to_pango_list $pom };
913
914 $viewer->set_offset (0);
915 },
916 );
917 }
918
919 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
920
921 $win
813} 922}
814 923
815sub sdl_init { 924sub sdl_init {
816 CFClient::SDL_Init 925 CFClient::SDL_Init
817 and die "SDL::Init failed!\n"; 926 and die "SDL::Init failed!\n";
… …
820sub video_init { 929sub video_init {
821 sdl_init; 930 sdl_init;
822 931
823 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 932 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
824 933
934 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
935
825 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 936 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
826 $FULLSCREEN = $CFG->{fullscreen}; 937 $FULLSCREEN = $CFG->{fullscreen};
827 $FAST = $CFG->{fast}; 938 $FAST = $CFG->{fast};
828 939
829 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 940 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
830 or die "SDL_SetVideoMode failed!\n"; 941 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
831 942
832 $SDL_ACTIVE = 1; 943 $SDL_ACTIVE = 1;
833
834 $LAST_REFRESH = time - 0.01; 944 $LAST_REFRESH = time - 0.01;
835 945
836 CFClient::gl_init; 946 CFClient::gl_init;
837 947
838 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 948 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
839 949
950 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
951
840 ############################################################################# 952 #############################################################################
841 953
954 if ($DEBUG_STATUS) {
955 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
956 } else {
957 # create the widgets
958
842 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 959 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
843 $DEBUG_STATUS->show; 960 $DEBUG_STATUS->show;
844 961
845 $STATUS_LINE = new CFClient::UI::Label 962 $STATUSBOX = new CFClient::UI::Statusbox;
846 padding => 0, 963 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
847 y => $HEIGHT - $FONTSIZE * 1.8;
848 $STATUS_LINE->show;
849 964
850 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 965 (new CFClient::UI::Frame
851 padding => 0, 966 bg => [0, 0, 0, 0.4],
852 fontsize => 0.8, 967 req_y => -1,
853 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 968 child => $STATUSBOX,
854 $ALT_ENTER_MESSAGE->show; 969 )->show;
855 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
856 970
857 CFClient::UI::FancyFrame->new ( 971 CFClient::UI::FancyFrame->new (
858 border_bg => [1, 1, 1, 192/255], 972 border_bg => [1, 1, 1, 192/255],
859 bg => [1, 1, 1, 0], 973 bg => [1, 1, 1, 0],
860 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 974 child => ($MAPMAP = new CFClient::MapWidget::MapMap
975 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
976 ),
861 )->show; 977 )->show;
862 978
863 $MAPWIDGET = new CFClient::MapWidget; 979 $MAPWIDGET = new CFClient::MapWidget;
864 $MAPWIDGET->connect (activate_console => sub { 980 $MAPWIDGET->connect (activate_console => sub {
865 my ($mapwidget, $preset) = @_; 981 my ($mapwidget, $preset) = @_;
866 982
867 if ($CONSOLE) { 983 if ($CONSOLE) {
868 $CONSOLE->{input}->{auto_activated} = 1; 984 $CONSOLE->{input}->{auto_activated} = 1;
869 $CONSOLE->{input}->focus_in; 985 $CONSOLE->{input}->focus_in;
870 986
871 if ($preset && $CONSOLE->{input}->get_text eq '') { 987 if ($preset && $CONSOLE->{input}->get_text eq '') {
872 $CONSOLE->{input}->set_text ($preset); 988 $CONSOLE->{input}->set_text ($preset);
989 }
873 } 990 }
874 } 991 });
875 });
876 $MAPWIDGET->show; 992 $MAPWIDGET->show;
877 $MAPWIDGET->focus_in; 993 $MAPWIDGET->focus_in;
878 994
995 $LOGVIEW = new CFClient::UI::TextView
996 expand => 1,
997 font => $FONT_FIXED,
998 fontsize => $::CFG->{log_fontsize},
999 can_hover => 1,
1000 can_events => 1,
1001 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1002 ;
1003
879 $BUTTONBAR = new CFClient::UI::HBox; 1004 $BUTTONBAR = new CFClient::UI::HBox;
880 1005
881 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 1006 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1007 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
882 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 1008 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1009 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
883 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 1010 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1011 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
884 1012
885 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 1013 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
886 1014
887 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 1015 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1016 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
888 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window); 1017 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1018 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
889 1019
890 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 1020 $BUTTONBAR->add (new CFClient::UI::Button
1021 text => "Save Config",
1022 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1023 connect_activate => sub {
891 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1024 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
892 status "Configuration Saved"; 1025 status "Configuration Saved";
893 }); 1026 },
1027 );
894 1028
1029 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1030 tooltip => "View Documentation");
1031
1032 $BUTTONBAR->add (new CFClient::UI::Button
1033 text => "Quit",
1034 tooltip => "Terminates the program",
1035 connect_activate => sub {
1036 if ($CONN) {
1037 open_quit_dialog;
1038 } else {
1039 exit;
1040 }
1041 },
1042 );
1043
895 $BUTTONBAR->show; 1044 $BUTTONBAR->show;
896 1045
1046 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1047
1048 # delay till geometry is constant
1049 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
897 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 1050 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1051 my $widget = $GAUGES->{win};
1052 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1053 });
1054 force_refresh ();
1055 }
898} 1056}
899 1057
900sub video_shutdown { 1058sub video_shutdown {
901 $CFClient::UI::ROOT->{children} = [];
902 undef $CFClient::UI::GRAB;
903 undef $CFClient::UI::HOVER;
904 undef $SDL_ACTIVE; 1059 undef $SDL_ACTIVE;
905} 1060}
906 1061
907my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1062my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
908my $bgmusic;#TODO#hack#d# 1063my $bgmusic;#TODO#hack#d#
909 1064
910sub audio_channel_finished { 1065sub audio_channel_finished {
911 my ($channel) = @_; 1066 my ($channel) = @_;
912 1067
913 warn "channel $channel finished\n";#d# 1068 #warn "channel $channel finished\n";#d#
914} 1069}
915 1070
916sub audio_music_finished { 1071sub audio_music_finished {
917 return unless $CFG->{bgm_enable}; 1072 return unless $CFG->{bgm_enable};
918 1073
… …
925 1080
926sub audio_init { 1081sub audio_init {
927 if ($CFG->{audio_enable}) { 1082 if ($CFG->{audio_enable}) {
928 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1083 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
929 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1084 $SDL_MIXER = !CFClient::Mix_OpenAudio;
1085
1086 unless ($SDL_MIXER) {
1087 status "Unable to open sound device: there will be no sound";
1088 return;
1089 }
1090
930 CFClient::Mix_AllocateChannels 8; 1091 CFClient::Mix_AllocateChannels 8;
931 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1092 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
932 1093
933 audio_music_finished; 1094 audio_music_finished;
934 1095
… …
960} 1121}
961 1122
962my %animate_object; 1123my %animate_object;
963my $animate_timer; 1124my $animate_timer;
964 1125
965my $want_refresh;
966my $can_refresh;
967
968my $fps = 9; 1126my $fps = 9;
969 1127
1128my %demo;#d#
1129
970sub force_refresh { 1130sub force_refresh {
971 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 1131 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
972 debug sprintf "%3.2f", $fps; 1132 debug sprintf "%3.2f", $fps;
973 1133
974 $want_refresh = 0;
975 $can_refresh = 0;
976
977 $CFClient::UI::ROOT->draw; 1134 $CFClient::UI::ROOT->draw;
978 1135
1136 $WANT_REFRESH = 0;
1137 $CAN_REFRESH = 0;
1138 $LAST_REFRESH = $NOW;
1139
11400 && do {
1141 # some weird model-drawing code, just a joke right now
1142 use CFClient::OpenGL;
1143
1144 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1145 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1146 $demo{r} ||= do {
1147 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1148 $mod->{v} = pack "f*", @{$mod->{v}};
1149 $_ = [scalar @$_, pack "S!*", @$_]
1150 for values %{$mod->{g}};
1151 $mod
1152 };
1153
1154 my $r = $demo{r} or die;
1155
1156 glDepthMask 1;
1157 glClear GL_DEPTH_BUFFER_BIT;
1158 glEnable GL_TEXTURE_2D;
1159 glEnable GL_DEPTH_TEST;
1160 glEnable GL_CULL_FACE;
1161 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1162
1163 glMatrixMode GL_PROJECTION;
1164 glLoadIdentity;
1165 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1166 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1167 glMatrixMode GL_MODELVIEW;
1168 glLoadIdentity;
1169
1170 glPushMatrix;
1171 glTranslate 0, 0, -800;
1172 glScale 1, -1, 1;
1173 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1174 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1175 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1176 glScale 50, 50, 50;
1177
1178 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1179 while (my ($k, $v) = each %{$r->{g}}) {
1180 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1181 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1182 }
1183
1184 glPopMatrix;
1185
1186 glShadeModel GL_FLAT;
1187 glDisable GL_DEPTH_TEST;
1188 glDisable GL_TEXTURE_2D;
1189 glDepthMask 0;
1190
1191 $WANT_REFRESH++;
1192};
1193
979 CFClient::SDL_GL_SwapBuffers; 1194 CFClient::SDL_GL_SwapBuffers;
980
981 $LAST_REFRESH = $NOW;
982} 1195}
983 1196
984my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1197my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
985 $NOW = time; 1198 $NOW = time;
986 1199
987 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1200 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
988 for CFClient::SDL_PollEvent; 1201 for CFClient::SDL_PollEvent;
989 1202
990 if (%animate_object) { 1203 if (%animate_object) {
991 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1204 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
992 $want_refresh++; 1205 $WANT_REFRESH++;
993 } 1206 }
994 1207
995 if ($want_refresh) { 1208 if ($WANT_REFRESH) {
996 force_refresh; 1209 force_refresh;
997 } else { 1210 } else {
998 $can_refresh = 1; 1211 $CAN_REFRESH = 1;
999 } 1212 }
1000}); 1213});
1001
1002sub refresh {
1003 $want_refresh++;
1004}
1005 1214
1006sub animation_start { 1215sub animation_start {
1007 my ($widget) = @_; 1216 my ($widget) = @_;
1008 $animate_object{$widget} = $widget; 1217 $animate_object{$widget} = $widget;
1009} 1218}
… …
1013 delete $animate_object{$widget}; 1222 delete $animate_object{$widget};
1014} 1223}
1015 1224
1016@conn::ISA = Crossfire::Protocol::; 1225@conn::ISA = Crossfire::Protocol::;
1017 1226
1227sub conn::new {
1228 my $class = shift;
1229
1230 my $self = $class->Crossfire::Protocol::new (@_);
1231
1232 $MAPWIDGET->clr_commands;
1233
1234 my $parser = new Pod::POM;
1235 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1236
1237 for my $head2 ($pod->head2) {
1238 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1239 or next;
1240
1241 my $cmd = $1;
1242 my @args = split /\|/, $2;
1243 @args = (".*") unless @args;
1244
1245 my $text = CFClient::pod_to_pango $head2->content;
1246
1247 for my $arg (@args) {
1248 $arg = $arg eq ".*" ? "" : " $arg";
1249
1250 $MAPWIDGET->add_command ("$cmd$arg", $text);
1251 }
1252 }
1253
1254 $self->{noface} = new_from_file CFClient::Texture
1255 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
1256
1257 $self
1258}
1259
1018sub conn::stats_update { 1260sub conn::stats_update {
1019 my ($self, $stats) = @_; 1261 my ($self, $stats) = @_;
1262
1263 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1264 my $diff = $exp - $self->{prev_exp};
1265 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1266 if exists $self->{prev_exp} && $diff;
1267 $self->{prev_exp} = $exp;
1268 }
1020 1269
1021 update_stats_window ($stats); 1270 update_stats_window ($stats);
1022} 1271}
1023 1272
1024sub conn::user_send { 1273sub conn::user_send {
… …
1079 $self->set_texture ($id => $data); 1328 $self->set_texture ($id => $data);
1080 } 1329 }
1081 } 1330 }
1082} 1331}
1083 1332
1333# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1334# (server resource,s latency, bandwidth), so this hack is warranted.
1335# the right fix is to make real tiled maps with an overview file
1336sub conn::send_mapinfo {
1337 my ($self, $data, $cb) = @_;
1338
1339 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1340 my ($wx, $wy) = ($1, $2);
1341
1342 if ($data =~ /^spatial ([1-4]+)$/) {
1343 my @dx = (0, 0, 1, 0, -1);
1344 my @dy = (0, -1, 0, 1, 0);
1345 my ($dx, $dy);
1346
1347 for (split //, $1) {
1348 $dx += $dx[$_];
1349 $dy += $dy[$_];
1350 }
1351
1352 $cb->(spatial => 15,
1353 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1354 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1355 50, 50,
1356 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1357 );
1358
1359 return;
1360 }
1361 }
1362
1363 $self->Crossfire::Protocol::send_mapinfo ($data, $cb);
1364}
1365
1084# this method does a "flood fill" into every tile direction 1366# this method does a "flood fill" into every tile direction
1085# it assumes that tiles are arranged in a rectangular grid, 1367# it assumes that tiles are arranged in a rectangular grid,
1086# i.e. a map is the same as the left of the right map etc. 1368# i.e. a map is the same as the left of the right map etc.
1087# failure to comply are harmless and result in display errors 1369# failure to comply are harmless and result in display errors
1088# at worst. 1370# at worst.
1089sub conn::flood_fill { 1371sub conn::flood_fill {
1090 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1372 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1091 1373
1092 # the server does not allow map paths > 6 1374 # the server does not allow map paths > 6
1093 return if 7 <= length $path; 1375 return if 7 <= length $path;
1094 1376
1095 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1377 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1096 1378
1097 for ( 1379 for (
1098 [1, 0, -1], 1380 [1, 3, 0, -1],
1099 [2, 1, 0], 1381 [2, 4, 1, 0],
1100 [3, 0, 1], 1382 [3, 1, 0, 1],
1101 [4, -1, 0], 1383 [4, 2, -1, 0],
1102 ) { 1384 ) {
1103 my ($tile, $dx, $dy) = @$_; 1385 my ($tile, $tile2, $dx, $dy) = @$_;
1386
1387 next if $block & (1 << $tile);
1388 my $block = $block | (1 << $tile2);
1104 1389
1105 my $gx = $gx + $dx; 1390 my $gx = $gx + $dx;
1106 my $gy = $gy + $dy; 1391 my $gy = $gy + $dy;
1107 1392
1108 next unless $flags & (1 << ($tile - 1)); 1393 next unless $flags & (1 << ($tile - 1));
… …
1110 1395
1111 my $neigh = $self->{neigh_map}{$hash} ||= []; 1396 my $neigh = $self->{neigh_map}{$hash} ||= [];
1112 if (my $info = $neigh->[$tile]) { 1397 if (my $info = $neigh->[$tile]) {
1113 my ($flags, $x, $y, $w, $h, $hash) = @$info; 1398 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1114 1399
1115 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1400 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1116 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1401 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1117 1402
1118 } else { 1403 } else {
1119 $self->send_mapinfo ("spatial $path$tile", sub { 1404 $self->send_mapinfo ("spatial $path$tile", sub {
1120 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1405 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1121 1406
1122 return if $mode ne "spatial"; 1407 return if $mode ne "spatial";
1123 1408
1124 $x += $MAP->ox; 1409 $x += $MAP->ox;
1125 $y += $MAP->oy; 1410 $y += $MAP->oy;
1126 1411
1127 $self->load_map ($hash, $x, $y) 1412 $self->load_map ($hash, $x, $y)
1128 unless $self->{neigh_map}{$hash}[5]++;#d# 1413 unless $self->{neigh_map}{$hash}[5]++;#d#
1129 1414
1130 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 1415 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1131 1416
1132 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1417 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1133 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1418 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1134 }); 1419 });
1135 } 1420 }
1136 } 1421 }
1137} 1422}
… …
1150 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1435 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1151 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1436 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1152 ]; 1437 ];
1153 1438
1154 delete $self->{neigh_grid}; 1439 delete $self->{neigh_grid};
1155 $self->flood_fill (0, 0, "", $hash, $flags);
1156 1440
1157 $x += $ox; 1441 $x += $ox;
1158 $y += $oy; 1442 $y += $oy;
1159 1443
1160 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1444 $self->{map_info} = [$hash, $x, $y, $w, $h];
1161 1445
1162 my $map = $self->{map_info}[0];
1163 $map =~ s/^.*?\/([^\/]+)$/\1/; 1446 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1164 $STATWIDS->{map}->set_text ("Map: " . $map); 1447 $STATWIDS->{map}->set_text ("Map: " . $map);
1165 1448
1166 $self->load_map ($hash, $x, $y); 1449 $self->load_map ($hash, $x, $y);
1450 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1167} 1451}
1168 1452
1169sub conn::face_find { 1453sub conn::face_find {
1170 my ($self, $facenum, $face) = @_; 1454 my ($self, $facenum, $face) = @_;
1171 1455
… …
1173 1457
1174 my $id = $FACEMAP->get ($hash); 1458 my $id = $FACEMAP->get ($hash);
1175 1459
1176 unless ($id) { 1460 unless ($id) {
1177 # create new id for face 1461 # create new id for face
1178 # i love transactions 1462 # I love transactions
1179 for (1..100) { 1463 for (1..100) {
1180 my $txn = $CFClient::DB_ENV->txn_begin; 1464 my $txn = $CFClient::DB_ENV->txn_begin;
1181 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW); 1465 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
1182 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 1466 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
1183 $id++; 1467 $id = ($id || 16) + 1;
1184 if ($FACEMAP->put (id => $id) == 0 1468 if ($FACEMAP->put (id => $id) == 0
1185 && $FACEMAP->put ($hash => $id) == 0) { 1469 && $FACEMAP->put ($hash => $id) == 0) {
1186 $txn->txn_commit; 1470 $txn->txn_commit;
1187 1471
1188 goto gotid; 1472 goto gotid;
… …
1195 } 1479 }
1196 1480
1197gotid: 1481gotid:
1198 $face->{id} = $id; 1482 $face->{id} = $id;
1199 $MAP->set_face ($facenum => $id); 1483 $MAP->set_face ($facenum => $id);
1484 $self->{faceid}[$facenum] = $id;#d#
1485
1200 $TILECACHE->get ($id) 1486 $TILECACHE->get ($id) || do {
1487 my $tex = $self->{noface};
1488 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1489 undef
1490 };
1201} 1491}
1202 1492
1203sub conn::face_update { 1493sub conn::face_update {
1204 my ($self, $facenum, $face) = @_; 1494 my ($self, $facenum, $face) = @_;
1205 1495
… …
1248 title => "Query", 1538 title => "Query",
1249 child => my $vbox = new CFClient::UI::VBox; 1539 child => my $vbox = new CFClient::UI::VBox;
1250 1540
1251 $vbox->add (new CFClient::UI::Label 1541 $vbox->add (new CFClient::UI::Label
1252 max_w => $::WIDTH * 0.4, 1542 max_w => $::WIDTH * 0.4,
1543 ellipsise => 0,
1253 text => $prompt); 1544 text => $prompt);
1254 1545
1255 if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) { 1546 if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) {
1256 $vbox->add (my $hbox = new CFClient::HBox); 1547 $vbox->add (my $hbox = new CFClient::HBox);
1257 $hbox->add (new CFClient::Button 1548 $hbox->add (new CFClient::Button
… …
1265 $hbox->add (new CFClient::Button 1556 $hbox->add (new CFClient::Button
1266 text => "Yes", 1557 text => "Yes",
1267 connect_activate => sub { 1558 connect_activate => sub {
1268 $self->send ("reply y"); 1559 $self->send ("reply y");
1269 $dialog->destroy; 1560 $dialog->destroy;
1270 $MAPWIDGET->focus_in;
1271 }, 1561 },
1272 ); 1562 );
1273 1563
1274 $dialog->focus_in; 1564 $dialog->focus_in;
1275 1565
… …
1277 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 1567 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
1278 $vbox->add (my $entry = new CFClient::UI::Entry 1568 $vbox->add (my $entry = new CFClient::UI::Entry
1279 connect_changed => sub { 1569 connect_changed => sub {
1280 $self->send ("reply $_[1]"); 1570 $self->send ("reply $_[1]");
1281 $dialog->destroy; 1571 $dialog->destroy;
1282 $MAPWIDGET->focus_in;
1283 }, 1572 },
1284 ); 1573 );
1285 1574
1286 $entry->focus_in; 1575 $entry->focus_in;
1287 1576
… …
1291 $vbox->add (my $entry = new CFClient::UI::Entry 1580 $vbox->add (my $entry = new CFClient::UI::Entry
1292 $flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (), 1581 $flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
1293 connect_activate => sub { 1582 connect_activate => sub {
1294 $self->send ("reply $_[1]"); 1583 $self->send ("reply $_[1]");
1295 $dialog->destroy; 1584 $dialog->destroy;
1296 $MAPWIDGET->focus_in;
1297 }, 1585 },
1298 ); 1586 );
1299 1587
1300 $entry->focus_in; 1588 $entry->focus_in;
1301 } 1589 }
1302 1590
1303 $dialog->show; 1591 $dialog->show_centered;
1304} 1592}
1305 1593
1306sub conn::drawinfo { 1594sub conn::drawinfo {
1307 my ($self, $color, $text) = @_; 1595 my ($self, $color, $text) = @_;
1308 1596
… …
1320 [0.55, 0.41, 0.13], 1608 [0.55, 0.41, 0.13],
1321 [0.99, 0.77, 0.26], 1609 [0.99, 0.77, 0.26],
1322 [0.74, 0.65, 0.41], 1610 [0.74, 0.65, 0.41],
1323 ); 1611 );
1324 1612
1613 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1614
1615 $text = CFClient::UI::Label::escape $text;
1616 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1617 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1618
1325 $LOGVIEW->add_paragraph ($color[$color], $text); 1619 $LOGVIEW->add_paragraph ($color[$color],
1620 join "\n", map "$time $_", split /\n/, $text);
1621
1622 $STATUSBOX->add ($text,
1623 group => $text,
1624 fg => $color[$color],
1625 timeout => 60,
1626 tooltip_font => $::FONT_FIXED,
1627 );
1628}
1629
1630sub conn::drawextinfo {
1631 my ($self, $color, $type, $subtype, $message) = @_;
1632
1633 $self->drawinfo ($color, $message);
1326} 1634}
1327 1635
1328sub conn::spell_add { 1636sub conn::spell_add {
1329 my ($self, $spell) = @_; 1637 my ($self, $spell) = @_;
1330 1638
1331 # TODO 1639 # TODO
1332 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1640 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1333 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1641 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1334 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1642 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1335} 1643}
1336 1644
1337sub conn::spell_delete { 1645sub conn::spell_delete {
1338 my ($self, $spell) = @_; 1646 my ($self, $spell) = @_;
1339} 1647}
1340 1648
1341sub conn::addme_success { 1649sub conn::addme_success {
1342 my ($self) = @_; 1650 my ($self) = @_;
1343 1651
1652 $self->send ("command output-sync $CFG->{output_sync}");
1653 $self->send ("command output-count $CFG->{output_count}");
1654
1655 my $parser = new Pod::POM;
1656 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1657
1658 my %skill_tooltip;
1659
1660 for my $head2 ($pod->head2) {
1661 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1662 }
1663
1344 for my $skill (values %{$self->{skill_info}}) { 1664 for my $skill (values %{$self->{skill_info}}) {
1345 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1665 $MAPWIDGET->add_command ("ready_skill $skill",
1346 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1666 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1667 . $skill_tooltip{$skill});
1668 $MAPWIDGET->add_command ("use_skill $skill",
1669 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1670 . $skill_tooltip{$skill});
1347 } 1671 }
1348
1349 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you");
1350 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players");
1351 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1352 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets");
1353} 1672}
1354 1673
1355sub conn::eof { 1674sub conn::eof {
1675 $MAPWIDGET->clr_commands;
1676
1356 stop_game; 1677 stop_game;
1357} 1678}
1358 1679
1359sub update_floorbox { 1680sub update_floorbox {
1360 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1681 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1361 return unless $CONN; 1682 return unless $CONN;
1362 1683
1363 $FLOORBOX->clear; 1684 $FLOORBOX->clear;
1364 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1685 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1365 1686
1366 # we basically have to use the same sorting as everybody else 1687 my $count = 7;
1367 for my $item (@{ $CONN->{container}{0} }) { 1688 for (@{ $CONN->{container}{0} }) {
1689 if (--$count) {
1368 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $item); 1690 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1691 } else {
1692 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1693 last;
1694 }
1369 } 1695 }
1370 }); 1696 });
1371 refresh; 1697
1698 $WANT_REFRESH++;
1372} 1699}
1373 1700
1374sub conn::container_add { 1701sub conn::container_add {
1375 my ($self, $id, $items) = @_; 1702 my ($self, $tag, $items) = @_;
1376 1703
1377 update_floorbox if $id == 0; 1704 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1705
1706 if ($tag == 0) {
1707 update_floorbox;
1708 $OPENCONT = 0;
1709 $INVR_LBL->set_text ("Floor");
1710 $INVR->set_items ($self->{container}{0});
1378 if ($self->{player}{tag} == $id) { 1711 } elsif ($tag == $self->{player}{tag}) {
1712 $INVR_LBL->set_text ("Player");
1379 $INV->set_items ($self->{container}{$self->{player}{tag}}); 1713 $INV->set_items ($self->{container}{$self->{player}{tag}})
1714 } else {
1715 $OPENCONT = $tag;
1716 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1717 $INVR->set_items ($self->{container}{$tag});
1380 } 1718 }
1719
1381 # $self-<{player}{tag} => player inv 1720 # $self-<{player}{tag} => player inv
1382 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1721 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1383} 1722}
1384 1723
1385sub conn::container_clear { 1724sub conn::container_clear {
1386 my ($self, $id) = @_; 1725 my ($self, $tag) = @_;
1387 1726
1388 update_floorbox if $id == 0; 1727 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1389 if ($self->{player}{tag} == $id) { 1728
1729 if ($tag == 0) {
1730 update_floorbox;
1731 $OPENCONT = 0;
1732 $INVR_LBL->set_text ("Floor");
1390 $INV->set_items ($self->{container}{$id}); 1733 $INVR->set_items ($self->{container}{0});
1734 } elsif ($tag == $self->{player}{tag}) {
1735 $INVR_LBL->set_text ("Player");
1736 $INV->set_items ($self->{container}{$tag})
1737 } else {
1738 $OPENCONT = $tag;
1739 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1740 $INVR->set_items ($self->{container}{$tag});
1391 } 1741 }
1392 1742
1393# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1743# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1394} 1744}
1395 1745
1396sub conn::item_delete { 1746sub conn::item_delete {
1397 my ($self, @items) = @_; 1747 my ($self, @items) = @_;
1398 1748
1399 for (@items) { 1749 for (@items) {
1400 update_floorbox if $_->{container} == 0; 1750 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1401 if ($self->{player}{tag} == $_->{container}) { 1751
1752 if ($_->{container} == 0) {
1753 update_floorbox;
1754 $OPENCONT = 0;
1755 $INVR_LBL->set_text ("Floor");
1756 $INVR->set_items ($self->{container}{0});
1757 } elsif ($_->{container} == $self->{player}{tag}) {
1758 $INVR_LBL->set_text ("Player");
1759 $INV->set_items ($self->{container}{$self->{player}{tag}})
1760 } else {
1761 $OPENCONT = $_->{container};
1762 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1402 $INV->set_items ($self->{container}{$_->{container}}); 1763 $INVR->set_items ($self->{container}{$_->{container}});
1403 } 1764 }
1404 } 1765 }
1405} 1766}
1406 1767
1407sub conn::item_update { 1768sub conn::item_update {
1408 my ($self, $item) = @_; 1769 my ($self, $item) = @_;
1409 1770
1410 update_floorbox if $item->{container} == 0; 1771 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1411 if ($self->{player}{tag} == $item->{container}) { 1772
1773 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1774 $OPENCONT = 0;
1775 $INVR_LBL->set_text ("Floor");
1776 $INVR->set_items ($self->{container}{0});
1777
1778 $item->{widget}->update_item
1779 if $item->{widget};
1780 } else {
1781 if ($item->{container} == 0) {
1782 update_floorbox;
1783 $OPENCONT = 0;
1784 $INVR_LBL->set_text ("Floor");
1785 $INVR->set_items ($self->{container}{0});
1786 } elsif ($item->{container} == $self->{player}{tag}) {
1412 $INV->set_items ($self->{container}{$item->{container}}); 1787 $INV->set_items ($self->{container}{$item->{container}})
1788 }
1413 } 1789 }
1414} 1790}
1415 1791
1416%SDL_CB = ( 1792%SDL_CB = (
1417 CFClient::SDL_QUIT => sub { 1793 CFClient::SDL_QUIT => sub {
1418 Event::unloop -1; 1794 Event::unloop -1;
1419 }, 1795 },
1420 CFClient::SDL_VIDEORESIZE => sub { 1796 CFClient::SDL_VIDEORESIZE => sub {
1421 }, 1797 },
1422 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1798 CFClient::SDL_VIDEOEXPOSE => sub {
1799 CFClient::UI::full_refresh;
1800 },
1423 CFClient::SDL_ACTIVEEVENT => sub { 1801 CFClient::SDL_ACTIVEEVENT => sub {
1424# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1802# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1425 }, 1803 },
1426 CFClient::SDL_KEYDOWN => sub { 1804 CFClient::SDL_KEYDOWN => sub {
1427 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1805 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1448 1826
1449############################################################################# 1827#############################################################################
1450 1828
1451$SIG{INT} = $SIG{TERM} = sub { exit }; 1829$SIG{INT} = $SIG{TERM} = sub { exit };
1452 1830
1453CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1454
1455$TILECACHE = CFClient::db_table "tilecache";
1456$FACEMAP = CFClient::db_table "facemap";
1457
1458my %DEF_CFG = (
1459 sdl_mode => 0,
1460 width => 640,
1461 height => 480,
1462 fullscreen => 0,
1463 fast => 0,
1464 map_scale => 0.5,
1465 fow_enable => 1,
1466 fow_intensity => 0.45,
1467 fow_smooth => 0,
1468 gui_fontsize => 1,
1469 log_fontsize => 1,
1470 gauge_fontsize => 1,
1471 gauge_size => 0.35,
1472 stat_fontsize => 1,
1473 mapsize => 100,
1474 host => "crossfire.schmorp.de",
1475 say_command => 'say',
1476 audio_enable => 1,
1477 bgm_enable => 1,
1478 bgm_volume => 0.25,
1479);
1480
1481while (my ($k, $v) = each %DEF_CFG) {
1482 $CFG->{$k} = $v unless exists $CFG->{$k};
1483}
1484
1485sdl_init;
1486
1487@SDL_MODES = reverse
1488 grep $_->[0] >= 640 && $_->[1] >= 480,
1489 CFClient::SDL_ListModes;
1490
1491@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1492
1493$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1494
1495{ 1831{
1832 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1833
1834 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1835
1836 $TILECACHE = CFClient::db_table "tilecache";
1837 $FACEMAP = CFClient::db_table "facemap";
1838
1839 my %DEF_CFG = (
1840 sdl_mode => 0,
1841 width => 640,
1842 height => 480,
1843 fullscreen => 0,
1844 fast => 0,
1845 map_scale => 1,
1846 fow_enable => 1,
1847 fow_intensity => 0.45,
1848 fow_smooth => 0,
1849 gui_fontsize => 1,
1850 log_fontsize => 1,
1851 gauge_fontsize=> 1,
1852 gauge_size => 0.35,
1853 stat_fontsize => 1,
1854 mapsize => 100,
1855 host => "crossfire.schmorp.de",
1856 say_command => 'say',
1857 audio_enable => 1,
1858 bgm_enable => 1,
1859 bgm_volume => 0.25,
1860 output_sync => 1,
1861 output_count => 1,
1862 );
1863
1864 while (my ($k, $v) = each %DEF_CFG) {
1865 $CFG->{$k} = $v unless exists $CFG->{$k};
1866 }
1867
1868 sdl_init;
1869
1870 @SDL_MODES = reverse
1871 grep $_->[0] >= 640 && $_->[1] >= 480,
1872 CFClient::SDL_ListModes;
1873
1874 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1875
1876 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1877
1878 {
1496 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1879 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1497 DejaVuSans.ttf 1880 DejaVuSans.ttf
1498 DejaVuSansMono.ttf 1881 DejaVuSansMono.ttf
1499 DejaVuSans-Bold.ttf 1882 DejaVuSans-Bold.ttf
1500 DejaVuSansMono-Bold.ttf 1883 DejaVuSansMono-Bold.ttf
1501 DejaVuSans-Oblique.ttf 1884 DejaVuSans-Oblique.ttf
1502 DejaVuSansMono-Oblique.ttf 1885 DejaVuSansMono-Oblique.ttf
1503 DejaVuSans-BoldOblique.ttf 1886 DejaVuSans-BoldOblique.ttf
1504 DejaVuSansMono-BoldOblique.ttf 1887 DejaVuSansMono-BoldOblique.ttf
1505 ); 1888 );
1506 1889
1507 CFClient::add_font $_ for @fonts; 1890 CFClient::add_font $_ for @fonts;
1508 1891
1892 CFClient::pango_init;
1893
1509 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1894 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1510 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1895 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1511 1896
1512 $FONT_PROP->make_default; 1897 $FONT_PROP->make_default;
1513} 1898 }
1514 1899
1900# compare mono (ft) vs. rgba (cairo)
1901# ft - 1.8s, cairo 3s, even in alpha-only mode
1902# for my $rgba (0..1) {
1903# my $t1 = Time::HiRes::time;
1904# for (1..1000) {
1905# my $layout = CFClient::Layout->new ($rgba);
1906# $layout->set_text ("hallo" x 100);
1907# $layout->render;
1908# }
1909# my $t2 = Time::HiRes::time;
1910# warn $t2-$t1;
1911# }
1912
1515video_init; 1913 video_init;
1516audio_init; 1914 audio_init;
1915}
1517 1916
1518Event::loop; 1917Event::loop;
1519 1918
1520END { CFClient::SDL_Quit } 1919END { CFClient::SDL_Quit }
1521 1920
1921=head1 NAME
1922
1522=head1 pclient - Crossfire+ and Crossfire game client 1923pclient - A Crossfire+ and Crossfire game client
1523 1924
1524Pclient is a Crossfire+ and Crossfire game client. 1925=head1 SYNOPSIS
1525 1926
1526=head2 Features 1927Just run it - no commandline arguments are supported.
1527
1528=over 4
1529
1530=item Fullscreen Map
1531
1532PClient can uses a fullscreen map, which greatly enhances how much of the
1533game world you can see.
1534
1535=item Persistent Map Cache (Crossfire+ only)
1536
1537PClient can persistently cache all map data it received from the
1538server. This not only allows it to display an overview map, but also
1539ensures that once-explored areas will be available the next time you want
1540to explore more.
1541
1542=item Hardware acceleration
1543
1544Unlike most Crossfire clients, PClient take advantage of OpenGL hardware
1545acceleration. Most modern graphics cards have difficulties with 2D
1546acceleration, while 3D graphics is accelerated well.
1547
1548=item No arbitrary limits
1549
1550Unlike other Crossfire clients, pclient does not suffer from arbitrary
1551limits (like a fixed amount of face numbers). There are still limits, but
1552they are not arbitrarily low :)
1553
1554=back
1555 1928
1556=head1 USAGE 1929=head1 USAGE
1557 1930
1558=head2 The Map 1931Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used
1559 1932fullscreen and interactively.
1560The map is always displayed in the background, behind all other windows and UI elements.
1561
1562#TODO# middle-click scrolls
1563#
1564# keys:
1565#
1566# a apply
1567# keypad moves, kp_5 applies ranged attack to self
1568
1569Starting to type enters the I<completion mode>. In that mode, you can type
1570abbreviations or commands and have them executed as soon as they match a
1571valid command. This is best explained by a few examples:
1572
1573Typing B<climb> will display a list of commands with I<climb> in their
1574name, such as I<ready_skill climbing> and I<use_skill climbing>.
1575
1576You can abbreviate commands by typing only the first character of every
1577word. For example, typing I<iwor> will likely select I<invoke word of
1578recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli>
1579will likely select I<ready_skill climbing> and I<usl> will give you
1580I<use_skill levitation>.
1581
1582=head2 The map overview
1583
1584#TODO#
1585
1586=head2 The Status area in the lower right corner
1587
1588#TODO#
1589
1590=head2 The I<Statistics>/I>Stats> window
1591
1592#TODO#
1593
1594=head1 FAQ
1595
1596=over 4
1597
1598=item The client is very sluggish and slow, what can I do about this?
1599
1600Most likely, you don't have accelerated OpenGL support. Try to find a
1601newer driver, or a driver from your hardware vendor, that features OpenGL
1602support.
1603
1604If this is not an option, the following Setup options reduce the load and
1605will likely make the client playable with sofwtare rendering (it will
1606still be slow, though):
1607
1608=over 4
1609
1610=item B<Video Mode> should be set as low as possible (e.g. 640x480)
1611
1612=item Enable B<Fast & Ugly> mode
1613
1614=item Disable B<Fog of War>
1615
1616=item Increase B<Map Scale>
1617
1618=back
1619
1620=back
1621 1933
1622=head1 AUTHOR 1934=head1 AUTHOR
1623 1935
1624Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1936Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1625 1937

Diff Legend

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