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.58 by root, Tue Apr 11 12:21:29 2006 UTC vs.
Revision 1.61 by root, Tue Apr 11 13:17:24 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10use Crossfire::Client; 10use CFClient;
11 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13 13
14our $TOPLEVEL; 14our $TOPLEVEL;
15our $BUTTON_STATE; 15our $BUTTON_STATE;
… …
210 #$self->deactivate; 210 #$self->deactivate;
211} 211}
212 212
213############################################################################# 213#############################################################################
214 214
215package Crossfire::Client::Widget::Container; 215package CFClient::Widget::Container;
216 216
217our @ISA = Crossfire::Client::Widget::; 217our @ISA = CFClient::Widget::;
218 218
219sub new { 219sub new {
220 my ($class, @widgets) = @_; 220 my ($class, @widgets) = @_;
221 221
222 my $self = $class->SUPER::new (children => []); 222 my $self = $class->SUPER::new (children => []);
… …
269 $_->draw for @{$self->{children}}; 269 $_->draw for @{$self->{children}};
270} 270}
271 271
272############################################################################# 272#############################################################################
273 273
274package Crossfire::Client::Widget::Bin; 274package CFClient::Widget::Bin;
275 275
276our @ISA = Crossfire::Client::Widget::Container::; 276our @ISA = CFClient::Widget::Container::;
277 277
278sub child { $_[0]->{children}[0] } 278sub child { $_[0]->{children}[0] }
279 279
280sub size_request { 280sub size_request {
281 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 281 $_[0]{children}[0]->size_request if $_[0]{children}[0];
… …
289 if $self->{children}[0] 289 if $self->{children}[0]
290} 290}
291 291
292############################################################################# 292#############################################################################
293 293
294package Crossfire::Client::Widget::Window; 294package CFClient::Widget::Window;
295 295
296our @ISA = Crossfire::Client::Widget::Bin::; 296our @ISA = CFClient::Widget::Bin::;
297 297
298use SDL::OpenGL; 298use SDL::OpenGL;
299 299
300sub new { 300sub new {
301 my ($class, $x, $y, $z, $w, $h) = @_; 301 my ($class, $x, $y, $z, $w, $h) = @_;
… …
314 314
315sub render_chld { 315sub render_chld {
316 my ($self) = @_; 316 my ($self) = @_;
317 317
318 $self->{texture} = 318 $self->{texture} =
319 Crossfire::Client::Texture->new_from_opengl ( 319 CFClient::Texture->new_from_opengl (
320 $self->{w}, $self->{h}, sub { $self->child->draw } 320 $self->{w}, $self->{h}, sub { $self->child->draw }
321 ); 321 );
322} 322}
323 323
324sub size_allocate { 324sub size_allocate {
… …
350 glDisable GL_TEXTURE_2D; 350 glDisable GL_TEXTURE_2D;
351} 351}
352 352
353############################################################################# 353#############################################################################
354 354
355package Crossfire::Client::Widget::Frame; 355package CFClient::Widget::Frame;
356 356
357our @ISA = Crossfire::Client::Widget::Bin::; 357our @ISA = CFClient::Widget::Bin::;
358 358
359use SDL::OpenGL; 359use SDL::OpenGL;
360 360
361sub size_request { 361sub size_request {
362 my ($self) = @_; 362 my ($self) = @_;
… …
396 $chld->draw; 396 $chld->draw;
397} 397}
398 398
399############################################################################# 399#############################################################################
400 400
401package Crossfire::Client::Widget::FancyFrame; 401package CFClient::Widget::FancyFrame;
402 402
403our @ISA = Crossfire::Client::Widget::Bin::; 403our @ISA = CFClient::Widget::Bin::;
404 404
405use SDL::OpenGL; 405use SDL::OpenGL;
406 406
407my @tex = 407my @tex =
408 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 408 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
409 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 409 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
410 410
411sub size_request { 411sub size_request {
412 my ($self) = @_; 412 my ($self) = @_;
413 413
… …
479 479
480} 480}
481 481
482############################################################################# 482#############################################################################
483 483
484package Crossfire::Client::Widget::Table; 484package CFClient::Widget::Table;
485 485
486our @ISA = Crossfire::Client::Widget::Bin::; 486our @ISA = CFClient::Widget::Bin::;
487 487
488use SDL::OpenGL; 488use SDL::OpenGL;
489 489
490sub add { 490sub add {
491 my ($self, $x, $y, $chld) = @_; 491 my ($self, $x, $y, $chld) = @_;
… …
566 } 566 }
567} 567}
568 568
569############################################################################# 569#############################################################################
570 570
571package Crossfire::Client::Widget::VBox; 571package CFClient::Widget::VBox;
572 572
573our @ISA = Crossfire::Client::Widget::Container::; 573our @ISA = CFClient::Widget::Container::;
574 574
575use SDL::OpenGL; 575use SDL::OpenGL;
576 576
577sub size_request { 577sub size_request {
578 my ($self) = @_; 578 my ($self) = @_;
… …
626 } 626 }
627} 627}
628 628
629############################################################################# 629#############################################################################
630 630
631package Crossfire::Client::Widget::Label; 631package CFClient::Widget::Label;
632 632
633our @ISA = Crossfire::Client::Widget::; 633our @ISA = CFClient::Widget::;
634 634
635use SDL::OpenGL; 635use SDL::OpenGL;
636 636
637sub new { 637sub new {
638 my ($class, $x, $y, $z, $height, $text) = @_; 638 my ($class, $x, $y, $z, $height, $text) = @_;
639 639
640 $height ||= $::FONTSIZE; 640 $height ||= $::FONTSIZE;
641 641
642 # TODO: color, and make height, xyz etc. optional 642 # TODO: color, and make height, xyz etc. optional
643 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 643 my $self = $class->SUPER::new (
644 x => $x,
645 y => $y,
646 z => $z,
647 height => $height,
648 layout => new CFClient::Layout $height,
649 );
644 650
645 $self->set_text ($text); 651 $self->set_text ($text);
646 652
647 $self 653 $self
648} 654}
649 655
650sub set_text { 656sub set_text {
651 my ($self, $text) = @_; 657 my ($self, $text) = @_;
652 658
653 $self->{text} = $text; 659 $self->{text} = $text;
654 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 660 $self->{layout}->set_markup ($text);
655 661
656 $self->update; 662 delete $self->{texture};
657} 663}
658 664
659sub get_text { 665sub get_text {
660 my ($self, $text) = @_; 666 my ($self, $text) = @_;
661 667
… …
663} 669}
664 670
665sub size_request { 671sub size_request {
666 my ($self) = @_; 672 my ($self) = @_;
667 673
674 $self->{layout}->set_width;
675 $self->{layout}->size
668 if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 676# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
669 ( 677# (
670 $self->{texture}{width}, 678# $self->{texture}{width},
671 $self->{texture}{height}, 679# $self->{texture}{height},
672 ) 680# )
673 } else { 681# } else {
674 my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height}; 682# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
675 683#
676 ($w, $h) 684# ($w, $h)
677 } 685# }
686}
678 687
688sub size_allocate {
689 my ($self, $w, $h) = @_;
690
691 $self->SUPER::size_allocate ($w, $h);
692 delete $self->{texture};
679} 693}
680 694
681sub _draw { 695sub _draw {
682 my ($self) = @_; 696 my ($self) = @_;
683 697
684 my $tex = $self->{texture}; 698 my $tex = $self->{texture} ||= do {
699 $self->{layout}->set_width ($self->{w});
700 new_from_layout CFClient::Texture $self->{layout};
701 };
685 702
686 glEnable GL_BLEND; 703 glEnable GL_BLEND;
687 glEnable GL_TEXTURE_2D; 704 glEnable GL_TEXTURE_2D;
688 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
689 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
… …
696 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
697} 714}
698 715
699############################################################################# 716#############################################################################
700 717
701package Crossfire::Client::Widget::Entry; 718package CFClient::Widget::Entry;
702 719
703our @ISA = Crossfire::Client::Widget::Label::; 720our @ISA = CFClient::Widget::Label::;
704 721
705use SDL; 722use SDL;
706use SDL::OpenGL; 723use SDL::OpenGL;
707 724
708sub key_down { 725sub key_down {
… …
754 $self->SUPER::_draw; 771 $self->SUPER::_draw;
755} 772}
756 773
757############################################################################# 774#############################################################################
758 775
759package Crossfire::Client::Widget::MapWidget; 776package CFClient::Widget::MapWidget;
760 777
761use strict; 778use strict;
762 779
763use List::Util qw(min max); 780use List::Util qw(min max);
764 781
765use SDL; 782use SDL;
766use SDL::OpenGL; 783use SDL::OpenGL;
767use SDL::OpenGL::Constants; 784use SDL::OpenGL::Constants;
768 785
769our @ISA = Crossfire::Client::Widget::; 786our @ISA = CFClient::Widget::;
770 787
771sub key_down { 788sub key_down {
772 print "MAPKEYDOWN\n"; 789 print "MAPKEYDOWN\n";
773} 790}
774 791
… …
850# } 867# }
851 868
852 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 869 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 870 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
854 871
855 $darkness = new Crossfire::Client::Texture 872 $darkness = new CFClient::Texture
856 width => $sw4, 873 width => $sw4,
857 height => $sh, 874 height => $sh,
858 data => $darkness, 875 data => $darkness,
859 internalformat => GL_ALPHA, 876 internalformat => GL_ALPHA,
860 format => GL_ALPHA; 877 format => GL_ALPHA;
… …
917 } 934 }
918} 935}
919 936
920############################################################################# 937#############################################################################
921 938
922package Crossfire::Client::Widget::Animator; 939package CFClient::Widget::Animator;
923 940
924use SDL::OpenGL; 941use SDL::OpenGL;
925 942
926our @ISA = Crossfire::Client::Widget::Bin::; 943our @ISA = CFClient::Widget::Bin::;
927 944
928sub moveto { 945sub moveto {
929 my ($self, $x, $y) = @_; 946 my ($self, $x, $y) = @_;
930 947
931 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 948 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
959 glPopMatrix; 976 glPopMatrix;
960} 977}
961 978
962############################################################################# 979#############################################################################
963 980
964package Crossfire::Client::Widget::Toplevel; 981package CFClient::Widget::Toplevel;
965 982
966our @ISA = Crossfire::Client::Widget::Container::; 983our @ISA = CFClient::Widget::Container::;
967 984
968sub size_request { 985sub size_request {
969 ($::WIDTH, $::HEIGHT) 986 ($::WIDTH, $::HEIGHT)
970} 987}
971 988
… …
1005 $self->_draw; 1022 $self->_draw;
1006} 1023}
1007 1024
1008############################################################################# 1025#############################################################################
1009 1026
1010package Crossfire::Client::Widget; 1027package CFClient::Widget;
1011 1028
1012$TOPLEVEL = new Crossfire::Client::Widget::Toplevel; 1029$TOPLEVEL = new CFClient::Widget::Toplevel;
1013 1030
10141 10311
1015 1032

Diff Legend

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