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.261 by elmex, Tue May 30 14:45:56 2006 UTC vs.
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC

… …
40 40
41 $LAYOUT = $layout; 41 $LAYOUT = $layout;
42} 42}
43 43
44sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
45 if (!$GRAB) { 47 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide; 51 $TOOLTIP->hide;
51 52
52 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
53 54
… …
170sub rescale_widgets { 171sub rescale_widgets {
171 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
172 173
173 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 178
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 185
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 188
188 } 189 }
189 } 190 }
190 191
191 reconfigure_widgets; 192 reconfigure_widgets;
… …
370sub size_allocate { 371sub size_allocate {
371 # nothing to be done 372 # nothing to be done
372} 373}
373 374
374sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
375} 381}
376 382
377sub set_max_size { 383sub set_max_size {
378 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
379 385
… …
438 444
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
440 unless $FOCUS; 446 unless $FOCUS;
441} 447}
442 448
443sub mouse_motion { } 449sub mouse_motion { 0 }
444sub button_up { } 450sub button_up { 0 }
445sub key_down { } 451sub key_down { 0 }
446sub key_up { } 452sub key_up { 0 }
447 453
448sub button_down { 454sub button_down {
449 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
450 456
451 $self->focus_in; 457 $self->focus_in;
452}
453 458
454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459 461
460sub find_widget { 462sub find_widget {
461 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
462 464
463 return () unless $self->{can_events}; 465 return () unless $self->{can_events};
… …
525 527
526 $self->realloc; 528 $self->realloc;
527 $self->update; 529 $self->update;
528} 530}
529 531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535
530sub draw { 536sub draw {
531 my ($self) = @_; 537 my ($self) = @_;
532 538
533 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
534 550
535 glPushMatrix; 551 glPushMatrix;
536 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
537 $self->_draw;
538 glPopMatrix;
539 553
540 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
541 my ($x, $y) = @$self{qw(x y)};
542
543 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
544 glEnable GL_BLEND; 556 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glBegin GL_QUADS; 558 glBegin GL_QUADS;
547 glVertex $x , $y; 559 glVertex 0 , 0;
548 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
549 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
550 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
551 glEnd; 563 glEnd;
552 glDisable GL_BLEND; 564 glDisable GL_BLEND;
553 } 565 }
554 566
555 if ($ENV{CFPLUS_DEBUG} & 1) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix; 568 glPushMatrix;
557 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
559 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0; 572 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
564 glEnd; 576 glEnd;
565 glPopMatrix; 577 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
568} 583}
569 584
570sub _draw { 585sub _draw {
571 my ($self) = @_; 586 my ($self) = @_;
572 587
… …
610 625
611 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
612 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
613 628
614 glEnable GL_BLEND; 629 glEnable GL_BLEND;
615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616 glColor @$color; 631 glColor_premultiply @$color;
617 632
618 glBegin GL_QUADS; 633 glBegin GL_QUADS;
619 glVertex 0 , 0; 634 glVertex 0 , 0;
620 glVertex 0 , $h; 635 glVertex 0 , $h;
621 glVertex $w, $h; 636 glVertex $w, $h;
… …
652our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
653 668
654sub new { 669sub new {
655 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
656 671
657 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
658 673
659 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
660 children => [], 675 children => [],
661 can_events => 0, 676 can_events => 0,
662 %arg, 677 %arg,
663 ); 678 );
679
664 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
665 682
666 $self 683 $self
667} 684}
668 685
669sub add { 686sub add {
… …
717 $x -= $self->{x}; 734 $x -= $self->{x};
718 $y -= $self->{y}; 735 $y -= $self->{y};
719 736
720 my $res; 737 my $res;
721 738
722 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
723 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
724 and return $res; 741 and return $res;
725 } 742 }
726 743
727 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
776 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
777} 794}
778 795
779############################################################################# 796#############################################################################
780 797
798# back-buffered drawing area
799
781package CFClient::UI::Window; 800package CFClient::UI::Window;
782 801
783our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
784 803
785use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
803 $self->SUPER::size_allocate ($w, $h); 822 $self->SUPER::size_allocate ($w, $h);
804 $self->update; 823 $self->update;
805} 824}
806 825
807sub _render { 826sub _render {
827 my ($self) = @_;
828
808 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
809} 830}
810 831
811sub render_child { 832sub render_child {
812 my ($self) = @_; 833 my ($self) = @_;
813 834
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
817 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
818 $self->_render; 846 $self->_render;
819 }; 847 };
820} 848}
821 849
822sub _draw { 850sub _draw {
823 my ($self) = @_; 851 my ($self) = @_;
824 852
825 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
826 854
827 my $tex = $self->{texture} 855 my $tex = $self->{texture}
828 or return; 856 or return;
829 857
830 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1; 860 glColor 0, 0, 0, 1;
833 861
834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
835 863
836 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
837} 865}
… …
913} 941}
914 942
915sub _render { 943sub _render {
916 my ($self) = @_; 944 my ($self) = @_;
917 945
946 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
947 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
948
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 949 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 950
920 $self->SUPER::_render; 951 $self->SUPER::_render;
921} 952}
922 953
… …
925package CFClient::UI::ScrolledWindow; 956package CFClient::UI::ScrolledWindow;
926 957
927our @ISA = CFClient::UI::HBox::; 958our @ISA = CFClient::UI::HBox::;
928 959
929sub new { 960sub new {
930 my $class = shift; 961 my ($class, %arg) = @_;
962
963 my $child = delete $arg{child};
931 964
932 my $self; 965 my $self;
933 966
934 my $slider = new CFClient::UI::Slider 967 my $slider = new CFClient::UI::Slider
935 vertical => 1, 968 vertical => 1,
… …
940 ; 973 ;
941 974
942 $self = $class->SUPER::new ( 975 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 976 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider, 977 slider => $slider,
945 @_, 978 %arg,
946 ); 979 );
947 980
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider}); 981 $self->SUPER::add ($self->{vp}, $self->{slider});
982 $self->add ($child) if $child;
951 983
952 $self 984 $self
985}
986
987sub add {
988 my ($self, $widget) = @_;
989
990 $self->{vp}->add ($self->{child} = $widget);
953} 991}
954 992
955sub update { 993sub update {
956 my ($self) = @_; 994 my ($self) = @_;
957 995
… …
996 1034
997 if ($self->{bg}) { 1035 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)}; 1036 my ($w, $h) = @$self{qw(w h)};
999 1037
1000 glEnable GL_BLEND; 1038 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1039 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} }; 1040 glColor_premultiply @{ $self->{bg} };
1003 1041
1004 glBegin GL_QUADS; 1042 glBegin GL_QUADS;
1005 glVertex 0 , 0; 1043 glVertex 0 , 0;
1006 glVertex 0 , $h; 1044 glVertex 0 , $h;
1007 glVertex $w, $h; 1045 glVertex $w, $h;
… …
1029my @border = 1067my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1069 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1070
1033sub new { 1071sub new {
1034 my $class = shift; 1072 my ($class, %arg) = @_;
1073
1074 my $title = delete $arg{title};
1035 1075
1036 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1079 border => 0.6,
1040 can_events => 1, 1080 can_events => 1,
1041 min_w => 16, 1081 min_w => 16,
1042 min_h => 16, 1082 min_h => 16,
1043 @_ 1083 %arg,
1044 ); 1084 );
1045 1085
1046 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title} = new CFClient::UI::Label
1047 align => 0, 1087 align => 0,
1048 valign => 1, 1088 valign => 1,
1049 text => $self->{title}, 1089 text => $title,
1050 fontsize => $self->{border}; 1090 fontsize => $self->{border}
1091 if defined $title;
1051 1092
1052 $self 1093 $self
1094}
1095
1096sub add {
1097 my ($self, @widgets) = @_;
1098
1099 $self->SUPER::add (@widgets);
1100 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1053} 1101}
1054 1102
1055sub border { 1103sub border {
1056 int $_[0]{border} * $::FONTSIZE 1104 int $_[0]{border} * $::FONTSIZE
1057} 1105}
1058 1106
1059sub size_request { 1107sub size_request {
1060 my ($self) = @_; 1108 my ($self) = @_;
1109
1110 $self->{title}->size_request
1111 if $self->{title};
1061 1112
1062 my ($w, $h) = $self->SUPER::size_request; 1113 my ($w, $h) = $self->SUPER::size_request;
1063 1114
1064 ( 1115 (
1065 $w + $self->border * 2, 1116 $w + $self->border * 2,
… …
1068} 1119}
1069 1120
1070sub size_allocate { 1121sub size_allocate {
1071 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
1072 1123
1124 if ($self->{title}) {
1125 $self->{title}{w} = $w;
1126 $self->{title}{h} = $h;
1127 $self->{title}->size_allocate ($w, $h);
1128 }
1129
1130 my $border = $self->border;
1131
1073 $h -= List::Util::max 0, $self->border * 2; 1132 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1133 $w -= List::Util::max 0, $border * 2;
1075 1134
1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077 if $self->{title};
1078
1079 $self->child->configure ($self->border, $self->border, $w, $h); 1135 $self->child->configure ($border, $border, $w, $h);
1080} 1136}
1081 1137
1082sub button_down { 1138sub button_down {
1083 my ($self, $ev, $x, $y) = @_; 1139 my ($self, $ev, $x, $y) = @_;
1084 1140
… …
1103 my $dy = $ev->{y} - $oy; 1159 my $dy = $ev->{y} - $oy;
1104 1160
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1161 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1162 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1163
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1165 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1166 };
1111 1167
1112 } elsif ($lr ^ $td) { 1168 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1169 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1170 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
1118 1174
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1175 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1176
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1178 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1180 };
1181 } else {
1182 return 0;
1183 }
1184
1123 } 1185 1
1124} 1186}
1125 1187
1126sub button_up { 1188sub button_up {
1127 my ($self, $ev, $x, $y) = @_; 1189 my ($self, $ev, $x, $y) = @_;
1128 1190
1129 delete $self->{motion}; 1191 !!delete $self->{motion}
1130} 1192}
1131 1193
1132sub mouse_motion { 1194sub mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1195 my ($self, $ev, $x, $y) = @_;
1134 1196
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1197 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198
1199 !!$self->{motion}
1136} 1200}
1137 1201
1138sub _draw { 1202sub _draw {
1139 my ($self) = @_; 1203 my ($self) = @_;
1140 1204
1205 my $child = $self->{children}[0];
1206
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1207 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1208 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1209
1144 glEnable GL_TEXTURE_2D; 1210 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1212
1147 my $border = $self->border; 1213 my $border = $self->border;
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1228 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1229 }
1164 1230
1165 glDisable GL_TEXTURE_2D; 1231 glDisable GL_TEXTURE_2D;
1166 1232
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1233 $child->draw;
1234
1235 if ($self->{title}) {
1236 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw;
1238 }
1170} 1239}
1171 1240
1172############################################################################# 1241#############################################################################
1173 1242
1174package CFClient::UI::Table; 1243package CFClient::UI::Table;
… …
1522} 1591}
1523 1592
1524sub size_allocate { 1593sub size_allocate {
1525 my ($self, $w, $h) = @_; 1594 my ($self, $w, $h) = @_;
1526 1595
1596 delete $self->{ox};
1597
1527 delete $self->{texture}; 1598 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1528} 1600}
1529 1601
1530sub set_fontsize { 1602sub set_fontsize {
1531 my ($self, $fontsize) = @_; 1603 my ($self, $fontsize) = @_;
1532 1604
… …
1547 $self->{layout}->set_width ($self->{w}); 1619 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1620 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551 1623
1552 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1624 new_from_layout CFClient::Texture $self->{layout}
1625 };
1553 1626
1627 unless (exists $self->{ox}) {
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5); 1630 : ($self->{w} - $tex->{w}) * 0.5);
1557 1631
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5); 1634 : ($self->{h} - $tex->{h}) * 0.5);
1561
1562 $tex
1563 }; 1635 };
1564 1636
1565 glEnable GL_TEXTURE_2D; 1637 glEnable GL_TEXTURE_2D;
1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1567 1639
1640 glColor_premultiply @{$self->{fg}}
1568 if ($tex->{format} == GL_ALPHA) { 1641 if $tex->{format} == GL_ALPHA;
1569 glColor @{$self->{fg}}; 1642
1570 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1571 } else {
1572 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1573 }
1574 1644
1575 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1576} 1646}
1577 1647
1578############################################################################# 1648#############################################################################
… …
1605 1675
1606 delete $self->{cur_h}; 1676 delete $self->{cur_h};
1607 1677
1608 return if $self->{text} eq $text; 1678 return if $self->{text} eq $text;
1609 1679
1610 delete $self->{texture};
1611
1612 $self->{last_activity} = $::NOW; 1680 $self->{last_activity} = $::NOW;
1613 $self->{text} = $text; 1681 $self->{text} = $text;
1614 1682
1615 $text =~ s/./*/g if $self->{hidden}; 1683 $text =~ s/./*/g if $self->{hidden};
1616 $self->{layout}->set_text ("$text "); 1684 $self->{layout}->set_text ("$text ");
1617 1685
1618 $self->_emit (changed => $self->{text}); 1686 $self->_emit (changed => $self->{text});
1687 $self->update;
1619} 1688}
1620 1689
1621sub set_text { 1690sub set_text {
1622 my ($self, $text) = @_; 1691 my ($self, $text) = @_;
1623 1692
… …
1662 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1663 } elsif ($uni == 27) { 1732 } elsif ($uni == 27) {
1664 $self->_emit ('escape'); 1733 $self->_emit ('escape');
1665 } elsif ($uni) { 1734 } elsif ($uni) {
1666 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1667 } 1738 }
1668 1739
1669 $self->_set_text ($text); 1740 $self->_set_text ($text);
1670 1741
1671 $self->realloc; 1742 $self->realloc;
1743
1744 1
1672} 1745}
1673 1746
1674sub focus_in { 1747sub focus_in {
1675 my ($self) = @_; 1748 my ($self) = @_;
1676 1749
… …
1691 utf8::encode $text; 1764 utf8::encode $text;
1692 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1693 1766
1694 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1695 $self->update; 1768 $self->update;
1769
1770 1
1696} 1771}
1697 1772
1698sub mouse_motion { 1773sub mouse_motion {
1699 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1700# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1701} 1778}
1702 1779
1703sub _draw { 1780sub _draw {
1704 my ($self) = @_; 1781 my ($self) = @_;
1705 1782
1706 local $self->{fg} = $self->{fg}; 1783 local $self->{fg} = $self->{fg};
1707 1784
1708 if ($FOCUS == $self) { 1785 if ($FOCUS == $self) {
1709 glColor @{$self->{active_bg}}; 1786 glColor_premultiply @{$self->{active_bg}};
1710 $self->{fg} = $self->{active_fg}; 1787 $self->{fg} = $self->{active_fg};
1711 } else { 1788 } else {
1712 glColor @{$self->{bg}}; 1789 glColor_premultiply @{$self->{bg}};
1713 } 1790 }
1714 1791
1715 glEnable GL_BLEND; 1792 glEnable GL_BLEND;
1716 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1793 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1717 glBegin GL_QUADS; 1794 glBegin GL_QUADS;
1718 glVertex 0 , 0; 1795 glVertex 0 , 0;
1719 glVertex 0 , $self->{h}; 1796 glVertex 0 , $self->{h};
1720 glVertex $self->{w}, $self->{h}; 1797 glVertex $self->{w}, $self->{h};
1721 glVertex $self->{w}, 0; 1798 glVertex $self->{w}, 0;
… …
1782 } else { 1859 } else {
1783 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1784 } 1861 }
1785 1862
1786 } else { 1863 } else {
1787 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1788 } 1867 1
1789
1790} 1868}
1791 1869
1792############################################################################# 1870#############################################################################
1793 1871
1794package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1823 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1824 1902
1825 $self->emit ("activate") 1903 $self->emit ("activate")
1826 if $x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1827 && $y >= 0 && $y < $self->{h}; 1905 && $y >= 0 && $y < $self->{h};
1906
1907 1
1828} 1908}
1829 1909
1830sub _draw { 1910sub _draw {
1831 my ($self) = @_; 1911 my ($self) = @_;
1832 1912
1833 local $self->{fg} = $self->{fg}; 1913 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1834
1835 if ($GRAB == $self) {
1836 $self->{fg} = $self->{active_fg};
1837 }
1838 1914
1839 glEnable GL_TEXTURE_2D; 1915 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 glColor 0, 0, 0, 1; 1917 glColor 0, 0, 0, 1;
1842 1918
… …
1886 1962
1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889 $self->{state} = !$self->{state}; 1965 $self->{state} = !$self->{state};
1890 $self->_emit (changed => $self->{state}); 1966 $self->_emit (changed => $self->{state});
1967 } else {
1968 return 0
1969 }
1970
1891 } 1971 1
1892} 1972}
1893 1973
1894sub _draw { 1974sub _draw {
1895 my ($self) = @_; 1975 my ($self) = @_;
1896 1976
… …
2063 2143
2064 my $h1 = $self->{h} * (1 - $ycut1); 2144 my $h1 = $self->{h} * (1 - $ycut1);
2065 my $h2 = $self->{h} * (1 - $ycut2); 2145 my $h2 = $self->{h} * (1 - $ycut2);
2066 2146
2067 glEnable GL_BLEND; 2147 glEnable GL_BLEND;
2068 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2148 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2069 glEnable GL_TEXTURE_2D; 2150 glEnable GL_TEXTURE_2D;
2070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2071 2152
2072 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2153 glBindTexture GL_TEXTURE_2D, $t1->{name};
2073 glBegin GL_QUADS; 2154 glBegin GL_QUADS;
… …
2234 2315
2235 $self->SUPER::button_down ($ev, $x, $y); 2316 $self->SUPER::button_down ($ev, $x, $y);
2236 2317
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238 2319
2239 $self->mouse_motion ($ev, $x, $y); 2320 $self->mouse_motion ($ev, $x, $y)
2240} 2321}
2241 2322
2242sub mouse_motion { 2323sub mouse_motion {
2243 my ($self, $ev, $x, $y) = @_; 2324 my ($self, $ev, $x, $y) = @_;
2244 2325
… …
2248 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2329 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249 2330
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2331 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251 2332
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2333 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2334 } else {
2335 return 0;
2336 }
2337
2253 } 2338 1
2254} 2339}
2255 2340
2256sub update { 2341sub update {
2257 my ($self) = @_; 2342 my ($self) = @_;
2258 2343
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2344 delete $self->{knob_w};
2345 $self->SUPER::update;
2346}
2347
2348sub _draw {
2349 my ($self) = @_;
2350
2351 unless ($self->{knob_w}) {
2260 $self->set_value ($self->{range}[0]); 2352 $self->set_value ($self->{range}[0]);
2261 2353
2262 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2354 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100; 2355 my $range = ($hi - $page - $lo) || 1e-100;
2264 2356
… …
2270 $value = ($value - $lo) / $range; 2362 $value = ($value - $lo) / $range;
2271 $value = $value * $self->{scale} + $self->{offset}; 2363 $value = $value * $self->{scale} + $self->{offset};
2272 2364
2273 $self->{knob_x} = $value - $knob_w * 0.5; 2365 $self->{knob_x} = $value - $knob_w * 0.5;
2274 $self->{knob_w} = $knob_w; 2366 $self->{knob_w} = $knob_w;
2275 }); 2367 }
2276
2277 $self->SUPER::update;
2278}
2279
2280sub _draw {
2281 my ($self) = @_;
2282 2368
2283 $self->SUPER::_draw (); 2369 $self->SUPER::_draw ();
2284 2370
2285 glScale $self->{w}, $self->{h}; 2371 glScale $self->{w}, $self->{h};
2286 2372
… …
2480 2566
2481 delete $self->{texture}; 2567 delete $self->{texture};
2482 } 2568 }
2483 2569
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 2571 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 2572 glClear GL_COLOR_BUFFER_BIT;
2487 2573
2488 my $top = int $self->{children}[1]{range}[0]; 2574 my $top = int $self->{children}[1]{range}[0];
2489 2575
2490 my $y0 = $top; 2576 my $y0 = $top;
… …
2525sub _draw { 2611sub _draw {
2526 my ($self) = @_; 2612 my ($self) = @_;
2527 2613
2528 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 2616 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2617 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 2618 glDisable GL_TEXTURE_2D;
2533 2619
2534 $self->{children}[1]->draw; 2620 $self->{children}[1]->draw;
2535 2621
2536} 2622}
… …
2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2849 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2764 2850
2765 if ($tex) { 2851 if ($tex) {
2766 glEnable GL_TEXTURE_2D; 2852 glEnable GL_TEXTURE_2D;
2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768 glColor 1, 1, 1, 1; 2854 glColor 0, 0, 0, 1;
2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770 glDisable GL_TEXTURE_2D; 2856 glDisable GL_TEXTURE_2D;
2771 } 2857 }
2772} 2858}
2773 2859
… …
2780 $self->SUPER::DESTROY; 2866 $self->SUPER::DESTROY;
2781} 2867}
2782 2868
2783############################################################################# 2869#############################################################################
2784 2870
2785package CFClient::UI::Inventory; 2871package CFClient::UI::Buttonbar;
2786 2872
2787our @ISA = CFClient::UI::ScrolledWindow::; 2873our @ISA = CFClient::UI::HBox::;
2788 2874
2789sub new { 2875# TODO: should actualyl wrap buttons and other goodies.
2790 my $class = shift;
2791
2792 my $self = $class->SUPER::new (
2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794 @_,
2795 );
2796
2797 $self
2798}
2799
2800sub set_items {
2801 my ($self, $items) = @_;
2802
2803 $self->{scrolled}->clear;
2804 return unless $items;
2805
2806 my @items = sort {
2807 ($a->{type} <=> $b->{type})
2808 or ($a->{name} cmp $b->{name})
2809 } @$items;
2810
2811 $self->{real_items} = \@items;
2812
2813 my $row = 0;
2814 for my $item (@items) {
2815 CFClient::Item::update_widgets $item;
2816
2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2820
2821 $row++;
2822 }
2823}
2824 2876
2825############################################################################# 2877#############################################################################
2826 2878
2827package CFClient::UI::Menu; 2879package CFClient::UI::Menu;
2828 2880
… …
2878 my ($self, $ev, $x, $y) = @_; 2930 my ($self, $ev, $x, $y) = @_;
2879 2931
2880 # TODO: should use vbox->find_widget or so 2932 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER}; 2934 $self->{hover} = $self->{item}{$HOVER};
2935
2936 0
2883} 2937}
2884 2938
2885sub button_up { 2939sub button_up {
2886 my ($self, $ev, $x, $y) = @_; 2940 my ($self, $ev, $x, $y) = @_;
2887 2941
… …
2889 undef $GRAB; 2943 undef $GRAB;
2890 $self->hide; 2944 $self->hide;
2891 2945
2892 $self->_emit ("popdown"); 2946 $self->_emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover}; 2947 $self->{hover}[1]->() if $self->{hover};
2948 } else {
2949 return 0
2950 }
2951
2952 1
2953}
2954
2955#############################################################################
2956
2957package CFClient::UI::Multiplexer;
2958
2959our @ISA = CFClient::UI::Container::;
2960
2961sub new {
2962 my $class = shift;
2963
2964 my $self = $class->SUPER::new (
2965 @_,
2966 );
2967
2968 $self->{current} = $self->{children}[0]
2969 if @{ $self->{children} };
2970
2971 $self
2972}
2973
2974sub add {
2975 my ($self, @widgets) = @_;
2976
2977 $self->SUPER::add (@widgets);
2978
2979 $self->{current} = $self->{children}[0]
2980 if @{ $self->{children} };
2981}
2982
2983sub set_current_page {
2984 my ($self, $page_or_widget) = @_;
2985
2986 my $widget = ref $page_or_widget
2987 ? $page_or_widget
2988 : $self->{children}[$page_or_widget];
2989
2990 $self->{current} = $widget;
2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992
2993 $self->_emit (page_changed => $self->{current});
2994
2995 $self->realloc;
2996}
2997
2998sub visible_children {
2999 $_[0]{current}
3000}
3001
3002sub size_request {
3003 my ($self) = @_;
3004
3005 $self->{current}->size_request
3006}
3007
3008sub size_allocate {
3009 my ($self, $w, $h) = @_;
3010
3011 $self->{current}->configure (0, 0, $w, $h);
3012}
3013
3014sub _draw {
3015 my ($self) = @_;
3016
3017 $self->{current}->draw;
3018}
3019
3020#############################################################################
3021
3022package CFClient::UI::Notebook;
3023
3024our @ISA = CFClient::UI::VBox::;
3025
3026sub new {
3027 my $class = shift;
3028
3029 my $self = $class->SUPER::new (
3030 buttonbar => (new CFClient::UI::Buttonbar),
3031 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3032 # filter => # will be put between multiplexer and $self
3033 @_,
3034 );
2894 } 3035
3036 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3037 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3038
3039 $self
3040}
3041
3042sub add {
3043 my ($self, $title, $widget, $tooltip) = @_;
3044
3045 Scalar::Util::weaken $self;
3046
3047 $self->{buttonbar}->add (new CFClient::UI::Button
3048 markup => $title,
3049 tooltip => $tooltip,
3050 on_activate => sub { $self->set_current_page ($widget) },
3051 );
3052
3053 $self->{multiplexer}->add ($widget);
3054}
3055
3056sub set_current_page {
3057 my ($self, $page) = @_;
3058
3059 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current});
2895} 3061}
2896 3062
2897############################################################################# 3063#############################################################################
2898 3064
2899package CFClient::UI::Statusbox; 3065package CFClient::UI::Statusbox;
… …
3004 $self->SUPER::reconfigure; 3170 $self->SUPER::reconfigure;
3005} 3171}
3006 3172
3007############################################################################# 3173#############################################################################
3008 3174
3009package CFClient::UI::Root; 3175package CFClient::UI::Inventory;
3010 3176
3011our @ISA = CFClient::UI::Container::; 3177our @ISA = CFClient::UI::ScrolledWindow::;
3012
3013use CFClient::OpenGL;
3014 3178
3015sub new { 3179sub new {
3016 my $class = shift; 3180 my $class = shift;
3017 3181
3018 my $self = $class->SUPER::new ( 3182 my $self = $class->SUPER::new (
3019 visible => 1, 3183 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3020 @_, 3184 @_,
3021 ); 3185 );
3022 3186
3023 Scalar::Util::weaken ($self->{root} = $self);
3024
3025 $self 3187 $self
3026} 3188}
3027 3189
3028sub size_request { 3190sub set_items {
3029 my ($self) = @_; 3191 my ($self, $items) = @_;
3030 3192
3031 ($self->{w}, $self->{h}) 3193 $self->{child}->clear;
3032} 3194 return unless $items;
3033 3195
3034sub _to_pixel { 3196 my @items = sort {
3035 my ($coord, $size, $max) = @_; 3197 ($a->{type} <=> $b->{type})
3198 or ($a->{name} cmp $b->{name})
3199 } @$items;
3036 3200
3037 $coord = 3201 $self->{real_items} = \@items;
3038 $coord eq "center" ? ($max - $size) * 0.5
3039 : $coord eq "max" ? $max
3040 : $coord;
3041 3202
3042 $coord = 0 if $coord < 0; 3203 my $row = 0;
3043 $coord = $max - $size if $coord > $max - $size; 3204 for my $item (@items) {
3205 CFClient::Item::update_widgets $item;
3044 3206
3045 int $coord + 0.5 3207 $self->{child}->add (0, $row, $item->{face_widget});
3046} 3208 $self->{child}->add (1, $row, $item->{desc_widget});
3209 $self->{child}->add (2, $row, $item->{weight_widget});
3047 3210
3048sub size_allocate { 3211 $row++;
3049 my ($self, $w, $h) = @_;
3050
3051 for my $child ($self->children) {
3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3053
3054 $X = $child->{force_x} if exists $child->{force_x};
3055 $Y = $child->{force_y} if exists $child->{force_y};
3056
3057 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h};
3059
3060 $child->configure ($X, $Y, $W, $H);
3061 } 3212 }
3062}
3063
3064sub coord2local {
3065 my ($self, $x, $y) = @_;
3066
3067 ($x, $y)
3068}
3069
3070sub coord2global {
3071 my ($self, $x, $y) = @_;
3072
3073 ($x, $y)
3074}
3075
3076sub update {
3077 my ($self) = @_;
3078
3079 $::WANT_REFRESH++;
3080}
3081
3082sub add {
3083 my ($self, @children) = @_;
3084
3085 $_->{is_toplevel} = 1
3086 for @children;
3087
3088 $self->SUPER::add (@children);
3089}
3090
3091sub remove {
3092 my ($self, @children) = @_;
3093
3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 $w->set_invisible;
3103 }
3104}
3105
3106sub on_refresh {
3107 my ($self, $id, $cb) = @_;
3108
3109 $self->{refresh_hook}{$id} = $cb;
3110}
3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
3118sub draw {
3119 my ($self) = @_;
3120
3121 while ($self->{refresh_hook}) {
3122 $_->()
3123 for values %{delete $self->{refresh_hook}};
3124 }
3125
3126 if ($self->{realloc}) {
3127 my @queue;
3128
3129 while () {
3130 if ($self->{realloc}) {
3131 #TODO use array-of-depth approach
3132
3133 use sort 'stable';
3134
3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3136 @queue, values %{delete $self->{realloc}};
3137 }
3138
3139 my $widget = pop @queue || last;
3140
3141 $widget->{visible} or last; # do not resize invisible widgets
3142
3143 my ($w, $h) = $widget->size_request;
3144
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3147
3148 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h};
3150
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3152 || delete $widget->{force_realloc}) {
3153 $widget->{req_w} = $w;
3154 $widget->{req_h} = $h;
3155
3156 $self->{size_alloc}{$widget+0} = $widget;
3157
3158 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent;
3160 #unshift @queue, $parent;
3161 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent;
3163 }
3164 }
3165
3166 delete $self->{realloc}{$widget+0};
3167 }
3168 }
3169
3170 while (my $size_alloc = delete $self->{size_alloc}) {
3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3172 values %$size_alloc;
3173
3174 while () {
3175 my $widget = pop @queue || last;
3176
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178
3179 $w = 0 if $w < 0;
3180 $h = 0 if $h < 0;
3181
3182 $w = int $w + 0.5;
3183 $h = int $h + 0.5;
3184
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3186 $widget->{w} = $w;
3187 $widget->{h} = $h;
3188
3189 $widget->emit (size_allocate => $w, $h);
3190 }
3191 }
3192 }
3193
3194 while ($self->{post_alloc_hook}) {
3195 $_->()
3196 for values %{delete $self->{post_alloc_hook}};
3197 }
3198
3199
3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3202 glClear GL_COLOR_BUFFER_BIT;
3203
3204 glMatrixMode GL_PROJECTION;
3205 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity;
3209
3210 $self->_draw;
3211} 3213}
3212 3214
3213############################################################################# 3215#############################################################################
3214 3216
3215package CFClient::UI::BindEditor; 3217package CFClient::UI::BindEditor;
… …
3310 $rec = $::CONN->stop_record if $::CONN; 3312 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY'; 3313 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec); 3314 $self->set_command_list ($rec);
3313} 3315}
3314 3316
3317
3318sub ask_for_bind_and_commit {
3319 my ($self) = @_;
3320 $self->ask_for_bind (1);
3321}
3322
3315sub ask_for_bind { 3323sub ask_for_bind {
3316 my ($self, $commit) = @_; 3324 my ($self, $commit) = @_;
3317 3325
3318 CFClient::Binder::open_binding_dialog (sub { 3326 CFClient::Binder::open_binding_dialog (sub {
3319 my ($mod, $sym) = @_; 3327 my ($mod, $sym) = @_;
… …
3321 $self->update_binding_widgets; 3329 $self->update_binding_widgets;
3322 $self->commit if $commit; 3330 $self->commit if $commit;
3323 }); 3331 });
3324} 3332}
3325 3333
3334# $mod and $sym are the modifiers and key symbol
3335# $cmds is a array ref of strings (the commands)
3336# $cb is the callback that is executed on OK
3337# $ccb is the callback that is executed on CANCEL and
3338# when the binding was unsuccessful on OK
3326sub set_binding { 3339sub set_binding {
3327 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_; 3340 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3328 3341
3329 $self->clear_command_list; 3342 $self->clear_command_list;
3330 $self->{recording} = 0; 3343 $self->{recording} = 0;
… …
3335 3348
3336 $self->{binding_change} = $cb; 3349 $self->{binding_change} = $cb;
3337 $self->{binding_cancel} = $ccb; 3350 $self->{binding_cancel} = $ccb;
3338 3351
3339 $self->update_binding_widgets; 3352 $self->update_binding_widgets;
3353}
3354
3355# this is a shortcut method that asks for a binding
3356# and then just binds it.
3357sub do_quick_binding {
3358 my ($self, $cmds) = @_;
3359 $self->set_binding (undef, undef, $cmds, sub {
3360 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3361 });
3362 $self->ask_for_bind (1);
3340} 3363}
3341 3364
3342sub update_binding_widgets { 3365sub update_binding_widgets {
3343 my ($self) = @_; 3366 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding; 3367 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3370 3393
3371 for (@$cmds) { 3394 for (@$cmds) {
3372 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox); 3395 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3373 3396
3374 my $i = $idx; 3397 my $i = $idx;
3398 $hb->add (new CFClient::UI::Label text => $_);
3375 $hb->add (new CFClient::UI::Button 3399 $hb->add (new CFClient::UI::Button
3376 text => "delete", 3400 text => "delete",
3377 tooltip => "Deletes the action from the record", 3401 tooltip => "Deletes the action from the record",
3378 on_activate => sub { 3402 on_activate => sub {
3379 $self->{cmdbox}->remove ($hb); 3403 $self->{cmdbox}->remove ($hb);
3380 $cmds->[$i] = undef; 3404 $cmds->[$i] = undef;
3381 }); 3405 });
3382 3406
3383 $hb->add (new CFClient::UI::Label text => $_);
3384 3407
3385 $idx++ 3408 $idx++
3386 } 3409 }
3387} 3410}
3388 3411
3412#############################################################################
3413
3414package CFClient::UI::SpellList;
3415
3416our @ISA = CFClient::UI::Table::;
3417
3418sub new {
3419 my $class = shift;
3420
3421 my $self = $class->SUPER::new (
3422 binding => [],
3423 commands => [],
3424 @_,
3425 )
3426}
3427
3428# XXX: Do sorting? Argl...
3429sub add_spell {
3430 my ($self, $spell) = @_;
3431 $self->{spells}->{$spell->{name}} = $spell;
3432
3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3434 face => $spell->{face},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message});
3438
3439 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440 text => $spell->{name},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message},
3444 expand => 1);
3445
3446 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3449 expand => 1);
3450
3451 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452 text => "bind to key",
3453 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454}
3455
3456sub rebuild_spell_list {
3457 my ($self) = @_;
3458 $self->{tbl_idx} = 0;
3459 $self->add_spell ($_) for values %{$self->{spells}};
3460}
3461
3462sub remove_spell {
3463 my ($self, $spell) = @_;
3464 delete $self->{spells}->{$spell->{name}};
3465 $self->rebuild_spell_list;
3466}
3467
3468#############################################################################
3469
3470package CFClient::UI::Root;
3471
3472our @ISA = CFClient::UI::Container::;
3473
3474use CFClient::OpenGL;
3475
3476sub new {
3477 my $class = shift;
3478
3479 my $self = $class->SUPER::new (
3480 visible => 1,
3481 @_,
3482 );
3483
3484 Scalar::Util::weaken ($self->{root} = $self);
3485
3486 $self
3487}
3488
3489sub size_request {
3490 my ($self) = @_;
3491
3492 ($self->{w}, $self->{h})
3493}
3494
3495sub _to_pixel {
3496 my ($coord, $size, $max) = @_;
3497
3498 $coord =
3499 $coord eq "center" ? ($max - $size) * 0.5
3500 : $coord eq "max" ? $max
3501 : $coord;
3502
3503 $coord = 0 if $coord < 0;
3504 $coord = $max - $size if $coord > $max - $size;
3505
3506 int $coord + 0.5
3507}
3508
3509sub size_allocate {
3510 my ($self, $w, $h) = @_;
3511
3512 for my $child ($self->children) {
3513 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3514
3515 $X = $child->{force_x} if exists $child->{force_x};
3516 $Y = $child->{force_y} if exists $child->{force_y};
3517
3518 $X = _to_pixel $X, $W, $self->{w};
3519 $Y = _to_pixel $Y, $H, $self->{h};
3520
3521 $child->configure ($X, $Y, $W, $H);
3522 }
3523}
3524
3525sub coord2local {
3526 my ($self, $x, $y) = @_;
3527
3528 ($x, $y)
3529}
3530
3531sub coord2global {
3532 my ($self, $x, $y) = @_;
3533
3534 ($x, $y)
3535}
3536
3537sub update {
3538 my ($self) = @_;
3539
3540 $::WANT_REFRESH++;
3541}
3542
3543sub add {
3544 my ($self, @children) = @_;
3545
3546 $_->{is_toplevel} = 1
3547 for @children;
3548
3549 $self->SUPER::add (@children);
3550}
3551
3552sub remove {
3553 my ($self, @children) = @_;
3554
3555 $self->SUPER::remove (@children);
3556
3557 delete $self->{is_toplevel}
3558 for @children;
3559
3560 while (@children) {
3561 my $w = pop @children;
3562 push @children, $w->children;
3563 $w->set_invisible;
3564 }
3565}
3566
3567sub on_refresh {
3568 my ($self, $id, $cb) = @_;
3569
3570 $self->{refresh_hook}{$id} = $cb;
3571}
3572
3573sub on_post_alloc {
3574 my ($self, $id, $cb) = @_;
3575
3576 $self->{post_alloc_hook}{$id} = $cb;
3577}
3578
3579sub draw {
3580 my ($self) = @_;
3581
3582 while ($self->{refresh_hook}) {
3583 $_->()
3584 for values %{delete $self->{refresh_hook}};
3585 }
3586
3587 if ($self->{realloc}) {
3588 my %queue;
3589 my @queue;
3590 my $widget;
3591
3592 outer:
3593 while () {
3594 if (my $realloc = delete $self->{realloc}) {
3595 for $widget (values %$realloc) {
3596 $widget->{visible} or next; # do not resize invisible widgets
3597
3598 $queue{$widget+0}++ and next; # duplicates are common
3599
3600 push @{ $queue[$widget->{visible}] }, $widget;
3601 }
3602 }
3603
3604 while () {
3605 @queue or last outer;
3606
3607 $widget = pop @{ $queue[-1] || [] }
3608 and last;
3609
3610 pop @queue;
3611 }
3612
3613 delete $queue{$widget+0};
3614
3615 my ($w, $h) = $widget->size_request;
3616
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3619
3620 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h};
3622
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3624 || delete $widget->{force_realloc}) {
3625 $widget->{req_w} = $w;
3626 $widget->{req_h} = $h;
3627
3628 $self->{size_alloc}{$widget+0} = $widget;
3629
3630 if (my $parent = $widget->{parent}) {
3631 $self->{realloc}{$parent+0} = $parent
3632 unless $queue{$parent+0};
3633
3634 $parent->{force_size_alloc} = 1;
3635 $self->{size_alloc}{$parent+0} = $parent;
3636 }
3637 }
3638
3639 delete $self->{realloc}{$widget+0};
3640 }
3641 }
3642
3643 while (my $size_alloc = delete $self->{size_alloc}) {
3644 my @queue = sort { $b->{visible} <=> $a->{visible} }
3645 values %$size_alloc;
3646
3647 while () {
3648 my $widget = pop @queue || last;
3649
3650 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3651
3652 $w = 0 if $w < 0;
3653 $h = 0 if $h < 0;
3654
3655 $w = int $w + 0.5;
3656 $h = int $h + 0.5;
3657
3658 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3659 $widget->{old_w} = $widget->{w};
3660 $widget->{old_h} = $widget->{h};
3661
3662 $widget->{w} = $w;
3663 $widget->{h} = $h;
3664
3665 $widget->emit (size_allocate => $w, $h);
3666 }
3667 }
3668 }
3669
3670 while ($self->{post_alloc_hook}) {
3671 $_->()
3672 for values %{delete $self->{post_alloc_hook}};
3673 }
3674
3675
3676 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3677 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3678 glClear GL_COLOR_BUFFER_BIT;
3679
3680 glMatrixMode GL_PROJECTION;
3681 glLoadIdentity;
3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3683 glMatrixMode GL_MODELVIEW;
3684 glLoadIdentity;
3685
3686 {
3687 package CFClient::UI::Base;
3688
3689 ($draw_x, $draw_y, $draw_w, $draw_h) =
3690 (0, 0, $self->{w}, $self->{h});
3691 }
3692
3693 $self->_draw;
3694}
3389 3695
3390############################################################################# 3696#############################################################################
3391 3697
3392package CFClient::UI; 3698package CFClient::UI;
3393 3699

Diff Legend

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