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.195 by root, Sun Apr 30 11:17:09 2006 UTC vs.
Revision 1.240 by root, Tue May 23 21:14:42 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;
76our $MAPWIDGET; 81our $MAPWIDGET;
77our $BUTTONBAR; 82our $BUTTONBAR;
78our $LOGVIEW; 83our $LOGVIEW;
79our $CONSOLE; 84our $CONSOLE;
80our $METASERVER; 85our $METASERVER;
86our $LOGIN_BUTTON;
87our $QUIT_DIALOG;
81 88
82our $FLOORBOX; 89our $FLOORBOX;
83our $GAUGES; 90our $GAUGES;
84our $STATWIDS; 91our $STATWIDS;
85 92
89our $SDL_MIXER; 96our $SDL_MIXER;
90our @SOUNDS; # event => file mapping 97our @SOUNDS; # event => file mapping
91our %AUDIO_CHUNKS; # audio files 98our %AUDIO_CHUNKS; # audio files
92 99
93our $ALT_ENTER_MESSAGE; 100our $ALT_ENTER_MESSAGE;
94our $STATUS_LINE; 101our $STATUSBOX;
95our $DEBUG_STATUS; 102our $DEBUG_STATUS;
96 103
97our $INVWIN; 104our $INVWIN;
98our $INV; 105our $INV;
106our $INVR;
107our $INVR_LBL;
108our $OPENCONT;
99 109
100sub status { 110sub status {
101 $STATUS_LINE->set_text ($_[0]); 111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
102 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
103} 112}
104 113
105sub debug { 114sub debug {
106 $DEBUG_STATUS->set_text ($_[0]); 115 $DEBUG_STATUS->set_text ($_[0]);
107 $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);
108} 118}
109 119
110sub start_game { 120sub start_game {
111 status "logging in..."; 121 status "logging in...";
112 122
113 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 123 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
114 124
115 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 125 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
116
117 $MAP = new CFClient::Map $mapsize, $mapsize; 126 $MAP = new CFClient::Map $mapsize, $mapsize;
118 127
119 my ($host, $port) = split /:/, $CFG->{host}; 128 my ($host, $port) = split /:/, $CFG->{host};
120 129
121 $CONN = eval { 130 $CONN = eval {
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
144 $LOGIN_BUTTON->set_text ("Logout");
133 status "login successful"; 145 status "login successful";
134 146
135 CFClient::lowdelay fileno $CONN->{fh}; 147 $BUTTONBAR->{children}[1]->emit ("activate")
148 if $BUTTONBAR->{children}[1]->{state};
149
136 } else { 150 } else {
137 status "unable to connect"; 151 status "unable to connect";
152 stop_game();
138 } 153 }
139} 154}
140 155
141sub stop_game { 156sub stop_game {
157 return unless $CONN;
158
159 status "connection closed";
160 $LOGIN_BUTTON->set_text ("Login");
161 $CONN->destroy;
162 $CONN = 0; # false, does not autovivify
163
164 $BUTTONBAR->{children}[1]->emit ("activate")
165 unless $BUTTONBAR->{children}[1]->{state};
166
167 undef $MAPCACHE;
142 undef $CONN; 168 undef $MAP;
143} 169}
144 170
145sub client_setup { 171sub client_setup {
146 my $dialog = new CFClient::UI::FancyFrame 172 my $dialog = new CFClient::UI::FancyFrame
147 title => "Client Setup", 173 title => "Client Setup",
149 $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]);
150 176
151 $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");
152 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 178 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
153 179
154 $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, 1, 1]);
155 $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");
156 182
157 $mode_slider->connect (changed => sub { 183 $mode_slider->connect (changed => sub {
158 my ($self, $value) = @_; 184 my ($self, $value) = @_;
159 185
184 } 210 }
185 ); 211 );
186 212
187 $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");
188 $table->add (1, $row++, new CFClient::UI::Slider 214 $table->add (1, $row++, new CFClient::UI::Slider
189 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 215 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
190 tooltip => "Enlarge or shrink the displayed map", 216 tooltip => "Enlarge or shrink the displayed map",
191 connect_changed => sub { 217 connect_changed => sub {
192 my ($self, $value) = @_; 218 my ($self, $value) = @_;
193 $CFG->{map_scale} = 0.05 * int $value / 0.05; 219 $CFG->{map_scale} = 2 ** $value;
194 } 220 }
195 ); 221 );
196 222
197 $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");
198 $table->add (1, $row++, new CFClient::UI::CheckBox 224 $table->add (1, $row++, new CFClient::UI::CheckBox
225 } 251 }
226 ); 252 );
227 253
228 $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");
229 $table->add (1, $row++, new CFClient::UI::Slider 255 $table->add (1, $row++, new CFClient::UI::Slider
230 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 256 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
231 tooltip => "The font size used by most GUI elements", 257 tooltip => "The font size used by most GUI elements",
232 connect_changed => sub { 258 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
233 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
234# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
235 }
236 ); 259 );
237 260
238 $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");
239 $table->add (1, $row++, new CFClient::UI::Slider 262 $table->add (1, $row++, new CFClient::UI::Slider
240 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 263 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
241 tooltip => "The font size used by the server log window only", 264 tooltip => "The font size used by the server log window only",
242 connect_changed => sub { 265 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
243 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
244 }
245 ); 266 );
246 267
247 $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");
248 269
249 $table->add (1, $row++, new CFClient::UI::Slider 270 $table->add (1, $row++, new CFClient::UI::Slider
250 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 271 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
251 tooltip => "The font size used by the statistics window only", 272 tooltip => "The font size used by the statistics window only",
252 connect_changed => sub { 273 connect_changed => sub {
253 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 274 $CFG->{stat_fontsize} = $_[1];
254 &set_stats_window_fontsize; 275 &set_stats_window_fontsize;
255 } 276 }
256 ); 277 );
257 278
258 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 279 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
259 $table->add (1, $row++, new CFClient::UI::Slider 280 $table->add (1, $row++, new CFClient::UI::Slider
260 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 281 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
261 tooltip => "Adjust the size of the stats gauges at the bottom right", 282 tooltip => "Adjust the size of the stats gauges at the bottom right",
262 connect_changed => sub { 283 connect_changed => sub {
263 $CFG->{gauge_size} = $_[1]; 284 $CFG->{gauge_size} = $_[1];
264 my $h = int $HEIGHT * $CFG->{gauge_size}; 285 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
265 $GAUGES->{win}->set_size ($WIDTH, $h);
266 $GAUGES->{win}->move (0, $HEIGHT - $h);
267 } 286 }
268 ); 287 );
269 288
270 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
271 $table->add (1, $row++, new CFClient::UI::Slider 290 $table->add (1, $row++, new CFClient::UI::Slider
272 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 291 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
273 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 292 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
274 connect_changed => sub { 293 connect_changed => sub {
275 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 294 $CFG->{gauge_fontsize} = $_[1];
276 &set_gauge_window_fontsize; 295 &set_gauge_window_fontsize;
277 } 296 }
278 ); 297 );
279 298
280 $table->add (1, $row++, new CFClient::UI::Button 299 $table->add (1, $row++, new CFClient::UI::Button
354# local $GAUGES->{win}{parent};#d# 373# local $GAUGES->{win}{parent};#d#
355# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D; 374# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
356} 375}
357 376
358sub make_gauge_window { 377sub make_gauge_window {
359 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 378 my $gh = int $HEIGHT * $CFG->{gauge_size};
360# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
361 379
362 my $win = new CFClient::UI::Frame ( 380 my $win = new CFClient::UI::Frame (
363 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 381 req_y => -1,
382 user_w => $WIDTH,
383 user_h => $gh,
364 ); 384 );
385
365 $win->add (my $hbox = new CFClient::UI::HBox 386 $win->add (my $hbox = new CFClient::UI::HBox
366 children => [ 387 children => [
367 (new CFClient::UI::HBox expand => 1), 388 (new CFClient::UI::HBox expand => 1),
368 ($FLOORBOX = new CFClient::UI::VBox), 389 (new CFClient::UI::VBox children => [
390 (new CFClient::UI::Empty expand => 1),
391 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)),
392 ]),
369 (my $vbox = new CFClient::UI::VBox), 393 (my $vbox = new CFClient::UI::VBox),
370 ], 394 ],
371 ); 395 );
372 396
373 $vbox->add (new CFClient::UI::HBox 397 $vbox->add (new CFClient::UI::HBox
377 (my $hb = new CFClient::UI::HBox), 401 (my $hb = new CFClient::UI::HBox),
378 ], 402 ],
379 ); 403 );
380 404
381 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 405 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
382 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."); 406 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.");
383 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 407 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
384 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."); 408 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.");
385 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 409 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
386 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."); 410 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.");
387 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 411 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
388 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."); 412 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.");
389 413
390 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 414 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
391 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."); 415 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.");
392 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 416 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
393 tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)"); 417 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
394 418
395 $GAUGES = { 419 $GAUGES = {
396 exp => $exp, win => $win, range => $rng, 420 exp => $exp, win => $win, range => $rng,
397 food => $fg, mana => $mg, hp => $hg, grace => $gg 421 food => $fg, mana => $mg, hp => $hg, grace => $gg
398 }; 422 };
404 428
405sub make_stats_window { 429sub make_stats_window {
406 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats"; 430 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats";
407 431
408 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 432 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
409 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1); 433 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
434 can_hover => 1, can_events => 1,
435 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
410 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1); 436 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
437 can_hover => 1, can_events => 1,
438 tooltip => "The map you are currently on (if supported by the server).");
411 439
412 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 440 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
413
414 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 441 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
415 442
416 my $black = [0, 0, 0]; 443 my $black = [0, 0, 0];
417 444
418 for ( 445 for (
419 [0, 0, st_str => "Str", 30, "Physical Strength, determines damage dealt with weapons, how much you can carry, and how often you can attack"], 446 [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"],
420 [0, 1, st_dex => "Dex", 30, "Dexterity, your physical agility. Determines chance of being hit and affects armor class and speed"], 447 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"],
421 [0, 2, st_con => "Con", 30, "Constitution, physical health and toughness. Determines how many healthpoints you can have"], 448 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"],
422 [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"], 449 [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"],
423 [0, 4, st_wis => "Wis", 30, "Wisdom, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"], 450 [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"],
424 [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"], 451 [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"],
425 [0, 6, st_cha => "Cha", 30, "Charisma, how well you are received by NPCs. Affects buying and selling prices in shops."], 452 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
426 453
427 [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."], 454 [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."],
428 [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."], 455 [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."],
429 [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."], 456 [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."],
430 [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."], 457 [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."],
431 [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."], 458 [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."],
432 [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."], 459 [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."],
433 ) { 460 ) {
434 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 461 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
435 462
436 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 463 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
437 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 464 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
443 470
444 my $row = 0; 471 my $row = 0;
445 my $col = 0; 472 my $col = 0;
446 473
447 my %resist_names = ( 474 my %resist_names = (
448 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.)", 475 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.)",
449 holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 476 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.)",
450 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)", 477 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)",
451 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 478 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
452 depl => "Depletion (some monsters and other effects can cause stats depletion)", 479 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)",
453 magic => "Magic (resistance to magic spells like magic missile or similar)", 480 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)",
454 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)", 481 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
455 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 482 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
456 pois => "Poison (resistance to getting poisoned)", 483 pois => "<b>Poison</b> (resistance to getting poisoned)",
457 para => "Paralysation (this resistance affects the chance you get paralysed)", 484 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
458 deat => "Death (resistance against death spells)", 485 deat => "<b>Death</b> (resistance against death spells)",
459 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 486 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
460 blind => "Blind (blind resistance affects the chance of a successful blinding attack)", 487 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
461 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)", 488 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)",
462 tund => "Turn undead", 489 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
463 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)", 490 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
464 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)", 491 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
465 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)", 492 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)",
466 ); 493 );
467 for (qw/slow holyw conf fire depl magic 494 for (qw/slow holyw conf fire depl magic
468 drain acid pois para deat phys 495 drain acid pois para deat phys
469 blind fear tund elec cold ghit/) 496 blind fear tund elec cold ghit/)
470 { 497 {
571 598
572} 599}
573 600
574sub metaserver_dialog { 601sub metaserver_dialog {
575 my $dialog = new CFClient::UI::FancyFrame 602 my $dialog = new CFClient::UI::FancyFrame
576 title => "Metaserver", 603 title => "Server List",
577 child => (my $vbox = new CFClient::UI::VBox); 604 child => (my $vbox = new CFClient::UI::VBox);
578 605
579 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 606 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
580 607
581 $dialog 608 $dialog
650 $HOST->set_text ($CFG->{host} = $host); 677 $HOST->set_text ($CFG->{host} = $host);
651 }), 678 }),
652 (new CFClient::UI::Empty expand => 1), 679 (new CFClient::UI::Empty expand => 1),
653 ]); 680 ]);
654 681
655 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8) 682 $table->add ($_ + 1, $y, new CFClient::UI::Label
683 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)
656 for 0 .. $#$m; 684 for 0 .. $#$m;
657 } 685 }
658 } 686 }
659 }); 687 });
660} 688}
683 711
684 $METASERVER = metaserver_dialog; 712 $METASERVER = metaserver_dialog;
685 713
686 $vbox->add (new CFClient::UI::Flopper 714 $vbox->add (new CFClient::UI::Flopper
687 expand => 1, 715 expand => 1,
688 text => "Metaserver", 716 text => "Server List",
689 other => $METASERVER, 717 other => $METASERVER,
690 tooltip => "Show a list of avaible crossfire servers", 718 tooltip => "Show a list of available crossfire servers",
691 connect_open => sub { 719 connect_open => sub {
692 update_metaserver $HOST; 720 update_metaserver $HOST;
693 } 721 }
694 ); 722 );
695 } 723 }
716 ); 744 );
717 745
718 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 746 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
719 $table->add (1, 7, new CFClient::UI::Slider 747 $table->add (1, 7, new CFClient::UI::Slider
720 req_w => 100, 748 req_w => 100,
721 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 749 range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1],
722 tooltip => "This is the size of the portion of the map update the server sends you. " 750 tooltip => "This is the size of the portion of the map update the server sends you. "
723 ."If you set this to a high value you will be able to see further for example.", 751 ."If you set this to a high value you will be able to see further for example.",
724 connect_changed => sub { 752 connect_changed => sub {
725 my ($self, $value) = @_; 753 my ($self, $value) = @_;
726 754
727 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 755 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
728 }, 756 },
729 ); 757 );
730 758
731 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 759 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
732 start_game; 760 $table->add (1, 8, new CFClient::UI::Entry
761 text => $CFG->{output_count},
762 tooltip => "Should be set to 1 unless you know what you are doing",
763 connect_changed => sub { $CFG->{output_count} = $_[1] },
733 }); 764 );
765
766 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
767 $table->add (1, 9, new CFClient::UI::Entry
768 text => $CFG->{output_sync},
769 tooltip => "Should be set to 1 unless you know what you are doing",
770 connect_changed => sub { $CFG->{output_sync} = $_[1] },
771 );
772
773 $table->add (1, 10, $LOGIN_BUTTON = new CFClient::UI::Button
774 expand => 1,
775 align => 0,
776 text => "Login",
777 connect_activate => sub {
778 $CONN ? stop_game
779 : start_game;
780 },
781 );
734 782
735 $dialog 783 $dialog
736} 784}
737 785
738sub message_window { 786sub message_window {
739 my $window = new CFClient::UI::FancyFrame 787 my $window = new CFClient::UI::FancyFrame
740 title => "Messages", 788 title => "Messages",
741 border_bg => [1, 1, 1, 1], 789 border_bg => [1, 1, 1, 1],
742 bg => [0, 0, 0, 0.5], 790 bg => [0, 0, 0, 0.75],
743 user_w => int $::WIDTH / 3, 791 user_w => int $::WIDTH / 3,
744 user_h => int $::HEIGHT / 5, 792 user_h => int $::HEIGHT / 5,
745 child => (my $vbox = new CFClient::UI::VBox); 793 child => (my $vbox = new CFClient::UI::VBox);
746 794
747 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 795 $vbox->add ($LOGVIEW);
748 expand => 1,
749 font => $FONT_FIXED,
750 fontsize => $::CFG->{log_fontsize},
751 );
752 796
753 $vbox->add (my $input = new CFClient::UI::Entry 797 $vbox->add (my $input = new CFClient::UI::Entry
798 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
799 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
800 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
801 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
754 connect_focus_in => sub { 802 connect_focus_in => sub {
755 my ($input, $prev_focus) = @_; 803 my ($input, $prev_focus) = @_;
756 804
757 delete $input->{refocus_map}; 805 delete $input->{refocus_map};
758 806
787 }; 835 };
788 836
789 $window 837 $window
790} 838}
791 839
840sub open_quit_dialog {
841 unless ($QUIT_DIALOG) {
842
843 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";
844
845 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
846
847 $vb->add (new CFClient::UI::Label
848 text => "You should find a savebed and apply it first!",
849 max_w => $WIDTH * 0.25
850 );
851 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
852 $hb->add (new CFClient::UI::Button
853 text => "Ok",
854 connect_activate => sub { $QUIT_DIALOG->hide },
855 expand => 1
856 );
857 $hb->add (new CFClient::UI::Button
858 text => "Quit anyway",
859 connect_activate => sub { exit 1 },
860 expand => 1
861 );
862 $hb->add (new CFClient::UI::Label "You should find a savebed and apply it first!");
863
864 $QUIT_DIALOG->show_centered;
865 } else {
866 $QUIT_DIALOG->show_centered;
867 }
868}
869
792sub make_inventory_window { 870sub make_inventory_window {
793 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory"; 871 my $invwin = new CFClient::UI::FancyFrame
872 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory";
873
874 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
875
876 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
877 $vb1->add (my $lbl = new CFClient::UI::Label);
878 $lbl->set_text ("Player");
794 $invwin->add ($INV = new CFClient::UI::Inventory expand => 1); 879 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
880
881 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
882 $vb2->add ($INVR_LBL = new CFClient::UI::Label);
883 $INVR_LBL->set_text ("Floor");
884 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
885
795 $invwin 886 $invwin
796} 887}
797 888
798sub sdl_init { 889sub sdl_init {
799 CFClient::SDL_Init 890 CFClient::SDL_Init
801} 892}
802 893
803sub video_init { 894sub video_init {
804 sdl_init; 895 sdl_init;
805 896
897 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
898
806 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 899 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
807 $FULLSCREEN = $CFG->{fullscreen}; 900 $FULLSCREEN = $CFG->{fullscreen};
808 $FAST = $CFG->{fast}; 901 $FAST = $CFG->{fast};
809 902
810 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 903 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
811 or die "SDL_SetVideoMode failed!\n"; 904 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
812 905
813 $SDL_ACTIVE = 1; 906 $SDL_ACTIVE = 1;
814
815 $LAST_REFRESH = time - 0.01; 907 $LAST_REFRESH = time - 0.01;
816 908
817 CFClient::gl_init; 909 CFClient::gl_init;
818 910
819 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 911 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
820 912
913 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
914
821 ############################################################################# 915 #############################################################################
822 916
917 unless ($DEBUG_STATUS) {
918 # create the widgets
919
823 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 920 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
824 $DEBUG_STATUS->show; 921 $DEBUG_STATUS->show;
825 922
826 $STATUS_LINE = new CFClient::UI::Label 923 $STATUSBOX = new CFClient::UI::Statusbox;
827 padding => 0, 924 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
828 y => $HEIGHT - $FONTSIZE * 1.8;
829 $STATUS_LINE->show;
830 925
831 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 926 (new CFClient::UI::Frame
832 padding => 0, 927 bg => [0, 0, 0, 0.4],
833 fontsize => 0.8, 928 req_y => -1,
834 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 929 child => $STATUSBOX,
835 $ALT_ENTER_MESSAGE->show; 930 )->show;
836 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
837 931
838 CFClient::UI::FancyFrame->new ( 932 CFClient::UI::FancyFrame->new (
839 border_bg => [1, 1, 1, 192/255], 933 border_bg => [1, 1, 1, 192/255],
840 bg => [1, 1, 1, 0], 934 bg => [1, 1, 1, 0],
841 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 935 child => ($MAPMAP = new CFClient::MapWidget::MapMap
936 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
937 ),
842 )->show; 938 )->show;
843 939
844 $MAPWIDGET = new CFClient::MapWidget; 940 $MAPWIDGET = new CFClient::MapWidget;
845 $MAPWIDGET->connect (activate_console => sub { 941 $MAPWIDGET->connect (activate_console => sub {
846 my ($mapwidget, $preset) = @_; 942 my ($mapwidget, $preset) = @_;
847 943
848 if ($CONSOLE) { 944 if ($CONSOLE) {
849 $CONSOLE->{input}->{auto_activated} = 1; 945 $CONSOLE->{input}->{auto_activated} = 1;
850 $CONSOLE->{input}->focus_in; 946 $CONSOLE->{input}->focus_in;
851 947
852 if ($preset && $CONSOLE->{input}->get_text eq '') { 948 if ($preset && $CONSOLE->{input}->get_text eq '') {
853 $CONSOLE->{input}->set_text ($preset); 949 $CONSOLE->{input}->set_text ($preset);
950 }
854 } 951 }
855 } 952 });
856 });
857 $MAPWIDGET->show; 953 $MAPWIDGET->show;
858 $MAPWIDGET->focus_in; 954 $MAPWIDGET->focus_in;
859 955
956 $LOGVIEW = new CFClient::UI::TextView
957 expand => 1,
958 font => $FONT_FIXED,
959 fontsize => $::CFG->{log_fontsize},
960 can_hover => 1,
961 can_events => 1,
962 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
963 ;
964
860 $BUTTONBAR = new CFClient::UI::HBox; 965 $BUTTONBAR = new CFClient::UI::HBox;
861 966
862 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 967 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
968 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
863 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 969 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
970 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
864 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 971 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
972 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
865 973
866 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 974 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
867 975
868 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 976 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
977 tooltip => "Toggles the statistics window, where all your Stats and Resistances are beign displaye at all times.");
869 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window); 978 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
979 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
870 980
871 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 981 $BUTTONBAR->add (new CFClient::UI::Button
982 text => "Save Config",
983 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
984 connect_activate => sub {
872 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 985 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
873 status "Configuration Saved"; 986 status "Configuration Saved";
874 }); 987 },
988 );
875 989
990 $BUTTONBAR->add (new CFClient::UI::Button
991 text => "Quit",
992 tooltip => "Terminates the program",
993 connect_activate => sub {
994 if ($CONN) {
995 open_quit_dialog
996 } else {
997 exit 1
998 }
999 },
1000 );
1001
876 $BUTTONBAR->show; 1002 $BUTTONBAR->show;
877 1003
1004 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1005
1006 # delay till geometry is constant
1007 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
878 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 1008 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1009 my $widget = $GAUGES->{win};
1010 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1011 });
1012 force_refresh ();
1013 }
879} 1014}
880 1015
881sub video_shutdown { 1016sub video_shutdown {
882 $CFClient::UI::ROOT->{children} = [];
883 undef $CFClient::UI::GRAB;
884 undef $CFClient::UI::HOVER;
885 undef $SDL_ACTIVE; 1017 undef $SDL_ACTIVE;
886} 1018}
887 1019
888my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1020my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
889my $bgmusic;#TODO#hack#d# 1021my $bgmusic;#TODO#hack#d#
1022
1023sub audio_channel_finished {
1024 my ($channel) = @_;
1025
1026 #warn "channel $channel finished\n";#d#
1027}
890 1028
891sub audio_music_finished { 1029sub audio_music_finished {
892 return unless $CFG->{bgm_enable}; 1030 return unless $CFG->{bgm_enable};
893 1031
894 # TODO: hack, do play loop and mood music 1032 # TODO: hack, do play loop and mood music
900 1038
901sub audio_init { 1039sub audio_init {
902 if ($CFG->{audio_enable}) { 1040 if ($CFG->{audio_enable}) {
903 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1041 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
904 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1042 $SDL_MIXER = !CFClient::Mix_OpenAudio;
1043
1044 unless ($SDL_MIXER) {
1045 status "Unable to open sound device: there will be no sound";
1046 return;
1047 }
1048
905 CFClient::Mix_AllocateChannels 8; 1049 CFClient::Mix_AllocateChannels 8;
906 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1050 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
907 1051
908 audio_music_finished; 1052 audio_music_finished;
909 1053
935} 1079}
936 1080
937my %animate_object; 1081my %animate_object;
938my $animate_timer; 1082my $animate_timer;
939 1083
940my $want_refresh;
941my $can_refresh;
942
943my $fps = 9; 1084my $fps = 9;
944 1085
1086my %demo;#d#
1087
945sub force_refresh { 1088sub force_refresh {
946 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 1089 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
947 debug sprintf "%3.2f", $fps; 1090 debug sprintf "%3.2f", $fps;
948 1091
949 $want_refresh = 0;
950 $can_refresh = 0;
951
952 $CFClient::UI::ROOT->draw; 1092 $CFClient::UI::ROOT->draw;
953 1093
1094 $WANT_REFRESH = 0;
1095 $CAN_REFRESH = 0;
1096 $LAST_REFRESH = $NOW;
1097
10980 && do {
1099 # some weird model-drawing code, just a joke right now
1100 use CFClient::OpenGL;
1101
1102 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1103 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1104 $demo{r} ||= do {
1105 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1106 $mod->{v} = pack "f*", @{$mod->{v}};
1107 $_ = [scalar @$_, pack "S!*", @$_]
1108 for values %{$mod->{g}};
1109 $mod
1110 };
1111
1112 my $r = $demo{r} or die;
1113
1114 glDepthMask 1;
1115 glClear GL_DEPTH_BUFFER_BIT;
1116 glEnable GL_TEXTURE_2D;
1117 glEnable GL_DEPTH_TEST;
1118 glEnable GL_CULL_FACE;
1119 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1120
1121 glMatrixMode GL_PROJECTION;
1122 glLoadIdentity;
1123 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1124 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1125 glMatrixMode GL_MODELVIEW;
1126 glLoadIdentity;
1127
1128 glPushMatrix;
1129 glTranslate 0, 0, -800;
1130 glScale 1, -1, 1;
1131 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1132 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1133 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1134 glScale 50, 50, 50;
1135
1136 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1137 while (my ($k, $v) = each %{$r->{g}}) {
1138 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1139 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1140 }
1141
1142 glPopMatrix;
1143
1144 glShadeModel GL_FLAT;
1145 glDisable GL_DEPTH_TEST;
1146 glDisable GL_TEXTURE_2D;
1147 glDepthMask 0;
1148
1149 $WANT_REFRESH++;
1150};
1151
954 CFClient::SDL_GL_SwapBuffers; 1152 CFClient::SDL_GL_SwapBuffers;
955
956 $LAST_REFRESH = $NOW;
957} 1153}
958 1154
959my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1155my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
960 $NOW = time; 1156 $NOW = time;
961 1157
962 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1158 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
963 for CFClient::SDL_PollEvent; 1159 for CFClient::SDL_PollEvent;
964 1160
965 if (%animate_object) { 1161 if (%animate_object) {
966 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1162 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
967 $want_refresh++; 1163 $WANT_REFRESH++;
968 } 1164 }
969 1165
970 if ($want_refresh) { 1166 if ($WANT_REFRESH) {
971 force_refresh; 1167 force_refresh;
972 } else { 1168 } else {
973 $can_refresh = 1; 1169 $CAN_REFRESH = 1;
974 } 1170 }
975}); 1171});
976
977sub refresh {
978 $want_refresh++;
979}
980 1172
981sub animation_start { 1173sub animation_start {
982 my ($widget) = @_; 1174 my ($widget) = @_;
983 $animate_object{$widget} = $widget; 1175 $animate_object{$widget} = $widget;
984} 1176}
988 delete $animate_object{$widget}; 1180 delete $animate_object{$widget};
989} 1181}
990 1182
991@conn::ISA = Crossfire::Protocol::; 1183@conn::ISA = Crossfire::Protocol::;
992 1184
1185sub conn::new {
1186 my $class = shift;
1187
1188 my $self = $class->Crossfire::Protocol::new (@_);
1189
1190 $MAPWIDGET->clr_commands;
1191
1192 my $parser = new Pod::POM;
1193 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1194
1195 for my $head2 ($pod->head2) {
1196 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1197 or next;
1198
1199 my $cmd = $1;
1200 my @args = split /\|/, $2;
1201 @args = (".*") unless @args;
1202
1203 my $text = CFClient::pod_to_pango $head2->content;
1204
1205 for my $arg (@args) {
1206 $arg = $arg eq ".*" ? "" : " $arg";
1207
1208 $MAPWIDGET->add_command ("$cmd$arg", $text);
1209 }
1210 }
1211
1212 $self->{noface} = new_from_file CFClient::Texture
1213 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
1214
1215 $self
1216}
1217
993sub conn::stats_update { 1218sub conn::stats_update {
994 my ($self, $stats) = @_; 1219 my ($self, $stats) = @_;
1220
1221 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1222 my $diff = $exp - $self->{prev_exp};
1223 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1224 if exists $self->{prev_exp} && $diff;
1225 $self->{prev_exp} = $exp;
1226 }
995 1227
996 update_stats_window ($stats); 1228 update_stats_window ($stats);
997} 1229}
998 1230
999sub conn::user_send { 1231sub conn::user_send {
1054 $self->set_texture ($id => $data); 1286 $self->set_texture ($id => $data);
1055 } 1287 }
1056 } 1288 }
1057} 1289}
1058 1290
1291# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1292# (server resource,s latency, bandwidth), so this hack is warranted.
1293# the right fix is to make real tiled maps with an overview file
1294sub conn::send_mapinfo {
1295 my ($self, $data, $cb) = @_;
1296
1297 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1298 my ($wx, $wy) = ($1, $2);
1299
1300 if ($data =~ /^spatial ([1-4]+)$/) {
1301 my @dx = (0, 0, 1, 0, -1);
1302 my @dy = (0, -1, 0, 1, 0);
1303 my ($dx, $dy);
1304
1305 for (split //, $1) {
1306 $dx += $dx[$_];
1307 $dy += $dy[$_];
1308 }
1309
1310 $cb->(spatial => 15,
1311 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1312 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1313 50, 50,
1314 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1315 );
1316
1317 return;
1318 }
1319 }
1320
1321 $self->SUPER::send_mapinfo ($data, $cb);
1322}
1323
1059# this method does a "flood fill" into every tile direction 1324# this method does a "flood fill" into every tile direction
1060# it assumes that tiles are arranged in a rectangular grid, 1325# it assumes that tiles are arranged in a rectangular grid,
1061# i.e. a map is the same as the left of the right map etc. 1326# i.e. a map is the same as the left of the right map etc.
1062# failure to comply are harmless and result in display errors 1327# failure to comply are harmless and result in display errors
1063# at worst. 1328# at worst.
1064sub conn::flood_fill { 1329sub conn::flood_fill {
1065 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1330 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1066 1331
1067 # the server does not allow map paths > 6 1332 # the server does not allow map paths > 6
1068 return if 7 <= length $path; 1333 return if 7 <= length $path;
1069 1334
1070 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1335 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1071 1336
1072 for ( 1337 for (
1073 [1, 0, -1], 1338 [1, 3, 0, -1],
1074 [2, 1, 0], 1339 [2, 4, 1, 0],
1075 [3, 0, 1], 1340 [3, 1, 0, 1],
1076 [4, -1, 0], 1341 [4, 2, -1, 0],
1077 ) { 1342 ) {
1078 my ($tile, $dx, $dy) = @$_; 1343 my ($tile, $tile2, $dx, $dy) = @$_;
1344
1345 next if $block & (1 << $tile);
1346 my $block = $block | (1 << $tile2);
1079 1347
1080 my $gx = $gx + $dx; 1348 my $gx = $gx + $dx;
1081 my $gy = $gy + $dy; 1349 my $gy = $gy + $dy;
1082 1350
1083 next unless $flags & (1 << ($tile - 1)); 1351 next unless $flags & (1 << ($tile - 1));
1085 1353
1086 my $neigh = $self->{neigh_map}{$hash} ||= []; 1354 my $neigh = $self->{neigh_map}{$hash} ||= [];
1087 if (my $info = $neigh->[$tile]) { 1355 if (my $info = $neigh->[$tile]) {
1088 my ($flags, $x, $y, $w, $h, $hash) = @$info; 1356 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1089 1357
1090 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1358 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1091 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1359 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1092 1360
1093 } else { 1361 } else {
1094 $self->send_mapinfo ("spatial $path$tile", sub { 1362 $self->send_mapinfo ("spatial $path$tile", sub {
1095 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1363 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1096 1364
1097 return if $mode ne "spatial"; 1365 return if $mode ne "spatial";
1098 1366
1099 $x += $MAP->ox; 1367 $x += $MAP->ox;
1100 $y += $MAP->oy; 1368 $y += $MAP->oy;
1101 1369
1102 $self->load_map ($hash, $x, $y) 1370 $self->load_map ($hash, $x, $y)
1103 unless $self->{neigh_map}{$hash}[5]++;#d# 1371 unless $self->{neigh_map}{$hash}[5]++;#d#
1104 1372
1105 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 1373 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1106 1374
1107 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1375 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1108 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1376 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1109 }); 1377 });
1110 } 1378 }
1111 } 1379 }
1112} 1380}
1125 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1393 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1126 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1394 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1127 ]; 1395 ];
1128 1396
1129 delete $self->{neigh_grid}; 1397 delete $self->{neigh_grid};
1130 $self->flood_fill (0, 0, "", $hash, $flags);
1131 1398
1132 $x += $ox; 1399 $x += $ox;
1133 $y += $oy; 1400 $y += $oy;
1134 1401
1135 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1402 $self->{map_info} = [$hash, $x, $y, $w, $h];
1136 1403
1137 my $map = $self->{map_info}[0];
1138 $map =~ s/^.*?\/([^\/]+)$/\1/; 1404 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1139 $STATWIDS->{map}->set_text ("Map: " . $map); 1405 $STATWIDS->{map}->set_text ("Map: " . $map);
1140 1406
1141 $self->load_map ($hash, $x, $y); 1407 $self->load_map ($hash, $x, $y);
1408 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1142} 1409}
1143 1410
1144sub conn::face_find { 1411sub conn::face_find {
1145 my ($self, $facenum, $face) = @_; 1412 my ($self, $facenum, $face) = @_;
1146 1413
1148 1415
1149 my $id = $FACEMAP->get ($hash); 1416 my $id = $FACEMAP->get ($hash);
1150 1417
1151 unless ($id) { 1418 unless ($id) {
1152 # create new id for face 1419 # create new id for face
1153 # i love transactions 1420 # I love transactions
1154 for (1..100) { 1421 for (1..100) {
1155 my $txn = $CFClient::DB_ENV->txn_begin; 1422 my $txn = $CFClient::DB_ENV->txn_begin;
1156 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW); 1423 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
1157 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 1424 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
1158 $id++; 1425 $id = ($id || 16) + 1;
1159 if ($FACEMAP->put (id => $id) == 0 1426 if ($FACEMAP->put (id => $id) == 0
1160 && $FACEMAP->put ($hash => $id) == 0) { 1427 && $FACEMAP->put ($hash => $id) == 0) {
1161 $txn->txn_commit; 1428 $txn->txn_commit;
1162 1429
1163 goto gotid; 1430 goto gotid;
1171 1438
1172gotid: 1439gotid:
1173 $face->{id} = $id; 1440 $face->{id} = $id;
1174 $MAP->set_face ($facenum => $id); 1441 $MAP->set_face ($facenum => $id);
1175 $self->{faceid}[$facenum] = $id;#d# 1442 $self->{faceid}[$facenum] = $id;#d#
1443
1176 $TILECACHE->get ($id) 1444 $TILECACHE->get ($id) || do {
1445 my $tex = $self->{noface};
1446 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1447 undef
1448 };
1177} 1449}
1178 1450
1179sub conn::face_update { 1451sub conn::face_update {
1180 my ($self, $facenum, $face) = @_; 1452 my ($self, $facenum, $face) = @_;
1181 1453
1274 ); 1546 );
1275 1547
1276 $entry->focus_in; 1548 $entry->focus_in;
1277 } 1549 }
1278 1550
1279 $dialog->show; 1551 $dialog->show_centered;
1280} 1552}
1281 1553
1282sub conn::drawinfo { 1554sub conn::drawinfo {
1283 my ($self, $color, $text) = @_; 1555 my ($self, $color, $text) = @_;
1284 1556
1296 [0.55, 0.41, 0.13], 1568 [0.55, 0.41, 0.13],
1297 [0.99, 0.77, 0.26], 1569 [0.99, 0.77, 0.26],
1298 [0.74, 0.65, 0.41], 1570 [0.74, 0.65, 0.41],
1299 ); 1571 );
1300 1572
1573 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1574
1575 $text = CFClient::UI::Label::escape $text;
1576 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1577 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1578
1301 $LOGVIEW->add_paragraph ($color[$color], $text); 1579 $LOGVIEW->add_paragraph ($color[$color],
1580 join "\n", map "$time $_", split /\n/, $text);
1581
1582 $STATUSBOX->add ($text,
1583 group => $text,
1584 fg => $color[$color],
1585 timeout => 60,
1586 tooltip_font => $::FONT_FIXED,
1587 );
1588}
1589
1590sub conn::drawextinfo {
1591 my ($self, $color, $type, $subtype, $message) = @_;
1592
1593 $self->drawinfo ($color, $message);
1302} 1594}
1303 1595
1304sub conn::spell_add { 1596sub conn::spell_add {
1305 my ($self, $spell) = @_; 1597 my ($self, $spell) = @_;
1306 1598
1307 # TODO 1599 # TODO
1308 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1600 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1309 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1601 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1310 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1602 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1311} 1603}
1312 1604
1313sub conn::spell_delete { 1605sub conn::spell_delete {
1314 my ($self, $spell) = @_; 1606 my ($self, $spell) = @_;
1315} 1607}
1316 1608
1317sub conn::addme_success { 1609sub conn::addme_success {
1318 my ($self) = @_; 1610 my ($self) = @_;
1319 1611
1612 $self->send ("command output-sync $CFG->{output_sync}");
1613 $self->send ("command output-count $CFG->{output_count}");
1614
1615 my $parser = new Pod::POM;
1616 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1617
1618 my %skill_tooltip;
1619
1620 for my $head2 ($pod->head2) {
1621 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1622 }
1623
1320 for my $skill (values %{$self->{skill_info}}) { 1624 for my $skill (values %{$self->{skill_info}}) {
1321 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1625 $MAPWIDGET->add_command ("ready_skill $skill",
1322 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1626 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1627 . $skill_tooltip{$skill});
1628 $MAPWIDGET->add_command ("use_skill $skill",
1629 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1630 . $skill_tooltip{$skill});
1323 } 1631 }
1632}
1633
1634sub conn::eof {
1635 $MAPWIDGET->clr_commands;
1636
1637 stop_game;
1324} 1638}
1325 1639
1326sub update_floorbox { 1640sub update_floorbox {
1327 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1641 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1642 return unless $CONN;
1643
1328 $FLOORBOX->clear; 1644 $FLOORBOX->clear;
1329 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1645 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1330 1646
1331 # we basically have to use the same sorting as everybody else 1647 my $count = 4;
1332 for my $item (@{ $CONN->{container}{0} }) { 1648 for (@{ $CONN->{container}{0} }) {
1333 my $desc = $item->{nrof} < 2 1649 if (--$count) {
1334 ? $item->{name} 1650 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1335 : "$item->{nrof} $item->{name_pl}"; 1651 } else {
1336 # todo: animation widget, face widget, weight(?) etc. 1652 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1337 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1338 tooltip => (CFClient::UI::Label->escape ($desc)
1339 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1340 can_hover => 1,
1341 can_events => 1,
1342 connect_button_down => sub {
1343 my ($self, $ev, $x, $y) = @_;
1344
1345 # todo: maybe put examine on 1? but should just be a tooltip :(
1346 if ($ev->{button} == 1) {
1347 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1348 } elsif ($ev->{button} == 2) {
1349 $CONN->send ("apply $item->{tag}");
1350 } elsif ($ev->{button} == 3) {
1351 CFClient::UI::Menu->new (
1352 items => [
1353 ["examine", sub { $CONN->send ("examine $item->{tag}") }],
1354 [
1355 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
1356 sub { $CONN->send ("lock $item->{tag}") },
1357 ],
1358 ["mark", sub { $CONN->send ("mark $item->{tag}") }],
1359 ["apply", sub { $CONN->send ("apply $item->{tag}") }],
1360 ],
1361 )->popup ($ev);
1362 }
1363
1364 1
1365 }, 1653 last;
1366 );
1367
1368 $hbox->add (new CFClient::UI::Face
1369 can_events => 0,
1370 face => $item->{face},
1371 anim => $item->{anim},
1372 animspeed => $item->{animspeed},
1373 );
1374 1654 }
1375 $hbox->add (new CFClient::UI::Label
1376 can_events => 0,
1377 text => $desc,
1378 );
1379 } 1655 }
1380 }); 1656 });
1381 refresh; 1657
1658 $WANT_REFRESH++;
1382} 1659}
1383 1660
1384sub conn::container_add { 1661sub conn::container_add {
1385 my ($self, $id, $items) = @_; 1662 my ($self, $tag, $items) = @_;
1386 1663
1387 update_floorbox if $id == 0; 1664 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1665
1666 if ($tag == 0) {
1667 update_floorbox;
1668 $OPENCONT = 0;
1669 $INVR_LBL->set_text ("Floor");
1670 $INVR->set_items ($self->{container}{0});
1388 if ($self->{player}{tag} == $id) { 1671 } elsif ($tag == $self->{player}{tag}) {
1672 $INVR_LBL->set_text ("Player");
1389 $INV->set_items ($self->{container}{$self->{player}{tag}}); 1673 $INV->set_items ($self->{container}{$self->{player}{tag}})
1674 } else {
1675 $OPENCONT = $tag;
1676 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1677 $INVR->set_items ($self->{container}{$tag});
1390 } 1678 }
1679
1391 # $self-<{player}{tag} => player inv 1680 # $self-<{player}{tag} => player inv
1392 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1681 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1393} 1682}
1394 1683
1395sub conn::container_clear { 1684sub conn::container_clear {
1396 my ($self, $id) = @_; 1685 my ($self, $tag) = @_;
1397 1686
1398 update_floorbox if $id == 0; 1687 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1399 if ($self->{player}{tag} == $id) { 1688
1689 if ($tag == 0) {
1690 update_floorbox;
1691 $OPENCONT = 0;
1692 $INVR_LBL->set_text ("Floor");
1400 $INV->set_items ($self->{container}{$id}); 1693 $INVR->set_items ($self->{container}{0});
1694 } elsif ($tag == $self->{player}{tag}) {
1695 $INVR_LBL->set_text ("Player");
1696 $INV->set_items ($self->{container}{$tag})
1697 } else {
1698 $OPENCONT = $tag;
1699 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1700 $INVR->set_items ($self->{container}{$tag});
1401 } 1701 }
1402 1702
1403# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1703# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1404} 1704}
1405 1705
1406sub conn::item_delete { 1706sub conn::item_delete {
1407 my ($self, @items) = @_; 1707 my ($self, @items) = @_;
1408 1708
1409 for (@items) { 1709 for (@items) {
1410 update_floorbox if $_->{container} == 0; 1710 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1411 if ($self->{player}{tag} == $_->{container}) { 1711
1712 if ($_->{container} == 0) {
1713 update_floorbox;
1714 $OPENCONT = 0;
1715 $INVR_LBL->set_text ("Floor");
1716 $INVR->set_items ($self->{container}{0});
1717 } elsif ($_->{container} == $self->{player}{tag}) {
1718 $INVR_LBL->set_text ("Player");
1719 $INV->set_items ($self->{container}{$self->{player}{tag}})
1720 } else {
1721 $OPENCONT = $_->{container};
1722 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1412 $INV->set_items ($self->{container}{$_->{container}}); 1723 $INVR->set_items ($self->{container}{$_->{container}});
1413 } 1724 }
1414 } 1725 }
1415} 1726}
1416 1727
1417sub conn::item_update { 1728sub conn::item_update {
1418 my ($self, $item) = @_; 1729 my ($self, $item) = @_;
1419 1730
1420 update_floorbox if $item->{container} == 0; 1731 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1421 if ($self->{player}{tag} == $item->{container}) { 1732
1733 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1734 $OPENCONT = 0;
1735 $INVR_LBL->set_text ("Floor");
1736 $INVR->set_items ($self->{container}{0});
1737
1738 $item->{widget}->update_item
1739 if $item->{widget};
1740 } else {
1741 if ($item->{container} == 0) {
1742 update_floorbox;
1743 $OPENCONT = 0;
1744 $INVR_LBL->set_text ("Floor");
1745 $INVR->set_items ($self->{container}{0});
1746 } elsif ($item->{container} == $self->{player}{tag}) {
1422 $INV->set_items ($self->{container}{$item->{container}}); 1747 $INV->set_items ($self->{container}{$item->{container}})
1748 }
1423 } 1749 }
1424} 1750}
1425 1751
1426%SDL_CB = ( 1752%SDL_CB = (
1427 CFClient::SDL_QUIT => sub { 1753 CFClient::SDL_QUIT => sub {
1428 Event::unloop -1; 1754 Event::unloop -1;
1429 }, 1755 },
1430 CFClient::SDL_VIDEORESIZE => sub { 1756 CFClient::SDL_VIDEORESIZE => sub {
1431 }, 1757 },
1432 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1758 CFClient::SDL_VIDEOEXPOSE => sub {
1759 CFClient::UI::full_refresh;
1760 },
1433 CFClient::SDL_ACTIVEEVENT => sub { 1761 CFClient::SDL_ACTIVEEVENT => sub {
1434# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1762# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1435 }, 1763 },
1436 CFClient::SDL_KEYDOWN => sub { 1764 CFClient::SDL_KEYDOWN => sub {
1437 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1765 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1441 video_init; 1769 video_init;
1442 } else { 1770 } else {
1443 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1771 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1444 } 1772 }
1445 }, 1773 },
1446 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1774 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1447 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1775 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1448 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1776 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1449 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1777 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1450 CFClient::SDL_USEREVENT => \&audio_music_finished, 1778 CFClient::SDL_USEREVENT => sub {
1779 if ($_[0]{code} == 1) {
1780 audio_channel_finished $_[0]{data1};
1781 } elsif ($_[0]{code} == 0) {
1782 audio_music_finished;
1783 }
1784 },
1451); 1785);
1452 1786
1453############################################################################# 1787#############################################################################
1454 1788
1455$SIG{INT} = $SIG{TERM} = sub { exit }; 1789$SIG{INT} = $SIG{TERM} = sub { exit };
1456 1790
1457CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1458
1459$TILECACHE = CFClient::db_table "tilecache";
1460$FACEMAP = CFClient::db_table "facemap";
1461
1462my %DEF_CFG = (
1463 sdl_mode => 0,
1464 width => 640,
1465 height => 480,
1466 fullscreen => 0,
1467 fast => 0,
1468 map_scale => 0.5,
1469 fow_enable => 1,
1470 fow_intensity => 0.45,
1471 fow_smooth => 0,
1472 gui_fontsize => 1,
1473 log_fontsize => 1,
1474 gauge_fontsize => 1,
1475 gauge_size => 0.35,
1476 stat_fontsize => 1,
1477 mapsize => 100,
1478 host => "crossfire.schmorp.de",
1479 say_command => 'say',
1480 audio_enable => 1,
1481 bgm_enable => 1,
1482 bgm_volume => 0.25,
1483);
1484
1485while (my ($k, $v) = each %DEF_CFG) {
1486 $CFG->{$k} = $v unless exists $CFG->{$k};
1487}
1488
1489sdl_init;
1490
1491@SDL_MODES = reverse
1492 grep $_->[0] >= 640 && $_->[1] >= 480,
1493 CFClient::SDL_ListModes;
1494
1495@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1496
1497$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1498
1499{ 1791{
1792 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1793
1794 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1795
1796 $TILECACHE = CFClient::db_table "tilecache";
1797 $FACEMAP = CFClient::db_table "facemap";
1798
1799 my %DEF_CFG = (
1800 sdl_mode => 0,
1801 width => 640,
1802 height => 480,
1803 fullscreen => 0,
1804 fast => 0,
1805 map_scale => 1,
1806 fow_enable => 1,
1807 fow_intensity => 0.45,
1808 fow_smooth => 0,
1809 gui_fontsize => 1,
1810 log_fontsize => 1,
1811 gauge_fontsize=> 1,
1812 gauge_size => 0.35,
1813 stat_fontsize => 1,
1814 mapsize => 100,
1815 host => "crossfire.schmorp.de",
1816 say_command => 'say',
1817 audio_enable => 1,
1818 bgm_enable => 1,
1819 bgm_volume => 0.25,
1820 output_sync => 1,
1821 output_count => 1,
1822 );
1823
1824 while (my ($k, $v) = each %DEF_CFG) {
1825 $CFG->{$k} = $v unless exists $CFG->{$k};
1826 }
1827
1828 sdl_init;
1829
1830 @SDL_MODES = reverse
1831 grep $_->[0] >= 640 && $_->[1] >= 480,
1832 CFClient::SDL_ListModes;
1833
1834 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1835
1836 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1837
1838 {
1500 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1839 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1501 DejaVuSans.ttf 1840 DejaVuSans.ttf
1502 DejaVuSansMono.ttf 1841 DejaVuSansMono.ttf
1503 DejaVuSans-Bold.ttf 1842 DejaVuSans-Bold.ttf
1504 DejaVuSansMono-Bold.ttf 1843 DejaVuSansMono-Bold.ttf
1505 DejaVuSans-Oblique.ttf 1844 DejaVuSans-Oblique.ttf
1506 DejaVuSansMono-Oblique.ttf 1845 DejaVuSansMono-Oblique.ttf
1507 DejaVuSans-BoldOblique.ttf 1846 DejaVuSans-BoldOblique.ttf
1508 DejaVuSansMono-BoldOblique.ttf 1847 DejaVuSansMono-BoldOblique.ttf
1509 ); 1848 );
1510 1849
1511 CFClient::add_font $_ for @fonts; 1850 CFClient::add_font $_ for @fonts;
1512 1851
1852 CFClient::pango_init;
1853
1513 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1854 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1514 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1855 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1515 1856
1516 $FONT_PROP->make_default; 1857 $FONT_PROP->make_default;
1517} 1858 }
1518 1859
1860# compare mono (ft) vs. rgba (cairo)
1861# ft - 1.8s, cairo 3s, even in alpha-only mode
1862# for my $rgba (0..1) {
1863# my $t1 = Time::HiRes::time;
1864# for (1..1000) {
1865# my $layout = CFClient::Layout->new ($rgba);
1866# $layout->set_text ("hallo" x 100);
1867# $layout->render;
1868# }
1869# my $t2 = Time::HiRes::time;
1870# warn $t2-$t1;
1871# }
1872
1519video_init; 1873 video_init;
1520audio_init; 1874 audio_init;
1875}
1521 1876
1522Event::loop; 1877Event::loop;
1523 1878
1524END { CFClient::SDL_Quit } 1879END { CFClient::SDL_Quit }
1525 1880
1576 1931
1577Typing B<climb> will display a list of commands with I<climb> in their 1932Typing B<climb> will display a list of commands with I<climb> in their
1578name, such as I<ready_skill climbing> and I<use_skill climbing>. 1933name, such as I<ready_skill climbing> and I<use_skill climbing>.
1579 1934
1580You can abbreviate commands by typing only the first character of every 1935You can abbreviate commands by typing only the first character of every
1581word. For example, typing I<iwor> will likely select I<invoke word of 1936word (or even characters within the word - the client will try to make
1582recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli> 1937a good guess, as long as the characters are in order). For example,
1583will likely select I<ready_skill climbing> and I<usl> will give you 1938typing I<iwor> will likely select I<invoke word of recall>, while I<ccfo>
1584I<use_skill levitation>. 1939will select I<cast create food>. Likewise, I<rscli> will likely select
1940I<ready_skill climbing> and I<usl> will give you I<use_skill levitation>.
1941
1942You can enter space and other text as arguemnt to the command. For
1943example, C<cfoo waybread> will expand to C<cast create food waybread>.
1585 1944
1586=head2 The map overview 1945=head2 The map overview
1587 1946
1588#TODO# 1947#TODO#
1589 1948

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines