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.99 by root, Fri Apr 14 02:03:11 2006 UTC vs.
Revision 1.115 by root, Sat Apr 15 22:56:00 2006 UTC

21our $VERSION = '0.1'; 21our $VERSION = '0.1';
22 22
23my $MAX_FPS = 60; 23my $MAX_FPS = 60;
24my $MIN_FPS = 5; # unused as of yet 24my $MIN_FPS = 5; # unused as of yet
25 25
26our $META_SERVER = "crossfire.real-time.com:13326";
27
26our $FACECACHE; 28our $FACECACHE;
27 29
28our $LAST_REFRESH; 30our $LAST_REFRESH;
29our $NOW; 31our $NOW;
30 32
38our $FULLSCREEN; 40our $FULLSCREEN;
39our $FONTSIZE; 41our $FONTSIZE;
40 42
41our $MAP; 43our $MAP;
42our $MAPWIDGET; 44our $MAPWIDGET;
45our $BUTTONBAR;
46our $LOGVIEW;
47our $CONSOLE;
48our $METASERVER;
43 49
44our $SDL_ACTIVE; 50our $SDL_ACTIVE;
45our $SDL_EV; 51our $SDL_EV;
46our %SDL_CB; 52our %SDL_CB;
47 53
48our $ALT_ENTER_MESSAGE; 54our $ALT_ENTER_MESSAGE;
49our $STATUS_LINE; 55our $STATUS_LINE;
50our $DEBUG_STATUS; 56our $DEBUG_STATUS;
51our $BUTTONBAR;
52our $LOGVIEW;
53 57
54sub status { 58sub status {
55 $STATUS_LINE->set_text ($_[0]); 59 $STATUS_LINE->set_text ($_[0]);
56 my ($w, $h) = $STATUS_LINE->size_request; 60 my ($w, $h) = $STATUS_LINE->size_request;
57 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h); 61 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
64} 68}
65 69
66sub start_game { 70sub start_game {
67 status "logging in..."; 71 status "logging in...";
68 72
69 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 73 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
70 74
71 $MAP = new CFClient::Map $mapsize, $mapsize; 75 $MAP = new CFClient::Map $mapsize, $mapsize;
76
77 my ($host, $port) = split /:/, $CFG->{host};
72 78
73 $CONN = new conn 79 $CONN = new conn
74 host => $CFG->{host}, 80 host => $host,
75 port => $CFG->{port}, 81 port => $port || 13327,
76 user => $CFG->{user}, 82 user => $CFG->{user},
77 pass => $CFG->{password}, 83 pass => $CFG->{password},
78 mapw => $mapsize, 84 mapw => $mapsize,
79 maph => $mapsize, 85 maph => $mapsize,
80 ; 86 ;
86 92
87sub stop_game { 93sub stop_game {
88 undef $CONN; 94 undef $CONN;
89} 95}
90 96
91sub config_dialog { 97sub client_setup {
92 my $dialog = new CFClient::UI::FancyFrame 98 my $dialog = new CFClient::UI::FancyFrame
93 child => (my $vbox = new CFClient::UI::VBox); 99 child => (my $vbox = new CFClient::UI::VBox);
94 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup"); 100 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
95 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 101 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
96 102
136 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { 142 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
137 my ($self, $value) = @_; 143 my ($self, $value) = @_;
138 $CFG->{fow_smooth} = $value; 144 $CFG->{fow_smooth} = $value;
139 }); 145 });
140 146
147 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
148 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
149 my ($self, $value) = @_;
150 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
151 });
152
141 $table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 153 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
142 destroy_screen (); 154 destroy_screen ();
143 init_screen (); 155 init_screen ();
144 }); 156 });
157
158 $dialog
159}
160
161sub metaserver_dialog {
162 my $dialog = new CFClient::UI::FancyFrame
163 child => (my $vbox = new CFClient::UI::VBox);
164
165 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
166
167 $dialog
168}
169
170sub update_metaserver {
171 my ($HOST) = @_;
172
173 status "fetching metaserver list...";
174
175 my $buf;
176
177 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
178
179 Event->io (fd => $fh, poll => 'r', cb => sub {
180 my $res = sysread $fh, $buf, 8192, length $buf;
181
182 if (!defined $res) {
183 $_[0]->w->cancel;
184 status "metaserver: $!";
185 } elsif ($res == 0) {
186 $_[0]->w->cancel;
187 status "server list retrieved";
188
189 my $table = $METASERVER->{table};
190
191 $table->clear;
192
193 my @col = qw(Use #Users Host Uptime Version Description);
194 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
195 for 0 .. $#col;
196
197 my @align = qw(1 0 1 1 -1);
198
199 my $y = 0;
200 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
201 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
202
203 for ($desc) {
204 s/<br>/\n/gi;
205 s/<li>/\n· /gi;
206 s/<.*?>//sgi;
207 s/&/&amp;/g;
208 s/</&lt;/g;
209 s/>/&gt;/g;
210 }
211
212 $uptime = sprintf "%dd %02d:%02d:%02d",
213 (int $m->[8] / 86400),
214 (int $m->[8] / 3600) % 24,
215 (int $m->[8] / 60) % 60,
216 $m->[8] % 60;
217
218 $m = [$users, $host, $uptime, $version, $desc];
219
220 $y++;
221
222 $table->add (0, $y, new CFClient::UI::VBox children => [
223 (new CFClient::UI::Button text => " ", connect_activate => sub {
224 $HOST->set_text ($CFG->{host} = $host);
225 }),
226 (new CFClient::UI::Empty expand => 1),
227 ]);
228
229 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
230 for 0 .. $#$m;
231 }
232 }
233 });
234}
235
236sub server_setup {
237 my $dialog = new CFClient::UI::FancyFrame
238 child => (my $vbox = new CFClient::UI::VBox);
145 239
146 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup"); 240 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
147 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 241 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
148 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host"); 242 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
149 $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}); 243
150 244 {
151 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port"); 245 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
152 $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}); 246
247 $vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
248 my ($self, $value) = @_;
249 $CFG->{host} = $value;
250 });
251
252 $METASERVER = metaserver_dialog;
253
254 $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
255 update_metaserver $HOST;
256 });
257 }
153 258
154 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); 259 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
155 $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}); 260 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
261 my ($self, $value) = @_;
262 $CFG->{user} = $value;
263 });
156 264
157 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password"); 265 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
158 $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1); 266 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
267 my ($self, $value) = @_;
268 $CFG->{password} = $value;
269 });
159 270
271 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
272 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
273 my ($self, $value) = @_;
274 $CFG->{say_command} = $value;
275 });
276
160 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size"); 277 $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
161 $table->add (1, 6, new CFClient::UI::Slider 278 $table->add (1, 7, new CFClient::UI::Slider
162 req_w => 100, 279 req_w => 100,
163 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 280 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
164 connect_changed => sub { 281 connect_changed => sub {
165 my ($self, $value) = @_; 282 my ($self, $value) = @_;
166 283
167 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 284 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
168 }, 285 },
169 ); 286 );
170 287
171 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 288 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
172 start_game; 289 start_game;
173 }); 290 });
174 291
175 $vbox->add (my $hbox = new CFClient::UI::HBox);
176
177 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
178 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
179 status "Configuration Saved";
180 });
181
182 $dialog 292 $dialog
183} 293}
184 294
185sub console_window { 295sub message_window {
186 my $window = new CFClient::UI::FancyFrame 296 my $window = new CFClient::UI::FancyFrame
187 border_bg => [1, 1, 1, 0.5], 297 border_bg => [1, 1, 1, 0.5],
188 bg => [0.3, 0.3, 0.3, 0.8], 298 bg => [0.3, 0.3, 0.3, 0.8],
299 user_w => $::WIDTH/4,
300 user_h => $::HEIGHT,
189 child => (my $vbox = new CFClient::UI::VBox); 301 child => (my $vbox = new CFClient::UI::VBox);
190 302
191 $vbox->add ($LOGVIEW = new CFClient::UI::TextView expand => 1); 303 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
304 expand => 1,
305 fontsize => $::CFG->{log_fontsize},
306 );
307
192 $vbox->add (my $input = new CFClient::UI::Entry); 308 $vbox->add (my $input = new CFClient::UI::LineEntry);
309 $input->connect (activate => sub {
310 my ($input, $text) = @_;
311 $input->set_text ('');
312
313 if ($text =~ /^\/(.*)/) {
314 $::CONN->user_send ("command $1");
315 } else {
316 my $say_cmd = $::CFG->{say_command} || 'say';
317 $::CONN->user_send ("command $say_cmd $text");
318 }
319 1
320 });
321 $input->connect (escape => sub {
322 $MAPWIDGET->focus_in
323 });
324 $input->focus_in;
325
326 $CONSOLE = {
327 window => $window,
328 input => $input
329 };
193 330
194 $window 331 $window
195} 332}
196 333
197sub sdl_init { 334sub sdl_init {
335 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE
198 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO 336 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
199 and die "SDL::Init failed!\n"; 337 and die "SDL::Init failed!\n";
200} 338}
201 339
202sub init_screen { 340sub init_screen {
207 $FAST = $CFG->{fast}; 345 $FAST = $CFG->{fast};
208 346
209 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5; 347 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
210 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5; 348 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
211 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5; 349 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
212 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0; 350 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
213 351
214 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0; 352 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
215 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0; 353 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
216 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0; 354 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
217 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0; 355 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
239 $FONTSIZE = int $HEIGHT / 40; 377 $FONTSIZE = int $HEIGHT / 40;
240 378
241 ############################################################################# 379 #############################################################################
242 380
243 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 381 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
244 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS); 382 $CFClient::UI::ROOT->add ($DEBUG_STATUS);
245 383
246 $STATUS_LINE = new CFClient::UI::Label 384 $STATUS_LINE = new CFClient::UI::Label
247 padding => 0, 385 padding => 0,
248 y => $HEIGHT * 44 / 45 - $FONTSIZE; 386 y => $HEIGHT * 44 / 45 - $FONTSIZE;
249 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE); 387 $CFClient::UI::ROOT->add ($STATUS_LINE);
250 388
251 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 389 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
252 padding => 0, 390 padding => 0,
253 y => $HEIGHT * 44 / 45, 391 y => $HEIGHT * 44 / 45,
254 height => $HEIGHT / 45, 392 height => $HEIGHT / 45,
255 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 393 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
256 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE); 394 $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
257 395
258 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget); 396 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
259 $MAPWIDGET->focus_in; 397 $MAPWIDGET->focus_in;
398 $MAPWIDGET->connect (activate_console => sub {
399 my ($mapwidget, $preset) = @_;
260 400
401 if ($CONSOLE) {
402 $CONSOLE->{input}->focus_in;
403
404 if ($preset && $CONSOLE->{input}->get_text eq '') {
405 $CONSOLE->{input}->set_text ($preset);
406 }
407 }
408 });
409
261 $CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox); 410 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
262 411
263 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1); 412 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
264 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window); 413 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
414 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
415
416 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
417 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
418 status "Configuration Saved";
419 });
420
421 $BUTTONBAR->{children}[0]->emit ("activate");
265} 422}
266 423
267sub destroy_screen { 424sub destroy_screen {
268 $CFClient::UI::TOPLEVEL->{children} = []; 425 $CFClient::UI::ROOT->{children} = [];
269 undef $SDL_ACTIVE; 426 undef $SDL_ACTIVE;
270 undef $SDL_EV; 427 undef $SDL_EV;
271 SDL::Quit; 428 SDL::Quit;
272} 429}
273 430
284 debug sprintf "%3.2f", $fps; 441 debug sprintf "%3.2f", $fps;
285 442
286 $want_refresh = 0; 443 $want_refresh = 0;
287 $can_refresh = 0; 444 $can_refresh = 0;
288 445
289 glViewport 0, 0, $WIDTH, $HEIGHT;
290
291 glMatrixMode GL_PROJECTION;
292 glLoadIdentity;
293 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
294 glMatrixMode GL_MODELVIEW;
295 glLoadIdentity;
296
297 glClearColor +($CFG->{fow_intensity}) x 3, 1;
298 glClear GL_COLOR_BUFFER_BIT;
299
300 $CFClient::UI::TOPLEVEL->draw; 446 $CFClient::UI::ROOT->draw;
301 447
302 SDL::GLSwapBuffers; 448 SDL::GLSwapBuffers;
303 449
304 $LAST_REFRESH = $NOW; 450 $LAST_REFRESH = $NOW;
305} 451}
367 $MAP->clear; 513 $MAP->clear;
368 514
369# refresh; 515# refresh;
370} 516}
371 517
518sub conn::map_info {
519 my ($self, $mode, $x, $y, $w, $h, $hash) = @_;
520
521 warn "mapinfo <$mode,$x,$y,$w,$h,$hash>\n";#d#
522}
523
372sub conn::face_find { 524sub conn::face_find {
373 my ($self, $face) = @_; 525 my ($self, $face) = @_;
374 526
527 my $data;
528
375 $FACECACHE->{"$face->{chksum},$face->{name}"} 529 $FACECACHE->get ("$face->{chksum},$face->{name}")
376} 530}
377 531
378sub conn::face_update { 532sub conn::face_update {
379 my ($self, $facenum, $face) = @_; 533 my ($self, $facenum, $face) = @_;
380 534
381 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; 535 $FACECACHE->put ("$face->{chksum},$face->{name}" => $face->{image});
382 536
383 my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image}; 537 my $tex = $face->{texture} =
538 new_from_image CFClient::Texture
539 delete $face->{image}, minify => 1;
384 540
385 $MAP->set_texture ($facenum, @$tex{qw(name w h s t)}); 541 $MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}});
386 $MAPWIDGET->update; 542 $MAPWIDGET->update;
387} 543}
388 544
389sub conn::query { 545sub conn::query {
390 my ($self, $flags, $prompt) = @_; 546 my ($self, $flags, $prompt) = @_;
451 }, 607 },
452); 608);
453 609
454############################################################################# 610#############################################################################
455 611
612$FACECACHE = CFClient::db_table "facecache";
613
456CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 614CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
457 615
458my %DEF_CFG = ( 616my %DEF_CFG = (
617 sdl_mode => 0,
459 width => 640, 618 width => 640,
460 height => 480, 619 height => 480,
620 fullscreen => 0,
461 fast => 0, 621 fast => 0,
462 fow_enable => 1, 622 fow_enable => 1,
463 fow_intensity => 0.45, 623 fow_intensity => 0.45,
464 fow_smooth => 0, 624 fow_smooth => 0,
465 fullscreen => 0, 625 log_fontsize => 14,
466 sdl_mode => 0,
467 mapsize => 100, 626 mapsize => 100,
468 host => "crossfire.schmorp.de", 627 host => "crossfire.schmorp.de",
469 port => 13327, 628 say_command => 'say',
470); 629);
471 630
472while (my ($k, $v) = each %DEF_CFG) { 631while (my ($k, $v) = each %DEF_CFG) {
473 $CFG->{$k} = $v unless exists $CFG->{$k}; 632 $CFG->{$k} = $v unless exists $CFG->{$k};
474} 633}
491 650
492 CFClient::add_font $_ for @fonts; 651 CFClient::add_font $_ for @fonts;
493 CFClient::set_font $fonts[0]; 652 CFClient::set_font $fonts[0];
494} 653}
495 654
496$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
497
498Event::loop; 655Event::loop;
499 656
500Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
501 657

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines