ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.25 by root, Sat Apr 8 22:08:24 2006 UTC vs.
Revision 1.31 by elmex, Sun Apr 9 00:43:11 2006 UTC

… …
123use SDL::OpenGL; 123use SDL::OpenGL;
124 124
125sub add { 125sub add {
126 my ($self, $chld) = @_; 126 my ($self, $chld) = @_;
127 $self->SUPER::add ($chld); 127 $self->SUPER::add ($chld);
128 $self->render_chld; 128 $self->render_chld; #TODO: Move this to the size_request event propably?
129} 129}
130 130
131sub render_chld { 131sub render_chld {
132 my ($self) = @_; 132 my ($self) = @_;
133 my $chld = $self->get; 133 my $chld = $self->get;
… …
148} 148}
149 149
150sub _draw { 150sub _draw {
151 my ($self) = @_; 151 my ($self) = @_;
152 152
153 my ($w, $h) = $self->size_request;#TODO# use widht/height of texture 153 my ($w, $h) = $self->size_request;#TODO# use width/height of texture
154
154 my $tex = $self->{texture} 155 my $tex = $self->{texture}
155 or return; 156 or return;
156 157
157 glEnable GL_BLEND; 158 glEnable GL_BLEND;
158 glEnable GL_TEXTURE_2D; 159 glEnable GL_TEXTURE_2D;
159 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
160 glBindTexture GL_TEXTURE_2D, $tex->{name}; 161 glBindTexture GL_TEXTURE_2D, $tex->{name};
161 162
162 glColor 1, 1, 1; 163 glColor 1, 0, 1;
163 164
164 glBegin GL_QUADS; 165 glBegin GL_QUADS;
165 glTexCoord 0, 0; glVertex 0, 0; 166 glTexCoord 0, 0; glVertex 0, 0;
166 glTexCoord 0, 1; glVertex 0, $h; 167 glTexCoord 0, 1; glVertex 0, $h;
167 glTexCoord 1, 1; glVertex $w, $h; 168 glTexCoord 1, 1; glVertex $w, $h;
… …
180 181
181sub size_request { 182sub size_request {
182 my ($self) = @_; 183 my ($self) = @_;
183 my $chld = $self->get 184 my $chld = $self->get
184 or return (0, 0); 185 or return (0, 0);
186
187 $chld->move (2, 2);
188
185 map { $_ + 4 } $chld->size_request; 189 map { $_ + 4 } $chld->size_request;
186} 190}
187 191
188sub _draw { 192sub _draw {
189 my ($self) = @_; 193 my ($self) = @_;
190 194
191 my $chld = $self->get; 195 my $chld = $self->get;
192 196
193 my ($w, $h) = $chld->size_request; 197 my ($w, $h) = $chld->size_request;
194 198
195 glColor 1, 0, 0;
196 glBegin GL_QUADS; 199 glBegin GL_QUADS;
200 glColor 0, 0, 0;
197 glTexCoord 0, 0; glVertex 0 , 0; 201 glTexCoord 0, 0; glVertex 0 , 0;
198 glTexCoord 0, 1; glVertex 0 , $h + 4; 202 glTexCoord 0, 1; glVertex 0 , $h + 4;
199 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 203 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
200 glTexCoord 1, 0; glVertex $w + 4 , 0; 204 glTexCoord 1, 0; glVertex $w + 4 , 0;
201 glEnd; 205 glEnd;
202 206
203 glPushMatrix;
204 glTranslate (2, 2, 0);
205 $chld->draw; 207 $chld->draw;
206 glPopMatrix;
207} 208}
209
210package Crossfire::Client::Widget::FancyFrame;
211
212our @ISA = Crossfire::Client::Widget::Frame::;
213
214use SDL::OpenGL;
215
216#TODO: implement themed frame
208 217
209package Crossfire::Client::Widget::Table; 218package Crossfire::Client::Widget::Table;
210 219
211our @ISA = Crossfire::Client::Widget::Container::; 220our @ISA = Crossfire::Client::Widget::Container::;
212 221
… …
272 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 281 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
273 my $x = 0; 282 my $x = 0;
274 283
275 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 284 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
276 285
277 glPushMatrix;
278 glTranslate ($x, $y, 0);#TODO#there must be no translate here, instead the widget must be moved
279 my $c = $self->{childs}->[$yi]->[$xi]; 286 my $c = $self->{childs}->[$yi]->[$xi];
287 if ($c) {
288 $c->move ($x, $y, 0); #TODO: Move to size_request
280 $c->draw if $c; 289 $c->draw if $c;
281 glPopMatrix; 290 }
282 291
283 $x += $self->max_col_width ($xi); 292 $x += $self->max_col_width ($xi);
284 } 293 }
285 294
286 $y += $self->max_row_height ($yi); 295 $y += $self->max_row_height ($yi);
… …
314sub _draw { 323sub _draw {
315 my ($self) = @_; 324 my ($self) = @_;
316 325
317 my ($x, $y); 326 my ($x, $y);
318 for (@{$self->{childs} || []}) { 327 for (@{$self->{childs} || []}) {
319 glPushMatrix; 328 $_->move (0, $y, 0); #TODO: move to size_request
320 glTranslate (0, $y, 0);# see above TODO
321 $_->draw; 329 $_->draw;
322 glPopMatrix;
323 my ($w, $h) = $_->size_request; 330 my ($w, $h) = $_->size_request;
324 $y += $h; 331 $y += $h;
325 } 332 }
326} 333}
327 334
… …
330our @ISA = Crossfire::Client::Widget::; 337our @ISA = Crossfire::Client::Widget::;
331 338
332use SDL::OpenGL; 339use SDL::OpenGL;
333 340
334sub new { 341sub new {
335 my ($class, $x, $y, $z, $ttf, $text) = @_; 342 my ($class, $x, $y, $z, $height, $text) = @_;
336 343
337 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, ttf => $ttf); 344 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
338 345
339 $self->set_text ($text); 346 $self->set_text ($text);
340 347
341 $self 348 $self
342} 349}
343 350
344sub set_text { 351sub set_text {
345 my ($self, $text) = @_; 352 my ($self, $text) = @_;
353
354 $self->{text} = $text;
355
346 $self->{texture} = new_from_ttf Crossfire::Client::Texture $self->{ttf}, $self->{text} = $text; 356 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
347} 357}
348 358
349sub get_text { 359sub get_text {
350 my ($self, $text) = @_; 360 my ($self, $text) = @_;
361
351 $self->{text} 362 $self->{text}
352} 363}
353 364
354sub size_request { 365sub size_request {
355 my ($self) = @_; 366 my ($self) = @_;
… …
365 376
366 my $tex = $self->{texture}; 377 my $tex = $self->{texture};
367 378
368 glEnable GL_BLEND; 379 glEnable GL_BLEND;
369 glEnable GL_TEXTURE_2D; 380 glEnable GL_TEXTURE_2D;
381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
370 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 382 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
371 glBindTexture GL_TEXTURE_2D, $tex->{name}; 383 glBindTexture GL_TEXTURE_2D, $tex->{name};
372 384
373 glColor 1, 1, 1; 385 glColor 1, 1, 1, 0.8;
374 386
375 glBegin GL_QUADS; 387 glBegin GL_QUADS;
376 glTexCoord 0, 0; glVertex 0 , 0; 388 glTexCoord 0, 0; glVertex 0 , 0;
377 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 389 glTexCoord 0, 1; glVertex 0 , $tex->{height};
378 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 390 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
… …
381 393
382 glDisable GL_BLEND; 394 glDisable GL_BLEND;
383 glDisable GL_TEXTURE_2D; 395 glDisable GL_TEXTURE_2D;
384} 396}
385 397
398package Crossfire::Client::Widget::TextEntry;
399
400our @ISA = Crossfire::Client::Widget::Label::;
401
402use SDL;
403use SDL::OpenGL;
404
405sub key_down {
406 my ($self, $ev) = @_;
407
408 my $mod = $ev->key_mod;
409 my $sym = $ev->key_sym;
410
411 $ev->set_unicode (1);
412 my $uni = $ev->key_unicode;
413
414 my $text = $self->get_text;
415
416 if ($sym == SDLK_BACKSPACE) {
417 substr $text, -1, 1, '';
418
419 } elsif ($uni) {
420 $text .= chr $uni;
421 }
422 $self->set_text ($text);
423}
424
425
426# XXX: TextView isn't neccessary with pango multiline text rendering
386package Crossfire::Client::Widget::TextView; 427package Crossfire::Client::Widget::TextView;
387 428
388use strict; 429use strict;
389 430
390our @ISA = qw/Crossfire::Client::Widget/; 431our @ISA = qw/Crossfire::Client::Widget/;
391 432
392use SDL::OpenGL; 433use SDL::OpenGL;
393use SDL::OpenGL::Constants; 434use SDL::OpenGL::Constants;
435
436sub new {
437 my ($class, $text, $h) = @_;
438 my $self = $class->SUPER::new ();
439
440 $self->{txt_height} = $h;
441 @{$self->{lines}} = split /\r?\n/, $text;
442
443 for (split /\r?\n/, $text) {
444 $self->add_line ($_);
445 }
446 $self
447}
448
449#sub render_lines {
450# my ($self) = @_;
451#
452# $self->{txt_lines} = [];
453#
454# for (@{$self->{lines}}) {
455# push @{$self->{txt_lines}},
456# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
457# }
458#}
394 459
395sub add_line { 460sub add_line {
396 my ($self, $line) = @_; 461 my ($self, $line) = @_;
397 push @{$self->{lines}}, $line; 462 push @{$self->{lines}}, $line;
398}
399 463
464 push @{$self->{txt_lines}},
465 new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
466}
467
468sub size_request {
469 my ($self) = @_;
470
471 my $w = 0;
472 my $h = 0;
473
474 for (@{$self->{txt_lines}}) {
475 if ($w < $_->{width}) { $w = $_->{width} }
476 $h += $_->{height};
477 }
478
479 return ($w, $h);
480}
481
400sub _draw { 482sub draw_line {
401 my ($self) = @_; 483 my ($self, $tex, $y) = @_;
402 484
485 glBindTexture GL_TEXTURE_2D, $tex->{name};
486
487 glColor 1, 0, 1;
488
489 glBegin GL_QUADS;
490 glTexCoord 0, 0; glVertex 0 , $y;
491 glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
492 glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
493 glTexCoord 1, 0; glVertex $tex->{width}, $y;
494 glEnd;
495}
496
497sub _draw {
498 my ($self) = @_;
499
500 glEnable GL_BLEND;
501 glEnable GL_TEXTURE_2D;
502 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
503
504 my $l = 0;
505 for (@{$self->{txt_lines}}) {
506 $self->draw_line ($_, $l);
507 $l += $_->{height};
508 }
509
510 glDisable GL_BLEND;
511 glDisable GL_TEXTURE_2D;
403} 512}
404 513
405package Crossfire::Client::Widget::MapWidget; 514package Crossfire::Client::Widget::MapWidget;
406 515
407use strict; 516use strict;
… …
433 542
434 my $sw = 1 + int $::WIDTH / 32; 543 my $sw = 1 + int $::WIDTH / 32;
435 my $sh = 1 + int $::HEIGHT / 32; 544 my $sh = 1 + int $::HEIGHT / 32;
436 545
437 if ($::CONN->{mapw} > $sw) { 546 if ($::CONN->{mapw} > $sw) {
438 $xofs = ($sw - $::CONN->{mapw}) * 0.5; 547 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
439 } else { 548 } else {
440 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 549 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
441 } 550 }
442 551
443 if ($::CONN->{maph} > $sh) { 552 if ($::CONN->{maph} > $sh) {
444 $yofs = ($sh - $::CONN->{maph}) * 0.5; 553 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
445 } else { 554 } else {
446 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 555 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
447 } 556 }
448 557
449 glEnable GL_TEXTURE_2D; 558 glEnable GL_TEXTURE_2D;
450 glEnable GL_BLEND; 559 glEnable GL_BLEND;
451 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
452
453 warn "<$mx,$my> <$xofs,$yofs>\n";#d#
454 561
455 for my $x (0 .. $sw - 1) { 562 for my $x (0 .. $sw - 1) {
456 for my $y (0 .. $sh - 1) { 563 for my $y (0 .. $sh - 1) {
457 564
458 my $cell = $map->[$x + $xofs][$y + $yofs] 565 my $cell = $map->[$x + $xofs][$y + $yofs]

Diff Legend

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