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.181 by root, Tue Apr 25 10:39:45 2006 UTC vs.
Revision 1.225 by root, Wed May 17 16:17:01 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;
… …
70 75
71our $FONT_PROP; 76our $FONT_PROP;
72our $FONT_FIXED; 77our $FONT_FIXED;
73 78
74our $MAP; 79our $MAP;
80our $MAPMAP;
75our $MAPWIDGET; 81our $MAPWIDGET;
76our $BUTTONBAR; 82our $BUTTONBAR;
77our $LOGVIEW; 83our $LOGVIEW;
78our $CONSOLE; 84our $CONSOLE;
79our $METASERVER; 85our $METASERVER;
86our $LOGIN_BUTTON;
80 87
81our $FLOORBOX; 88our $FLOORBOX;
82our $GAUGES; 89our $GAUGES;
83our $STATWIDS; 90our $STATWIDS;
84 91
… …
88our $SDL_MIXER; 95our $SDL_MIXER;
89our @SOUNDS; # event => file mapping 96our @SOUNDS; # event => file mapping
90our %AUDIO_CHUNKS; # audio files 97our %AUDIO_CHUNKS; # audio files
91 98
92our $ALT_ENTER_MESSAGE; 99our $ALT_ENTER_MESSAGE;
93our $STATUS_LINE; 100our $STATUSBOX;
94our $DEBUG_STATUS; 101our $DEBUG_STATUS;
95 102
103our $INVWIN;
104our $INV;
105our $INVR;
106our $INVR_LBL;
107our $OPENCONT;
108
96sub status { 109sub status {
97 $STATUS_LINE->set_text ($_[0]); 110 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
98 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
99} 111}
100 112
101sub debug { 113sub debug {
102 $DEBUG_STATUS->set_text ($_[0]); 114 $DEBUG_STATUS->set_text ($_[0]);
103 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h}); 115 my ($w, $h) = $DEBUG_STATUS->size_request;
116 $DEBUG_STATUS->move ($WIDTH - $w, 0);
104} 117}
105 118
106sub start_game { 119sub start_game {
107 status "logging in..."; 120 status "logging in...";
108 121
109 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 122 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
110 123
111 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 124 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
112
113 $MAP = new CFClient::Map $mapsize, $mapsize; 125 $MAP = new CFClient::Map $mapsize, $mapsize;
114 126
115 my ($host, $port) = split /:/, $CFG->{host}; 127 my ($host, $port) = split /:/, $CFG->{host};
116 128
117 $CONN = new conn 129 $CONN = eval {
130 new conn
118 host => $host, 131 host => $host,
119 port => $port || 13327, 132 port => $port || 13327,
120 user => $CFG->{user}, 133 user => $CFG->{user},
121 pass => $CFG->{password}, 134 pass => $CFG->{password},
122 mapw => $mapsize, 135 mapw => $mapsize,
123 maph => $mapsize, 136 maph => $mapsize,
137 ;
124 ; 138 };
125 139
126 status "login successful"; 140 if ($CONN) {
127
128 CFClient::lowdelay fileno $CONN->{fh}; 141 CFClient::lowdelay fileno $CONN->{fh};
142
143 $LOGIN_BUTTON->set_text ("Logout");
144 status "login successful";
145
146 $BUTTONBAR->{children}[1]->emit ("activate")
147 if $BUTTONBAR->{children}[1]->{state};
148
149 } else {
150 status "unable to connect";
151 stop_game();
152 }
129} 153}
130 154
131sub stop_game { 155sub stop_game {
156 return unless $CONN;
157
158 status "connection closed";
159 $LOGIN_BUTTON->set_text ("Login");
160 $CONN->destroy;
161 $CONN = 0; # false, does not autovivify
162
163 $BUTTONBAR->{children}[1]->emit ("activate")
164 unless $BUTTONBAR->{children}[1]->{state};
165
166 undef $MAPCACHE;
132 undef $CONN; 167 undef $MAP;
133} 168}
134 169
135sub client_setup { 170sub client_setup {
136 my $dialog = new CFClient::UI::FancyFrame 171 my $dialog = new CFClient::UI::FancyFrame
137 title => "Client Setup", 172 title => "Client Setup",
… …
139 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 174 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
140 175
141 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 176 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
142 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 177 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
143 178
144 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 179 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
145 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 180 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
146 181
147 $mode_slider->connect (changed => sub { 182 $mode_slider->connect (changed => sub {
148 my ($self, $value) = @_; 183 my ($self, $value) = @_;
149 184
… …
174 } 209 }
175 ); 210 );
176 211
177 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 212 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
178 $table->add (1, $row++, new CFClient::UI::Slider 213 $table->add (1, $row++, new CFClient::UI::Slider
179 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 214 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05],
180 tooltip => "Enlarge or shrink the displayed map", 215 tooltip => "Enlarge or shrink the displayed map",
181 connect_changed => sub { 216 connect_changed => sub {
182 my ($self, $value) = @_; 217 my ($self, $value) = @_;
183 $CFG->{map_scale} = 0.05 * int $value / 0.05; 218 $CFG->{map_scale} = $value;
184 } 219 }
185 ); 220 );
186 221
187 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 222 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
188 $table->add (1, $row++, new CFClient::UI::CheckBox 223 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
215 } 250 }
216 ); 251 );
217 252
218 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 253 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
219 $table->add (1, $row++, new CFClient::UI::Slider 254 $table->add (1, $row++, new CFClient::UI::Slider
220 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 255 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
221 tooltip => "The font size used by most GUI elements", 256 tooltip => "The font size used by most GUI elements",
222 connect_changed => sub { 257 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
223 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
224# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
225 }
226 ); 258 );
227 259
228 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); 260 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
229 $table->add (1, $row++, new CFClient::UI::Slider 261 $table->add (1, $row++, new CFClient::UI::Slider
230 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 262 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
231 tooltip => "The font size used by the server log window only", 263 tooltip => "The font size used by the server log window only",
232 connect_changed => sub { 264 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
233 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
234 }
235 ); 265 );
236 266
237 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 267 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
238 268
239 $table->add (1, $row++, new CFClient::UI::Slider 269 $table->add (1, $row++, new CFClient::UI::Slider
240 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 270 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
241 tooltip => "The font size used by the statistics window only", 271 tooltip => "The font size used by the statistics window only",
242 connect_changed => sub { 272 connect_changed => sub {
243 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 273 $CFG->{stat_fontsize} = $_[1];
244 &set_stats_window_fontsize; 274 &set_stats_window_fontsize;
245 } 275 }
246 ); 276 );
247 277
248 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 278 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
249 $table->add (1, $row++, new CFClient::UI::Slider 279 $table->add (1, $row++, new CFClient::UI::Slider
250 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 280 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
251 tooltip => "Adjust the size of the stats gauges at the bottom right", 281 tooltip => "Adjust the size of the stats gauges at the bottom right",
252 connect_changed => sub { 282 connect_changed => sub {
253 $CFG->{gauge_size} = $_[1]; 283 $CFG->{gauge_size} = $_[1];
254 my $h = int $HEIGHT * $CFG->{gauge_size}; 284 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
255 $GAUGES->{win}->set_size ($WIDTH, $h);
256 $GAUGES->{win}->move (0, $HEIGHT - $h);
257 } 285 }
258 ); 286 );
259 287
260 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 288 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
261 $table->add (1, $row++, new CFClient::UI::Slider 289 $table->add (1, $row++, new CFClient::UI::Slider
262 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 290 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
263 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 291 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
264 connect_changed => sub { 292 connect_changed => sub {
265 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 293 $CFG->{gauge_fontsize} = $_[1];
266 &set_gauge_window_fontsize; 294 &set_gauge_window_fontsize;
267 } 295 }
268 ); 296 );
269 297
270 $table->add (1, $row++, new CFClient::UI::Button 298 $table->add (1, $row++, new CFClient::UI::Button
… …
313 audio_shutdown (); 341 audio_shutdown ();
314 audio_init (); 342 audio_init ();
315 } 343 }
316 ); 344 );
317 345
346 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Communication cmd");
347 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
348 text => $CFG->{say_command},
349 tooltip => "This is the command that will be used if you write a line in the message window entry. "
350 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
351 ."But you could also set it to 'tell <playername>' to only chat with that user.",
352 connect_changed => sub {
353 my ($self, $value) = @_;
354 $CFG->{say_command} = $value;
355 }
356 );
357
318 $dialog 358 $dialog
319} 359}
320 360
321sub set_stats_window_fontsize { 361sub set_stats_window_fontsize {
322 for (values %{$STATWIDS}) { 362 for (values %{$STATWIDS}) {
… …
332# local $GAUGES->{win}{parent};#d# 372# local $GAUGES->{win}{parent};#d#
333# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D; 373# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
334} 374}
335 375
336sub make_gauge_window { 376sub make_gauge_window {
337 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 377 my $gh = int $HEIGHT * $CFG->{gauge_size};
338# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
339 378
340 my $win = new CFClient::UI::Frame ( 379 my $win = new CFClient::UI::Frame (
341 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 380 req_y => -1,
381 user_w => $WIDTH,
382 user_h => $gh,
342 ); 383 );
384
343 $win->add (my $hbox = new CFClient::UI::HBox 385 $win->add (my $hbox = new CFClient::UI::HBox
344 children => [ 386 children => [
345 (new CFClient::UI::HBox expand => 1), 387 (new CFClient::UI::HBox expand => 1),
346 ($FLOORBOX = new CFClient::UI::VBox), 388 (new CFClient::UI::VBox children => [
389 (new CFClient::UI::Empty expand => 1),
390 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)),
391 ]),
347 (my $vbox = new CFClient::UI::VBox), 392 (my $vbox = new CFClient::UI::VBox),
348 ], 393 ],
349 ); 394 );
350 395
351 $vbox->add (new CFClient::UI::HBox 396 $vbox->add (new CFClient::UI::HBox
… …
364 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."); 409 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.");
365 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 410 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
366 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."); 411 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.");
367 412
368 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 413 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
369 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 dieing. 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."); 414 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.");
370 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 415 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
371 tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)"); 416 tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
372 417
373 $GAUGES = { 418 $GAUGES = {
374 exp => $exp, win => $win, range => $rng, 419 exp => $exp, win => $win, range => $rng,
… …
379 424
380 $win 425 $win
381} 426}
382 427
383sub make_stats_window { 428sub make_stats_window {
384 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats"); 429 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats";
385 430
386 $tgw->add (my $vb = new CFClient::UI::VBox); 431 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
387 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1); 432 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
388 $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);
389 434
390 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 435 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
391 436
… …
410 [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."], 455 [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."],
411 ) { 456 ) {
412 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 457 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
413 458
414 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 459 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
415 can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 460 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
416 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 461 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
417 can_hover => 1, can_events => 1, fg => $black, valign => 0, align => -1, text => $label, tooltip => $tooltip); 462 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $black, valign => 0, align => -1, text => $label, tooltip => $tooltip);
418 } 463 }
419 464
420 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 465 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
421 466
422 my $row = 0; 467 my $row = 0;
423 my $col = 0; 468 my $col = 0;
424 469
425 my %resist_names = ( 470 my %resist_names = (
426 slow => "Slow", 471 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.)",
427 holyw => "Holy Word", 472 holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",
428 conf => "Confusion", 473 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)",
429 fire => "Fire", 474 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
430 depl => "Depletion (some monsters and other effects can cause stats depletion)", 475 depl => "Depletion (some monsters and other effects can cause stats depletion)",
431 magic => "Magic", 476 magic => "Magic (resistance to magic spells like magic missile or similar)",
432 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)", 477 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)",
433 acid => "Acid", 478 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
434 pois => "Poison", 479 pois => "Poison (resistance to getting poisoned)",
435 para => "Paralysation", 480 para => "Paralysation (this resistance affects the chance you get paralysed)",
436 deat => "Death (resistance against death spells)", 481 deat => "Death (resistance against death spells)",
437 phys => "Physical", 482 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
438 blind => "Blind", 483 blind => "Blind (blind resistance affects the chance of a successful blinding attack)",
439 fear => "Fear", 484 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)",
440 tund => "Turn undead", 485 tund => "Turn undead",
441 elec => "Electricity", 486 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)",
442 cold => "Cold", 487 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)",
443 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)", 488 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)",
444 ); 489 );
445 for (qw/slow holyw conf fire depl magic 490 for (qw/slow holyw conf fire depl magic
446 drain acid pois para deat phys 491 drain acid pois para deat phys
447 blind fear tund elec cold ghit/) 492 blind fear tund elec cold ghit/)
448 { 493 {
449 $tbl2->add ($col, $row, 494 $tbl2->add ($col, $row,
450 $STATWIDS->{"res_$_"} = 495 $STATWIDS->{"res_$_"} =
451 new CFClient::UI::Label 496 new CFClient::UI::Label
497 font => $FONT_FIXED,
452 template => "-100%", 498 template => "-100%",
453 align => +1, 499 align => +1,
454 valign => 0, 500 valign => 0,
455 can_events => 1, 501 can_events => 1,
456 can_hover => 1, 502 can_hover => 1,
457 tooltip => $resist_names{$_}, 503 tooltip => $resist_names{$_},
458 ); 504 );
459 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 505 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
506 font => $FONT_FIXED,
460 can_hover => 1, 507 can_hover => 1,
461 can_events => 1, 508 can_events => 1,
462 image => "ui/resist/resist_$_.png", 509 image => "ui/resist/resist_$_.png",
463 tooltip => $resist_names{$_}, 510 tooltip => $resist_names{$_},
464 ); 511 );
… …
547 594
548} 595}
549 596
550sub metaserver_dialog { 597sub metaserver_dialog {
551 my $dialog = new CFClient::UI::FancyFrame 598 my $dialog = new CFClient::UI::FancyFrame
552 title => "Metaserver", 599 title => "Server List",
553 child => (my $vbox = new CFClient::UI::VBox); 600 child => (my $vbox = new CFClient::UI::VBox);
554 601
555 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 602 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
556 603
557 $dialog 604 $dialog
… …
626 $HOST->set_text ($CFG->{host} = $host); 673 $HOST->set_text ($CFG->{host} = $host);
627 }), 674 }),
628 (new CFClient::UI::Empty expand => 1), 675 (new CFClient::UI::Empty expand => 1),
629 ]); 676 ]);
630 677
631 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8) 678 $table->add ($_ + 1, $y, new CFClient::UI::Label
679 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)
632 for 0 .. $#$m; 680 for 0 .. $#$m;
633 } 681 }
634 } 682 }
635 }); 683 });
636} 684}
… …
659 707
660 $METASERVER = metaserver_dialog; 708 $METASERVER = metaserver_dialog;
661 709
662 $vbox->add (new CFClient::UI::Flopper 710 $vbox->add (new CFClient::UI::Flopper
663 expand => 1, 711 expand => 1,
664 text => "Metaserver", 712 text => "Server List",
665 other => $METASERVER, 713 other => $METASERVER,
666 tooltip => "Show a list of avaible crossfire servers", 714 tooltip => "Show a list of available crossfire servers",
667 connect_open => sub { 715 connect_open => sub {
668 update_metaserver $HOST; 716 update_metaserver $HOST;
669 } 717 }
670 ); 718 );
671 } 719 }
… …
689 my ($self, $value) = @_; 737 my ($self, $value) = @_;
690 $CFG->{password} = $value; 738 $CFG->{password} = $value;
691 } 739 }
692 ); 740 );
693 741
694 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
695 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
696 text => $CFG->{say_command},
697 tooltip => "This is the command that will be used if you write a line in the message window entry. "
698 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
699 ."But you could also set it to 'tell <playername>' to only chat with that user.",
700 connect_changed => sub {
701 my ($self, $value) = @_;
702 $CFG->{say_command} = $value;
703 }
704 );
705
706 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 742 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
707 $table->add (1, 7, new CFClient::UI::Slider 743 $table->add (1, 7, new CFClient::UI::Slider
708 req_w => 100, 744 req_w => 100,
709 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 745 range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1],
710 tooltip => "This is the size of the portion of the map update the server sends you. " 746 tooltip => "This is the size of the portion of the map update the server sends you. "
711 ."If you set this to a high value you will be able to see further for example.", 747 ."If you set this to a high value you will be able to see further for example.",
712 connect_changed => sub { 748 connect_changed => sub {
713 my ($self, $value) = @_; 749 my ($self, $value) = @_;
714 750
715 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 751 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
716 }, 752 },
717 ); 753 );
718 754
719 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 755 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button
756 expand => 1,
757 align => 0,
758 text => "Login",
759 connect_activate => sub {
760 $CONN ? stop_game
720 start_game; 761 : start_game;
762 },
721 }); 763 );
722 764
723 $dialog 765 $dialog
724} 766}
725 767
726sub message_window { 768sub message_window {
727 my $window = new CFClient::UI::FancyFrame 769 my $window = new CFClient::UI::FancyFrame
728 title => "Messages", 770 title => "Messages",
729 border_bg => [1, 1, 1, 0.5], 771 border_bg => [1, 1, 1, 1],
730 bg => [0.3, 0.3, 0.3, 0.8], 772 bg => [0, 0, 0, 0.5],
731 user_w => int $::WIDTH / 3, 773 user_w => int $::WIDTH / 3,
732 user_h => int $::HEIGHT / 5, 774 user_h => int $::HEIGHT / 5,
733 child => (my $vbox = new CFClient::UI::VBox); 775 child => (my $vbox = new CFClient::UI::VBox);
734 776
735 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 777 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
… …
775 }; 817 };
776 818
777 $window 819 $window
778} 820}
779 821
822sub make_inventory_window {
823 my $invwin = new CFClient::UI::FancyFrame
824 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory";
825
826 $invwin->add (my $hb = new CFClient::UI::HBox);
827
828 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
829 $vb1->add (my $lbl = new CFClient::UI::Label);
830 $lbl->set_text ("Player");
831 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
832
833 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
834 $vb2->add ($INVR_LBL = new CFClient::UI::Label);
835 $INVR_LBL->set_text ("Floor");
836 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
837
838 $invwin
839}
840
780sub sdl_init { 841sub sdl_init {
781 CFClient::SDL_Init 842 CFClient::SDL_Init
782 and die "SDL::Init failed!\n"; 843 and die "SDL::Init failed!\n";
783} 844}
784 845
785sub video_init { 846sub video_init {
786 sdl_init; 847 sdl_init;
787 848
849 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
850
788 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 851 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
789 $FULLSCREEN = $CFG->{fullscreen}; 852 $FULLSCREEN = $CFG->{fullscreen};
790 $FAST = $CFG->{fast}; 853 $FAST = $CFG->{fast};
791 854
792 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 855 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
793 or die "SDL_SetVideoMode failed!\n"; 856 or die "SDL_SetVideoMode failed!\n";
794 857
795 $SDL_ACTIVE = 1; 858 $SDL_ACTIVE = 1;
796
797 $LAST_REFRESH = time - 0.01; 859 $LAST_REFRESH = time - 0.01;
798 860
799 CFClient::gl_init; 861 CFClient::gl_init;
800 862
801 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 863 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
802 864
865 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
866
803 ############################################################################# 867 #############################################################################
804 868
869 unless ($DEBUG_STATUS) {
870 # create the widgets
871
805 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 872 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
806 $DEBUG_STATUS->show; 873 $DEBUG_STATUS->show;
807 874
808 $STATUS_LINE = new CFClient::UI::Label 875 $STATUSBOX = new CFClient::UI::Statusbox;
809 padding => 0, 876 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
810 y => $HEIGHT - $FONTSIZE * 1.8;
811 $STATUS_LINE->show;
812 877
813 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 878 (new CFClient::UI::Frame
814 padding => 0, 879 bg => [0, 0, 0, 0.4],
815 fontsize => 0.8, 880 req_y => -1,
816 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 881 child => $STATUSBOX,
817 $ALT_ENTER_MESSAGE->show; 882 )->show;
818 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
819 883
820 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget); 884 CFClient::UI::FancyFrame->new (
821 $MAPWIDGET->focus_in; 885 border_bg => [1, 1, 1, 192/255],
886 bg => [1, 1, 1, 0],
887 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
888 )->show;
889
890 $MAPWIDGET = new CFClient::MapWidget;
822 $MAPWIDGET->connect (activate_console => sub { 891 $MAPWIDGET->connect (activate_console => sub {
823 my ($mapwidget, $preset) = @_; 892 my ($mapwidget, $preset) = @_;
824 893
825 if ($CONSOLE) { 894 if ($CONSOLE) {
826 $CONSOLE->{input}->{auto_activated} = 1; 895 $CONSOLE->{input}->{auto_activated} = 1;
827 $CONSOLE->{input}->focus_in; 896 $CONSOLE->{input}->focus_in;
828 897
829 if ($preset && $CONSOLE->{input}->get_text eq '') { 898 if ($preset && $CONSOLE->{input}->get_text eq '') {
830 $CONSOLE->{input}->set_text ($preset); 899 $CONSOLE->{input}->set_text ($preset);
900 }
831 } 901 }
832 } 902 });
833 }); 903 $MAPWIDGET->show;
904 $MAPWIDGET->focus_in;
834 905
835 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 906 $BUTTONBAR = new CFClient::UI::HBox;
836 907
837 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 908 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
838 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 909 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
839 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 910 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
840 911
841 $CFClient::UI::ROOT->add (make_gauge_window); # 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 912 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
913
842 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 914 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
915 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
843 916
844 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 917 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
845 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 918 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
846 status "Configuration Saved"; 919 status "Configuration Saved";
847 }); 920 });
848 921
922 $BUTTONBAR->show;
923
924 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
925
926 # delay till geometry is constant
927 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
849 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 928 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
929 my $widget = $GAUGES->{win};
930 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
931 });
932 force_refresh ();
933 }
850} 934}
851 935
852sub video_shutdown { 936sub video_shutdown {
853 $CFClient::UI::ROOT->{children} = [];
854 undef $CFClient::UI::GRAB;
855 undef $CFClient::UI::HOVER;
856 undef $SDL_ACTIVE; 937 undef $SDL_ACTIVE;
857} 938}
858 939
859my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 940my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
860my $bgmusic;#TODO#hack#d# 941my $bgmusic;#TODO#hack#d#
942
943sub audio_channel_finished {
944 my ($channel) = @_;
945
946 warn "channel $channel finished\n";#d#
947}
861 948
862sub audio_music_finished { 949sub audio_music_finished {
863 return unless $CFG->{bgm_enable}; 950 return unless $CFG->{bgm_enable};
864 951
865 # TODO: hack, do play loop and mood music 952 # TODO: hack, do play loop and mood music
… …
869 push @bgmusic, shift @bgmusic; 956 push @bgmusic, shift @bgmusic;
870} 957}
871 958
872sub audio_init { 959sub audio_init {
873 if ($CFG->{audio_enable}) { 960 if ($CFG->{audio_enable}) {
874 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 961 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
875 $SDL_MIXER = !CFClient::Mix_OpenAudio; 962 $SDL_MIXER = !CFClient::Mix_OpenAudio;
876 CFClient::Mix_AllocateChannels 8; 963 CFClient::Mix_AllocateChannels 8;
877 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 964 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
878 965
879 audio_music_finished; 966 audio_music_finished;
… …
906} 993}
907 994
908my %animate_object; 995my %animate_object;
909my $animate_timer; 996my $animate_timer;
910 997
911my $want_refresh;
912my $can_refresh;
913
914my $fps = 9; 998my $fps = 9;
915 999
916sub force_refresh { 1000sub force_refresh {
917 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 1001 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
918 debug sprintf "%3.2f", $fps; 1002 debug sprintf "%3.2f", $fps;
919 1003
920 $want_refresh = 0;
921 $can_refresh = 0;
922
923 $CFClient::UI::ROOT->draw; 1004 $CFClient::UI::ROOT->draw;
924
925 CFClient::SDL_GL_SwapBuffers; 1005 CFClient::SDL_GL_SwapBuffers;
926 1006
1007 $WANT_REFRESH = 0;
1008 $CAN_REFRESH = 0;
927 $LAST_REFRESH = $NOW; 1009 $LAST_REFRESH = $NOW;
928} 1010}
929 1011
930my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1012my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
931 $NOW = time; 1013 $NOW = time;
… …
933 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1015 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
934 for CFClient::SDL_PollEvent; 1016 for CFClient::SDL_PollEvent;
935 1017
936 if (%animate_object) { 1018 if (%animate_object) {
937 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1019 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
938 $want_refresh++; 1020 $WANT_REFRESH++;
939 } 1021 }
940 1022
941 if ($want_refresh) { 1023 if ($WANT_REFRESH) {
942 force_refresh; 1024 force_refresh;
943 } else { 1025 } else {
944 $can_refresh = 1; 1026 $CAN_REFRESH = 1;
945 } 1027 }
946}); 1028});
947
948sub refresh {
949 $want_refresh++;
950}
951 1029
952sub animation_start { 1030sub animation_start {
953 my ($widget) = @_; 1031 my ($widget) = @_;
954 $animate_object{$widget} = $widget; 1032 $animate_object{$widget} = $widget;
955} 1033}
… …
961 1039
962@conn::ISA = Crossfire::Protocol::; 1040@conn::ISA = Crossfire::Protocol::;
963 1041
964sub conn::stats_update { 1042sub conn::stats_update {
965 my ($self, $stats) = @_; 1043 my ($self, $stats) = @_;
1044
1045 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1046 my $diff = $exp - $self->{prev_exp};
1047 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1048 if exists $self->{prev_exp} && $diff;
1049 $self->{prev_exp} = $exp;
1050 }
966 1051
967 update_stats_window ($stats); 1052 update_stats_window ($stats);
968} 1053}
969 1054
970sub conn::user_send { 1055sub conn::user_send {
… …
1034# at worst. 1119# at worst.
1035sub conn::flood_fill { 1120sub conn::flood_fill {
1036 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1121 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
1037 1122
1038 # the server does not allow map paths > 6 1123 # the server does not allow map paths > 6
1039 return if 6 <= length $path; 1124 return if 7 <= length $path;
1040 1125
1041 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1126 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1042 1127
1043 for ( 1128 for (
1044 [1, 0, -1], 1129 [1, 0, -1],
… …
1087 1172
1088 $self->flush_map; 1173 $self->flush_map;
1089 1174
1090 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1175 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1091 1176
1092 my $mapmapw = 250; 1177 my $mapmapw = $MAPMAP->{w};
1093 my $mapmaph = 250; 1178 my $mapmaph = $MAPMAP->{h};
1094 1179
1095 $self->{neigh_rect} = [ 1180 $self->{neigh_rect} = [
1096 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1181 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1097 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1182 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1098 ]; 1183 ];
… …
1267 [0.55, 0.41, 0.13], 1352 [0.55, 0.41, 0.13],
1268 [0.99, 0.77, 0.26], 1353 [0.99, 0.77, 0.26],
1269 [0.74, 0.65, 0.41], 1354 [0.74, 0.65, 0.41],
1270 ); 1355 );
1271 1356
1357 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1358
1359 $text = CFClient::UI::Label::escape $text;
1360 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1361 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1362
1272 $LOGVIEW->add_paragraph ($color[$color], $text); 1363 $LOGVIEW->add_paragraph ($color[$color],
1364 join "\n", map "$time $_", split /\n/, $text);
1365
1366 $STATUSBOX->add ($text,
1367 group => $text,
1368 fg => $color[$color],
1369 timeout => 60,
1370 tooltip_font => $::FONT_FIXED,
1371 );
1372}
1373
1374sub conn::drawextinfo {
1375 my ($self, $color, $type, $subtype, $message) = @_;
1376
1377 $self->drawinfo ($color, $message);
1273} 1378}
1274 1379
1275sub conn::spell_add { 1380sub conn::spell_add {
1276 my ($self, $spell) = @_; 1381 my ($self, $spell) = @_;
1277 1382
1278 # TODO 1383 # TODO
1279 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1384 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1280 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1385 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1281 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1386 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1282} 1387}
1283 1388
1284sub conn::spell_delete { 1389sub conn::spell_delete {
1285 my ($self, $spell) = @_; 1390 my ($self, $spell) = @_;
1286} 1391}
1287 1392
1288sub conn::addme_success { 1393sub conn::addme_success {
1289 my ($self) = @_; 1394 my ($self) = @_;
1290 1395
1396 $MAPWIDGET->clr_commands;
1397
1291 for my $skill (values %{$self->{skill_info}}) { 1398 for my $skill (values %{$self->{skill_info}}) {
1292 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1399 $MAPWIDGET->add_command ("ready_skill $skill", CFClient::UI::Label::escape "Ready the skill '$skill'");
1293 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1400 $MAPWIDGET->add_command ("use_skill $skill", CFClient::UI::Label::escape "Immediately use the skill '$skill'");
1294 } 1401 }
1402
1403 $MAPWIDGET->add_command ("petmode defend", "Tell pets to stay close to you and defend you");
1404 $MAPWIDGET->add_command ("petmode arena", "Same as petmode sad, but also attack other players");
1405 $MAPWIDGET->add_command ("petmode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1406 $MAPWIDGET->add_command ("killpets", "Kill your pets");
1407 $MAPWIDGET->add_command ("chat", "chat TEXT\nChat with all other players");
1408 $MAPWIDGET->add_command ("shout", "shout TEXT\nShout loudly, used for emergencies");
1409 $MAPWIDGET->add_command ("tell", "tell USERNAME TEXT\nPrivately tell a specific player");
1410
1411 my $parser = new Pod::POM;
1412 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1413
1414 for my $head2 ($pod->head2) {
1415 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1416 or next;
1417
1418 my $cmd = $1;
1419 my @args = split /\|/, $2;
1420 @args = (".*") unless @args;
1421
1422 my $text = CFClient::pod_to_pango $head2->content;
1423
1424 for my $arg (@args) {
1425 $arg = $arg eq ".*" ? "" : " $arg";
1426
1427 $MAPWIDGET->add_command ("$cmd$arg", $text);
1428 }
1429 }
1430}
1431
1432sub conn::eof {
1433 $MAPWIDGET->clr_commands;
1434
1435 stop_game;
1295} 1436}
1296 1437
1297sub update_floorbox { 1438sub update_floorbox {
1298 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1439 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1440 return unless $CONN;
1441
1299 $FLOORBOX->clear; 1442 $FLOORBOX->clear;
1300 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1443 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1301 1444
1302 my @items = values %{ $CONN->{container}{0} }; 1445 my $count = 4;
1303 1446 for (@{ $CONN->{container}{0} }) {
1304 # we basically have to use the same sorting as everybody else 1447 if (--$count) {
1305 @items = sort { $a->{type} <=> $b->{type} } @items; 1448 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1306 1449 } else {
1307 for my $item (reverse @items) { 1450 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1308 my $desc = $item->{nrof} < 2
1309 ? $item->{name}
1310 : "$item->{nrof} $item->{name_pl}";
1311 # todo: animation widget, face widget, weight(?) etc.
1312 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1313 tooltip => (CFClient::UI::Label->escape ($desc)
1314 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1315 can_hover => 1,
1316 can_events => 1,
1317 connect_button_down => sub {
1318 my ($self, $ev, $x, $y) = @_;
1319
1320 # todo: maybe put examine on 1? but should just be a tooltip :(
1321 if ($ev->{button} == 1) {
1322 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1323 } elsif ($ev->{button} == 2) {
1324 $CONN->send ("apply $item->{tag}");
1325 } elsif ($ev->{button} == 3) {
1326 # examine, lock, mark, maybe other things
1327 warn "MENU not implemented yet\n";
1328 }
1329
1330 1
1331 }, 1451 last;
1332 );
1333
1334 $hbox->add (new CFClient::UI::Face
1335 can_events => 0,
1336 face => $item->{face},
1337 anim => $item->{anim},
1338 animspeed => $item->{animspeed},
1339 );
1340 1452 }
1341 $hbox->add (new CFClient::UI::Label
1342 can_events => 0,
1343 text => $desc,
1344 );
1345 } 1453 }
1346 }); 1454 });
1347 refresh; 1455
1456 $WANT_REFRESH++;
1348} 1457}
1349 1458
1350sub conn::container_add { 1459sub conn::container_add {
1351 my ($self, $id, $items) = @_; 1460 my ($self, $tag, $items) = @_;
1352 1461
1353 update_floorbox if $id == 0; 1462 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1463
1464 if ($tag == 0) {
1465 update_floorbox;
1466 $OPENCONT = 0;
1467 $INVR_LBL->set_text ("Floor");
1468 $INVR->set_items ($self->{container}{0});
1469 } elsif ($tag == $self->{player}{tag}) {
1470 $INVR_LBL->set_text ("Player");
1471 $INV->set_items ($self->{container}{$self->{player}{tag}})
1472 } else {
1473 $OPENCONT = $tag;
1474 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1475 $INVR->set_items ($self->{container}{$tag});
1476 }
1477
1354 # $self-<{player}{tag} => player inv 1478 # $self-<{player}{tag} => player inv
1355 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1479 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1356} 1480}
1357 1481
1358sub conn::container_clear { 1482sub conn::container_clear {
1359 my ($self, $id) = @_; 1483 my ($self, $tag) = @_;
1360 1484
1361 update_floorbox if $id == 0; 1485 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1486
1487 if ($tag == 0) {
1488 update_floorbox;
1489 $OPENCONT = 0;
1490 $INVR_LBL->set_text ("Floor");
1491 $INVR->set_items ($self->{container}{0});
1492 } elsif ($tag == $self->{player}{tag}) {
1493 $INVR_LBL->set_text ("Player");
1494 $INV->set_items ($self->{container}{$tag})
1495 } else {
1496 $OPENCONT = $tag;
1497 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1498 $INVR->set_items ($self->{container}{$tag});
1499 }
1500
1362# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1501# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1363} 1502}
1364 1503
1365sub conn::item_delete { 1504sub conn::item_delete {
1366 my ($self, @items) = @_; 1505 my ($self, @items) = @_;
1367 1506
1368 for (@items) { 1507 for (@items) {
1369 update_floorbox if $_->{container} == 0; 1508 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1509
1510 if ($_->{container} == 0) {
1511 update_floorbox;
1512 $OPENCONT = 0;
1513 $INVR_LBL->set_text ("Floor");
1514 $INVR->set_items ($self->{container}{0});
1515 } elsif ($_->{container} == $self->{player}{tag}) {
1516 $INVR_LBL->set_text ("Player");
1517 $INV->set_items ($self->{container}{$self->{player}{tag}})
1518 } else {
1519 $OPENCONT = $_->{container};
1520 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1521 $INVR->set_items ($self->{container}{$_->{container}});
1522 }
1370 } 1523 }
1371} 1524}
1372 1525
1373sub conn::item_update { 1526sub conn::item_update {
1374 my ($self, $item) = @_; 1527 my ($self, $item) = @_;
1375 1528
1376 update_floorbox if $item->{container} == 0; 1529 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1530
1531 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1532 $OPENCONT = 0;
1533 $INVR_LBL->set_text ("Floor");
1534 $INVR->set_items ($self->{container}{0});
1535
1536 $item->{widget}->update_item
1537 if $item->{widget};
1538 } else {
1539 if ($item->{container} == 0) {
1540 update_floorbox;
1541 $OPENCONT = 0;
1542 $INVR_LBL->set_text ("Floor");
1543 $INVR->set_items ($self->{container}{0});
1544 } elsif ($item->{container} == $self->{player}{tag}) {
1545 $INV->set_items ($self->{container}{$item->{container}})
1546 }
1547 }
1377} 1548}
1378 1549
1379%SDL_CB = ( 1550%SDL_CB = (
1380 CFClient::SDL_QUIT => sub { 1551 CFClient::SDL_QUIT => sub {
1381 Event::unloop -1; 1552 Event::unloop -1;
1382 }, 1553 },
1383 CFClient::SDL_VIDEORESIZE => sub { 1554 CFClient::SDL_VIDEORESIZE => sub {
1384 }, 1555 },
1385 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1556 CFClient::SDL_VIDEOEXPOSE => sub {
1557 $WANT_REFRESH++;
1558 },
1386 CFClient::SDL_ACTIVEEVENT => sub { 1559 CFClient::SDL_ACTIVEEVENT => sub {
1387# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1560# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1388 }, 1561 },
1389 CFClient::SDL_KEYDOWN => sub { 1562 CFClient::SDL_KEYDOWN => sub {
1390 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1563 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1394 video_init; 1567 video_init;
1395 } else { 1568 } else {
1396 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1569 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1397 } 1570 }
1398 }, 1571 },
1399 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1572 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1400 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1573 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1401 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1574 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1402 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1575 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1403 CFClient::SDL_USEREVENT => \&audio_music_finished, 1576 CFClient::SDL_USEREVENT => sub {
1577 if ($_[0]{code} == 1) {
1578 audio_channel_finished $_[0]{data1};
1579 } elsif ($_[0]{code} == 0) {
1580 audio_music_finished;
1581 }
1582 },
1404); 1583);
1405 1584
1406############################################################################# 1585#############################################################################
1407 1586
1408$SIG{INT} = $SIG{TERM} = sub { exit }; 1587$SIG{INT} = $SIG{TERM} = sub { exit };
1409 1588
1410$TILECACHE = CFClient::db_table "tilecache";
1411$FACEMAP = CFClient::db_table "facemap";
1412
1413CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1414
1415my %DEF_CFG = (
1416 sdl_mode => 0,
1417 width => 640,
1418 height => 480,
1419 fullscreen => 0,
1420 fast => 0,
1421 map_scale => 0.5,
1422 fow_enable => 1,
1423 fow_intensity => 0.45,
1424 fow_smooth => 0,
1425 gui_fontsize => 1,
1426 log_fontsize => 1,
1427 gauge_fontsize => 1,
1428 gauge_size => 0.35,
1429 stat_fontsize => 1,
1430 mapsize => 100,
1431 host => "crossfire.schmorp.de",
1432 say_command => 'say',
1433 audio_enable => 1,
1434 bgm_enable => 1,
1435 bgm_volume => 0.25,
1436);
1437
1438while (my ($k, $v) = each %DEF_CFG) {
1439 $CFG->{$k} = $v unless exists $CFG->{$k};
1440}
1441
1442sdl_init;
1443
1444@SDL_MODES = reverse
1445 grep $_->[0] >= 640 && $_->[1] >= 480,
1446 CFClient::SDL_ListModes;
1447
1448@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1449
1450$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1451
1452{ 1589{
1590 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1591
1592 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1593
1594 $TILECACHE = CFClient::db_table "tilecache";
1595 $FACEMAP = CFClient::db_table "facemap";
1596
1597 my %DEF_CFG = (
1598 sdl_mode => 0,
1599 width => 640,
1600 height => 480,
1601 fullscreen => 0,
1602 fast => 0,
1603 map_scale => 0.5,
1604 fow_enable => 1,
1605 fow_intensity => 0.45,
1606 fow_smooth => 0,
1607 gui_fontsize => 1,
1608 log_fontsize => 1,
1609 gauge_fontsize=> 1,
1610 gauge_size => 0.35,
1611 stat_fontsize => 1,
1612 mapsize => 100,
1613 host => "crossfire.schmorp.de",
1614 say_command => 'say',
1615 audio_enable => 1,
1616 bgm_enable => 1,
1617 bgm_volume => 0.25,
1618 );
1619
1620 while (my ($k, $v) = each %DEF_CFG) {
1621 $CFG->{$k} = $v unless exists $CFG->{$k};
1622 }
1623
1624 sdl_init;
1625
1626 @SDL_MODES = reverse
1627 grep $_->[0] >= 640 && $_->[1] >= 480,
1628 CFClient::SDL_ListModes;
1629
1630 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1631
1632 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1633
1634 {
1453 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1635 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1454 DejaVuSans.ttf 1636 DejaVuSans.ttf
1455 DejaVuSansMono.ttf 1637 DejaVuSansMono.ttf
1456 DejaVuSans-Bold.ttf 1638 DejaVuSans-Bold.ttf
1457 DejaVuSansMono-Bold.ttf 1639 DejaVuSansMono-Bold.ttf
1458 DejaVuSans-Oblique.ttf 1640 DejaVuSans-Oblique.ttf
1459 DejaVuSansMono-Oblique.ttf 1641 DejaVuSansMono-Oblique.ttf
1460 DejaVuSans-BoldOblique.ttf 1642 DejaVuSans-BoldOblique.ttf
1461 DejaVuSansMono-BoldOblique.ttf 1643 DejaVuSansMono-BoldOblique.ttf
1462 ); 1644 );
1463 1645
1464 CFClient::add_font $_ for @fonts; 1646 CFClient::add_font $_ for @fonts;
1465 1647
1648 CFClient::pango_init;
1649
1466 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1650 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1467 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1651 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1468 1652
1469 $FONT_PROP->make_default; 1653 $FONT_PROP->make_default;
1470} 1654 }
1471 1655
1656# compare mono (ft) vs. rgba (cairo)
1657# ft - 1.8s, cairo 3s, even in alpha-only mode
1658# for my $rgba (0..1) {
1659# my $t1 = Time::HiRes::time;
1660# for (1..1000) {
1661# my $layout = CFClient::Layout->new ($rgba);
1662# $layout->set_text ("hallo" x 100);
1663# $layout->render;
1664# }
1665# my $t2 = Time::HiRes::time;
1666# warn $t2-$t1;
1667# }
1668
1472video_init; 1669 video_init;
1473audio_init; 1670 audio_init;
1671}
1474 1672
1475Event::loop; 1673Event::loop;
1476 1674
1477END { CFClient::SDL_Quit } 1675END { CFClient::SDL_Quit }
1478 1676

Diff Legend

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