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.64 by root, Tue Apr 11 13:38:22 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, %arg) = @_;
221
222 my $children = delete $arg{children} || [];
221 223
222 my $self = $class->SUPER::new (children => []); 224 my $self = $class->SUPER::new (children => []);
223 $self->add ($_) for @widgets; 225 $self->add ($_) for @$children;
224 226
225 $self 227 $self
226} 228}
227 229
228sub add { 230sub add {
… …
269 $_->draw for @{$self->{children}}; 271 $_->draw for @{$self->{children}};
270} 272}
271 273
272############################################################################# 274#############################################################################
273 275
274package Crossfire::Client::Widget::Bin; 276package CFClient::Widget::Bin;
275 277
276our @ISA = Crossfire::Client::Widget::Container::; 278our @ISA = CFClient::Widget::Container::;
277 279
278sub child { $_[0]->{children}[0] } 280sub child { $_[0]->{children}[0] }
279 281
280sub size_request { 282sub size_request {
281 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 283 $_[0]{children}[0]->size_request if $_[0]{children}[0];
… …
289 if $self->{children}[0] 291 if $self->{children}[0]
290} 292}
291 293
292############################################################################# 294#############################################################################
293 295
294package Crossfire::Client::Widget::Window; 296package CFClient::Widget::Window;
295 297
296our @ISA = Crossfire::Client::Widget::Bin::; 298our @ISA = CFClient::Widget::Bin::;
297 299
298use SDL::OpenGL; 300use SDL::OpenGL;
299 301
300sub new { 302sub new {
301 my ($class, $x, $y, $z, $w, $h) = @_; 303 my ($class, %arg) = @_;
302 304
303 my $self = $class->SUPER::new; 305 my $self = $class->SUPER::new (%arg);
304
305 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
306} 306}
307 307
308sub update { 308sub update {
309 my ($self) = @_; 309 my ($self) = @_;
310 310
311 # we want to do this delayed...
311 $self->render_chld; 312 $self->render_chld;
312 $self->SUPER::update; 313 $self->SUPER::update;
313} 314}
314 315
315sub render_chld { 316sub render_chld {
316 my ($self) = @_; 317 my ($self) = @_;
317 318
318 $self->{texture} = 319 $self->{texture} =
319 Crossfire::Client::Texture->new_from_opengl ( 320 CFClient::Texture->new_from_opengl (
320 $self->{w}, $self->{h}, sub { $self->child->draw } 321 $self->{w}, $self->{h}, sub { $self->child->draw }
321 ); 322 );
322} 323}
323 324
324sub size_allocate { 325sub size_allocate {
… …
350 glDisable GL_TEXTURE_2D; 351 glDisable GL_TEXTURE_2D;
351} 352}
352 353
353############################################################################# 354#############################################################################
354 355
355package Crossfire::Client::Widget::Frame; 356package CFClient::Widget::Frame;
356 357
357our @ISA = Crossfire::Client::Widget::Bin::; 358our @ISA = CFClient::Widget::Bin::;
358 359
359use SDL::OpenGL; 360use SDL::OpenGL;
360 361
361sub size_request { 362sub size_request {
362 my ($self) = @_; 363 my ($self) = @_;
… …
396 $chld->draw; 397 $chld->draw;
397} 398}
398 399
399############################################################################# 400#############################################################################
400 401
401package Crossfire::Client::Widget::FancyFrame; 402package CFClient::Widget::FancyFrame;
402 403
403our @ISA = Crossfire::Client::Widget::Bin::; 404our @ISA = CFClient::Widget::Bin::;
404 405
405use SDL::OpenGL; 406use SDL::OpenGL;
406 407
407my @tex = 408my @tex =
408 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 409 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); 410 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
410 411
411sub size_request { 412sub size_request {
412 my ($self) = @_; 413 my ($self) = @_;
413 414
… …
479 480
480} 481}
481 482
482############################################################################# 483#############################################################################
483 484
484package Crossfire::Client::Widget::Table; 485package CFClient::Widget::Table;
485 486
486our @ISA = Crossfire::Client::Widget::Bin::; 487our @ISA = CFClient::Widget::Bin::;
487 488
488use SDL::OpenGL; 489use SDL::OpenGL;
489 490
490sub add { 491sub add {
491 my ($self, $x, $y, $chld) = @_; 492 my ($self, $x, $y, $chld) = @_;
… …
566 } 567 }
567} 568}
568 569
569############################################################################# 570#############################################################################
570 571
571package Crossfire::Client::Widget::VBox; 572package CFClient::Widget::VBox;
572 573
573our @ISA = Crossfire::Client::Widget::Container::; 574our @ISA = CFClient::Widget::Container::;
574 575
575use SDL::OpenGL; 576use SDL::OpenGL;
576 577
577sub size_request { 578sub size_request {
578 my ($self) = @_; 579 my ($self) = @_;
… …
626 } 627 }
627} 628}
628 629
629############################################################################# 630#############################################################################
630 631
631package Crossfire::Client::Widget::Label; 632package CFClient::Widget::Label;
632 633
633our @ISA = Crossfire::Client::Widget::; 634our @ISA = CFClient::Widget::;
634 635
635use SDL::OpenGL; 636use SDL::OpenGL;
636 637
637sub new { 638sub new {
638 my ($class, $x, $y, $z, $height, $text) = @_; 639 my ($class, %arg) = @_;
639
640 $height ||= $::FONTSIZE;
641 640
642 # TODO: color, and make height, xyz etc. optional 641 # TODO: color, and make height, xyz etc. optional
643 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 642 my $self = $class->SUPER::new (
643 color => [1, 1, 1],
644 height => $::FONTSIZE,
645 text => "",
646 layout => new CFClient::Layout,
647 %arg
648 );
644 649
645 $self->set_text ($text); 650 $self->set_text ($self->{text});
646 651
647 $self 652 $self
648} 653}
649 654
650sub set_text { 655sub set_text {
651 my ($self, $text) = @_; 656 my ($self, $text) = @_;
652 657
653 $self->{text} = $text; 658 $self->{text} = $text;
654 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 659 $self->{layout}->set_markup ($text);
655 660
656 $self->update; 661 delete $self->{texture};
657} 662}
658 663
659sub get_text { 664sub get_text {
660 my ($self, $text) = @_; 665 my ($self, $text) = @_;
661 666
… …
663} 668}
664 669
665sub size_request { 670sub size_request {
666 my ($self) = @_; 671 my ($self) = @_;
667 672
673 $self->{layout}->set_width;
674 $self->{layout}->set_height ($self->{height});
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;
690 707
691 glColor 1, 0, 0, 1; # TODO color 708 glColor @{$self->{color}};
692 709
693 $tex->draw_quad (0, 0); 710 $tex->draw_quad (0, 0);
694 711
695 glDisable GL_BLEND; 712 glDisable GL_BLEND;
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::;
787
788sub new {
789 my $class = shift;
790
791 $class->SUPER::new (z => -1, @_)
792}
770 793
771sub key_down { 794sub key_down {
772 print "MAPKEYDOWN\n"; 795 print "MAPKEYDOWN\n";
773} 796}
774 797
… …
850# } 873# }
851 874
852 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 875 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 876 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
854 877
855 $darkness = new Crossfire::Client::Texture 878 $darkness = new CFClient::Texture
856 width => $sw4, 879 width => $sw4,
857 height => $sh, 880 height => $sh,
858 data => $darkness, 881 data => $darkness,
859 internalformat => GL_ALPHA, 882 internalformat => GL_ALPHA,
860 format => GL_ALPHA; 883 format => GL_ALPHA;
… …
917 } 940 }
918} 941}
919 942
920############################################################################# 943#############################################################################
921 944
922package Crossfire::Client::Widget::Animator; 945package CFClient::Widget::Animator;
923 946
924use SDL::OpenGL; 947use SDL::OpenGL;
925 948
926our @ISA = Crossfire::Client::Widget::Bin::; 949our @ISA = CFClient::Widget::Bin::;
927 950
928sub moveto { 951sub moveto {
929 my ($self, $x, $y) = @_; 952 my ($self, $x, $y) = @_;
930 953
931 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 954 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
959 glPopMatrix; 982 glPopMatrix;
960} 983}
961 984
962############################################################################# 985#############################################################################
963 986
964package Crossfire::Client::Widget::Toplevel; 987package CFClient::Widget::Toplevel;
965 988
966our @ISA = Crossfire::Client::Widget::Container::; 989our @ISA = CFClient::Widget::Container::;
967 990
968sub size_request { 991sub size_request {
969 ($::WIDTH, $::HEIGHT) 992 ($::WIDTH, $::HEIGHT)
970} 993}
971 994
… …
1005 $self->_draw; 1028 $self->_draw;
1006} 1029}
1007 1030
1008############################################################################# 1031#############################################################################
1009 1032
1010package Crossfire::Client::Widget; 1033package CFClient::Widget;
1011 1034
1012$TOPLEVEL = new Crossfire::Client::Widget::Toplevel; 1035$TOPLEVEL = new CFClient::Widget::Toplevel;
1013 1036
10141 10371
1015 1038

Diff Legend

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