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.90 by root, Wed Apr 12 21:35:11 2006 UTC vs.
Revision 1.112 by root, Sat Apr 15 13:56:26 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
34 36
35our @SDL_MODES; 37our @SDL_MODES;
36our $WIDTH; 38our $WIDTH;
37our $HEIGHT; 39our $HEIGHT;
38our $FULLSCREEN; 40our $FULLSCREEN;
41our $FONTSIZE;
39 42
43our $MAP;
40our $MAPWIDGET; 44our $MAPWIDGET;
41our $FONTSIZE; 45our $BUTTONBAR;
46our $LOGVIEW;
47our $CONSOLE;
48our $METASERVER;
42 49
43our $SDL_ACTIVE; 50our $SDL_ACTIVE;
44our $SDL_EV; 51our $SDL_EV;
45our %SDL_CB; 52our %SDL_CB;
46 53
61} 68}
62 69
63sub start_game { 70sub start_game {
64 status "logging in..."; 71 status "logging in...";
65 72
66 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;
67 74
75 $MAP = new CFClient::Map $mapsize, $mapsize;
76
77 my ($host, $port) = split /:/, $CFG->{host};
78
68 $CONN = new conn 79 $CONN = new conn
69 host => $CFG->{host}, 80 host => $host,
70 port => $CFG->{port}, 81 port => $port || 13327,
71 user => $CFG->{user}, 82 user => $CFG->{user},
72 pass => $CFG->{password}, 83 pass => $CFG->{password},
73 mapw => $mapsize, 84 mapw => $mapsize,
74 maph => $mapsize, 85 maph => $mapsize,
75 ; 86 ;
81 92
82sub stop_game { 93sub stop_game {
83 undef $CONN; 94 undef $CONN;
84} 95}
85 96
86sub config_dialog { 97sub client_setup {
87 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100, 98 my $dialog = new CFClient::UI::FancyFrame
88 child => (my $vbox = new CFClient::UI::VBox); 99 child => (my $vbox = new CFClient::UI::VBox);
89 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup"); 100 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
90 $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]);
91 102
92 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode"); 103 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
113 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub { 124 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
114 my ($self, $value) = @_; 125 my ($self, $value) = @_;
115 $CFG->{fast} = $value; 126 $CFG->{fast} = $value;
116 }); 127 });
117 128
118 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fog of War"); 129 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
130 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
131 my ($self, $value) = @_;
132 $CFG->{fow_enable} = $value;
133 });
134
135 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");
119 $table->add (1, 2, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { 136 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
120 my ($self, $value) = @_; 137 my ($self, $value) = @_;
121 $CFG->{fow_intensity} = $value; 138 $CFG->{fow_intensity} = $value;
122 }); 139 });
123 140
141 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
142 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
143 my ($self, $value) = @_;
144 $CFG->{fow_smooth} = $value;
145 });
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
124 $table->add (1, 4, 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 {
125 destroy_screen (); 154 destroy_screen ();
126 init_screen (); 155 init_screen ();
127 }); 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 status "fetching metaserver list...";
172
173 my $buf;
174
175 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
176
177 Event->io (fd => $fh, poll => 'r', cb => sub {
178 my $res = sysread $fh, $buf, 8192, length $buf;
179
180 if (!defined $res) {
181 $_[0]->w->cancel;
182 status "metaserver: $!";
183 } elsif ($res == 0) {
184 $_[0]->w->cancel;
185 status "server list retrieved";
186 warn $buf;
187 }
188 });
189}
190
191sub server_setup {
192 my $dialog = new CFClient::UI::FancyFrame
193 child => (my $vbox = new CFClient::UI::VBox);
128 194
129 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup"); 195 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
130 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 196 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
131 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host"); 197 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
132 $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}); 198
133 199 {
134 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port"); 200 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
135 $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}); 201
202 $vbox->add (new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
203 my ($self, $value) = @_;
204 $CFG->{host} = $value;
205 });
206
207 $METASERVER = metaserver_dialog;
208
209 $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
210 update_metaserver;
211 });
212 }
136 213
137 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); 214 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
138 $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}); 215 $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
216 my ($self, $value) = @_;
217 $CFG->{user} = $value;
218 });
139 219
140 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password"); 220 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
141 $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1); 221 $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
222 my ($self, $value) = @_;
223 $CFG->{password} = $value;
224 });
142 225
226 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
227 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
228 my ($self, $value) = @_;
229 $CFG->{say_command} = $value;
230 });
231
143 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size"); 232 $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
144 $table->add (1, 6, new CFClient::UI::Slider 233 $table->add (1, 7, new CFClient::UI::Slider
145 req_w => 100, 234 req_w => 100,
146 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 235 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
147 connect_changed => sub { 236 connect_changed => sub {
148 my ($self, $value) = @_; 237 my ($self, $value) = @_;
149 238
150 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 239 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
151 }, 240 },
152 ); 241 );
153 242
154 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 243 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
155 start_game; 244 start_game;
156 }); 245 });
157 246
158 $vbox->add (my $hbox = new CFClient::UI::HBox); 247 $dialog
248}
159 249
160 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub { 250sub message_window {
161 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 251 my $window = new CFClient::UI::FancyFrame
162 status "Configuration Saved"; 252 border_bg => [1, 1, 1, 0.5],
253 bg => [0.3, 0.3, 0.3, 0.8],
254 user_w => $::WIDTH/4,
255 user_h => $::HEIGHT,
256 child => (my $vbox = new CFClient::UI::VBox);
257
258 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
259 expand => 1,
260 fontsize => $::CFG->{log_fontsize},
163 }); 261 );
164 $CFClient::UI::TOPLEVEL->add ($dialog); 262
263 $vbox->add (my $input = new CFClient::UI::LineEntry);
264 $input->connect (activate => sub {
265 my ($input, $text) = @_;
266 $input->set_text ('');
267
268 if ($text =~ /^\/(.*)/) {
269 $::CONN->user_send ("command $1");
270 } else {
271 my $say_cmd = $::CFG->{say_command} || 'say';
272 $::CONN->user_send ("command $say_cmd $text");
273 }
274 1
275 });
276 $input->connect (escape => sub {
277 $MAPWIDGET->focus_in
278 });
279 $input->focus_in;
280
281 $CONSOLE = {
282 window => $window,
283 input => $input
284 };
285
286 $window
165} 287}
166 288
167sub sdl_init { 289sub sdl_init {
290 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE
168 SDL::Init SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO 291 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
169 and die "SDL::Init failed!\n"; 292 and die "SDL::Init failed!\n";
170} 293}
171 294
172sub init_screen { 295sub init_screen {
173 sdl_init; 296 sdl_init;
208 331
209 $FONTSIZE = int $HEIGHT / 40; 332 $FONTSIZE = int $HEIGHT / 40;
210 333
211 ############################################################################# 334 #############################################################################
212 335
213 $DEBUG_STATUS = new CFClient::UI::Label padding => 0; 336 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
214 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS); 337 $CFClient::UI::ROOT->add ($DEBUG_STATUS);
215 338
216 $STATUS_LINE = new CFClient::UI::Label 339 $STATUS_LINE = new CFClient::UI::Label
217 padding => 0, 340 padding => 0,
218 y => $HEIGHT * 49 / 50 - $FONTSIZE; 341 y => $HEIGHT * 44 / 45 - $FONTSIZE;
219 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE); 342 $CFClient::UI::ROOT->add ($STATUS_LINE);
220 343
221 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 344 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
222 padding => 0, 345 padding => 0,
223 y => $HEIGHT * 49 / 50, 346 y => $HEIGHT * 44 / 45,
224 height => $HEIGHT / 50, 347 height => $HEIGHT / 45,
225 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 348 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
226 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE); 349 $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
227 350
228 $MAPWIDGET = new CFClient::UI::MapWidget; 351 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
229 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
230 $MAPWIDGET->focus_in; 352 $MAPWIDGET->focus_in;
353 $MAPWIDGET->connect (activate_console => sub {
354 my ($mapwidget, $preset) = @_;
231 355
232 config_dialog; 356 if ($CONSOLE) {
357 $CONSOLE->{input}->focus_in;
358
359 if ($preset && $CONSOLE->{input}->get_text eq '') {
360 $CONSOLE->{input}->set_text ($preset);
361 }
362 }
363 });
364
365 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
366
367 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
368 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
369 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
370
371 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
372 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
373 status "Configuration Saved";
374 });
375
376 $BUTTONBAR->{children}[0]->emit ("activate");
233} 377}
234 378
235sub destroy_screen { 379sub destroy_screen {
236 $CFClient::UI::TOPLEVEL->{children} = []; 380 $CFClient::UI::ROOT->{children} = [];
237 undef $SDL_ACTIVE; 381 undef $SDL_ACTIVE;
238 undef $SDL_EV; 382 undef $SDL_EV;
239 SDL::Quit; 383 SDL::Quit;
240} 384}
241 385
252 debug sprintf "%3.2f", $fps; 396 debug sprintf "%3.2f", $fps;
253 397
254 $want_refresh = 0; 398 $want_refresh = 0;
255 $can_refresh = 0; 399 $can_refresh = 0;
256 400
257 glViewport 0, 0, $WIDTH, $HEIGHT;
258
259 glMatrixMode GL_PROJECTION;
260 glLoadIdentity;
261 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
262 glMatrixMode GL_MODELVIEW;
263 glLoadIdentity;
264
265 glClearColor +($CFG->{fow_intensity}) x 3, 1;
266 glClear GL_COLOR_BUFFER_BIT;
267
268 $CFClient::UI::TOPLEVEL->draw; 401 $CFClient::UI::ROOT->draw;
269 402
270 SDL::GLSwapBuffers; 403 SDL::GLSwapBuffers;
271 404
272 $LAST_REFRESH = $NOW; 405 $LAST_REFRESH = $NOW;
273} 406}
311 444
312 $self->send ($command); 445 $self->send ($command);
313 status $command; 446 status $command;
314} 447}
315 448
316sub conn::map_update { 449sub conn::feed_map1a {
317 my ($self, $dirty) = @_; 450 my ($self, $data) = @_;
318 451
452# $self->Crossfire::Protocol::feed_map1a ($data);
453
454 $MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
455 $MAP->map1a_update ($data);
319 $MAPWIDGET->update; 456 $MAPWIDGET->update;
320} 457}
321 458
322sub conn::map_scroll { 459#sub conn::map_update {
323 my ($self, $dx, $dy) = @_; 460# my ($self, $dirty) = @_;
324 461#
325# refresh; 462# $MAPWIDGET->update;
326} 463#}
327 464
328sub conn::map_clear { 465sub conn::map_clear {
329 my ($self) = @_; 466 my ($self) = @_;
330 467
468 $MAP->clear;
469
331# refresh; 470# refresh;
332} 471}
333 472
334sub conn::face_find { 473sub conn::face_find {
335 my ($self, $face) = @_; 474 my ($self, $face) = @_;
336 475
337 $FACECACHE->{"$face->{chksum},$face->{name}"} 476 $FACECACHE->{"$face->{chksum},$face->{name}"}
338} 477}
339 478
340sub conn::face_update { 479sub conn::face_update {
341 my ($self, $face) = @_; 480 my ($self, $facenum, $face) = @_;
342 481
343 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; 482 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
344 483
345 $face->{texture} = new_from_image CFClient::Texture delete $face->{image}; 484 my $tex = $face->{texture} =
485 new_from_image CFClient::Texture
486 delete $face->{image}, minify => 1;
487
488 $MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}});
489 $MAPWIDGET->update;
346} 490}
347 491
348sub conn::query { 492sub conn::query {
349 my ($self, $flags, $prompt) = @_; 493 my ($self, $flags, $prompt) = @_;
350 494
495 #TODO
351 warn "<<<<QUERY:$flags:$prompt>>>\n";#d# 496 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
497}
498
499sub conn::drawinfo {
500 my ($self, $color, $text) = @_;
501
502 my @color = (
503 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
504 [1.00, 1.00, 1.00],
505 [0.00, 0.00, 0.55],
506 [1.00, 0.00, 0.00],
507 [1.00, 0.54, 0.00],
508 [0.11, 0.56, 1.00],
509 [0.93, 0.46, 0.00],
510 [0.18, 0.54, 0.34],
511 [0.56, 0.73, 0.56],
512 [0.80, 0.80, 0.80],
513 [0.55, 0.41, 0.13],
514 [0.99, 0.77, 0.26],
515 [0.74, 0.65, 0.41],
516 );
517
518 $LOGVIEW->add_paragraph ($color[$color], $text);
352} 519}
353 520
354%SDL_CB = ( 521%SDL_CB = (
355 SDL_QUIT() => sub { 522 SDL_QUIT() => sub {
356 Event::unloop -1; 523 Event::unloop -1;
361 refresh; 528 refresh;
362 }, 529 },
363 SDL_KEYDOWN() => sub { 530 SDL_KEYDOWN() => sub {
364 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 531 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
365 # alt-enter 532 # alt-enter
366 $FULLSCREEN = !$FULLSCREEN;
367 destroy_screen; 533 destroy_screen;
534 $CFG->{fullscreen} = !$CFG->{fullscreen};
368 init_screen; 535 init_screen;
369 } else { 536 } else {
370 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 537 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
371 } 538 }
372 }, 539 },
390############################################################################# 557#############################################################################
391 558
392CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 559CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
393 560
394my %DEF_CFG = ( 561my %DEF_CFG = (
562 sdl_mode => 0,
395 width => 640, 563 width => 640,
396 height => 480, 564 height => 480,
565 fullscreen => 0,
397 fast => 0, 566 fast => 0,
567 fow_enable => 1,
398 fow_intensity => 0.45, 568 fow_intensity => 0.45,
399 fullscreen => 0, 569 fow_smooth => 0,
400 sdl_mode => 0, 570 log_fontsize => 14,
401 mapsize => 100, 571 mapsize => 100,
402 host => "crossfire.schmorp.de", 572 host => "crossfire.schmorp.de",
403 port => 13327, 573 say_command => 'say',
404); 574);
405 575
406while (my ($k, $v) = each %DEF_CFG) { 576while (my ($k, $v) = each %DEF_CFG) {
407 $CFG->{$k} = $v unless exists $CFG->{$k}; 577 $CFG->{$k} = $v unless exists $CFG->{$k};
408} 578}
409 579
410sdl_init; 580sdl_init;
411 581
412@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)], 582@SDL_MODES = reverse
583 grep $_->[0] >= 640 && $_->[1] >= 480,
584 map [SDL::RectW ($_), SDL::RectH ($_)],
413 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL }; 585 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
414 586
415@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 587@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
416 588
417$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 589$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
418 590

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines