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.98 by root, Fri Apr 14 00:15:52 2006 UTC vs.
Revision 1.99 by root, Fri Apr 14 02:03:11 2006 UTC

… …
34 34
35our @SDL_MODES; 35our @SDL_MODES;
36our $WIDTH; 36our $WIDTH;
37our $HEIGHT; 37our $HEIGHT;
38our $FULLSCREEN; 38our $FULLSCREEN;
39our $FONTSIZE;
39 40
40our $MAP; 41our $MAP;
41our $MAPWIDGET; 42our $MAPWIDGET;
42our $FONTSIZE;
43 43
44our $SDL_ACTIVE; 44our $SDL_ACTIVE;
45our $SDL_EV; 45our $SDL_EV;
46our %SDL_CB; 46our %SDL_CB;
47 47
48our $ALT_ENTER_MESSAGE; 48our $ALT_ENTER_MESSAGE;
49our $STATUS_LINE; 49our $STATUS_LINE;
50our $DEBUG_STATUS; 50our $DEBUG_STATUS;
51our $BUTTONBAR; 51our $BUTTONBAR;
52our $LOGVIEW;
52 53
53sub status { 54sub status {
54 $STATUS_LINE->set_text ($_[0]); 55 $STATUS_LINE->set_text ($_[0]);
55 my ($w, $h) = $STATUS_LINE->size_request; 56 my ($w, $h) = $STATUS_LINE->size_request;
56 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h); 57 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
… …
86sub stop_game { 87sub stop_game {
87 undef $CONN; 88 undef $CONN;
88} 89}
89 90
90sub config_dialog { 91sub config_dialog {
91 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100, 92 my $dialog = new CFClient::UI::FancyFrame
92 child => (my $vbox = new CFClient::UI::VBox); 93 child => (my $vbox = new CFClient::UI::VBox);
93 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup"); 94 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
94 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 95 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
95 96
96 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode"); 97 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
… …
179 }); 180 });
180 181
181 $dialog 182 $dialog
182} 183}
183 184
185sub console_window {
186 my $window = new CFClient::UI::FancyFrame
187 border_bg => [1, 1, 1, 0.5],
188 bg => [0.3, 0.3, 0.3, 0.8],
189 child => (my $vbox = new CFClient::UI::VBox);
190
191 $vbox->add ($LOGVIEW = new CFClient::UI::TextView expand => 1);
192 $vbox->add (my $input = new CFClient::UI::Entry);
193
194 $window
195}
196
184sub sdl_init { 197sub sdl_init {
185 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE 198 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
186 and die "SDL::Init failed!\n"; 199 and die "SDL::Init failed!\n";
187} 200}
188 201
189sub init_screen { 202sub init_screen {
190 sdl_init; 203 sdl_init;
… …
225 238
226 $FONTSIZE = int $HEIGHT / 40; 239 $FONTSIZE = int $HEIGHT / 40;
227 240
228 ############################################################################# 241 #############################################################################
229 242
230 $DEBUG_STATUS = new CFClient::UI::Label padding => 0; 243 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
231 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS); 244 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
232 245
233 $STATUS_LINE = new CFClient::UI::Label 246 $STATUS_LINE = new CFClient::UI::Label
234 padding => 0, 247 padding => 0,
235 y => $HEIGHT * 49 / 50 - $FONTSIZE; 248 y => $HEIGHT * 44 / 45 - $FONTSIZE;
236 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE); 249 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
237 250
238 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 251 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
239 padding => 0, 252 padding => 0,
240 y => $HEIGHT * 49 / 50, 253 y => $HEIGHT * 44 / 45,
241 height => $HEIGHT / 50, 254 height => $HEIGHT / 45,
242 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 255 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
243 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE); 256 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
244 257
245 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget); 258 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);
246 $MAPWIDGET->focus_in; 259 $MAPWIDGET->focus_in;
247 260
248 $CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox); 261 $CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);
249 262
250 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1); 263 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1);
264 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window);
251} 265}
252 266
253sub destroy_screen { 267sub destroy_screen {
254 $CFClient::UI::TOPLEVEL->{children} = []; 268 $CFClient::UI::TOPLEVEL->{children} = [];
255 undef $SDL_ACTIVE; 269 undef $SDL_ACTIVE;
… …
373} 387}
374 388
375sub conn::query { 389sub conn::query {
376 my ($self, $flags, $prompt) = @_; 390 my ($self, $flags, $prompt) = @_;
377 391
392 #TODO
378 warn "<<<<QUERY:$flags:$prompt>>>\n";#d# 393 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
394}
395
396sub conn::drawinfo {
397 my ($self, $color, $text) = @_;
398
399 my @color = (
400 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
401 [1.00, 1.00, 1.00],
402 [0.00, 0.00, 0.55],
403 [1.00, 0.00, 0.00],
404 [1.00, 0.54, 0.00],
405 [0.11, 0.56, 1.00],
406 [0.93, 0.46, 0.00],
407 [0.18, 0.54, 0.34],
408 [0.56, 0.73, 0.56],
409 [0.80, 0.80, 0.80],
410 [0.55, 0.41, 0.13],
411 [0.99, 0.77, 0.26],
412 [0.74, 0.65, 0.41],
413 );
414
415 $LOGVIEW->add_paragraph ($color[$color], $text);
379} 416}
380 417
381%SDL_CB = ( 418%SDL_CB = (
382 SDL_QUIT() => sub { 419 SDL_QUIT() => sub {
383 Event::unloop -1; 420 Event::unloop -1;
… …
388 refresh; 425 refresh;
389 }, 426 },
390 SDL_KEYDOWN() => sub { 427 SDL_KEYDOWN() => sub {
391 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 428 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
392 # alt-enter 429 # alt-enter
393 $FULLSCREEN = !$FULLSCREEN;
394 destroy_screen; 430 destroy_screen;
431 $CFG->{fullscreen} = !$CFG->{fullscreen};
395 init_screen; 432 init_screen;
396 } else { 433 } else {
397 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 434 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
398 } 435 }
399 }, 436 },

Diff Legend

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