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.265 by root, Thu Jun 1 02:59:46 2006 UTC vs.
Revision 1.277 by root, Sun Jun 4 00:21:52 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; 553 $self->_draw;
538 glPopMatrix; 554 glPopMatrix;
… …
652our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
653 669
654sub new { 670sub new {
655 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
656 672
657 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
658 674
659 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
660 children => [], 676 children => [],
661 can_events => 0, 677 can_events => 0,
662 %arg, 678 %arg,
663 ); 679 );
680
664 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
665 683
666 $self 684 $self
667} 685}
668 686
669sub add { 687sub add {
… …
717 $x -= $self->{x}; 735 $x -= $self->{x};
718 $y -= $self->{y}; 736 $y -= $self->{y};
719 737
720 my $res; 738 my $res;
721 739
722 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
723 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
724 and return $res; 742 and return $res;
725 } 743 }
726 744
727 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
776 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
777} 795}
778 796
779############################################################################# 797#############################################################################
780 798
799# back-buffered drawing area
800
781package CFClient::UI::Window; 801package CFClient::UI::Window;
782 802
783our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
784 804
785use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
803 $self->SUPER::size_allocate ($w, $h); 823 $self->SUPER::size_allocate ($w, $h);
804 $self->update; 824 $self->update;
805} 825}
806 826
807sub _render { 827sub _render {
828 my ($self) = @_;
829
808 $_[0]{children}[0]->draw; 830 $self->{children}[0]->draw;
809} 831}
810 832
811sub render_child { 833sub render_child {
812 my ($self) = @_; 834 my ($self) = @_;
813 835
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 836 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0; 837 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
817 839
840 {
841 package CFClient::UI::Base;
842
843 ($draw_x, $draw_y, $draw_w, $draw_h) =
844 (0, 0, $self->{w}, $self->{h});
845 }
846
818 $self->_render; 847 $self->_render;
819 }; 848 };
820} 849}
821 850
822sub _draw { 851sub _draw {
823 my ($self) = @_; 852 my ($self) = @_;
824 853
825 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
826 855
827 my $tex = $self->{texture} 856 my $tex = $self->{texture}
828 or return; 857 or return;
829 858
830 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
… …
913} 942}
914 943
915sub _render { 944sub _render {
916 my ($self) = @_; 945 my ($self) = @_;
917 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 951
920 $self->SUPER::_render; 952 $self->SUPER::_render;
921} 953}
922 954
… …
925package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
926 958
927our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
928 960
929sub new { 961sub new {
930 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
931 965
932 my $self; 966 my $self;
933 967
934 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
935 vertical => 1, 969 vertical => 1,
… …
940 ; 974 ;
941 975
942 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider, 978 slider => $slider,
945 @_, 979 %arg,
946 ); 980 );
947 981
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
951 984
952 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
953} 992}
954 993
955sub update { 994sub update {
956 my ($self) = @_; 995 my ($self) = @_;
957 996
… …
1029my @border = 1068my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 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); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1071
1033sub new { 1072sub new {
1034 my $class = shift; 1073 my ($class, %arg) = @_;
1074
1075 my $title = delete $arg{title};
1035 1076
1036 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1080 border => 0.6,
1040 can_events => 1, 1081 can_events => 1,
1041 min_w => 16, 1082 min_w => 16,
1042 min_h => 16, 1083 min_h => 16,
1043 @_ 1084 %arg,
1044 ); 1085 );
1045 1086
1046 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
1047 align => 0, 1088 align => 0,
1048 valign => 1, 1089 valign => 1,
1049 text => $self->{title}, 1090 text => $title,
1050 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
1051 1093
1052 $self 1094 $self
1095}
1096
1097sub add {
1098 my ($self, @widgets) = @_;
1099
1100 $self->SUPER::add (@widgets);
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1053} 1102}
1054 1103
1055sub border { 1104sub border {
1056 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
1057} 1106}
1058 1107
1059sub size_request { 1108sub size_request {
1060 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
1061 1113
1062 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
1063 1115
1064 ( 1116 (
1065 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
1068} 1120}
1069 1121
1070sub size_allocate { 1122sub size_allocate {
1071 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
1072 1124
1125 if ($self->{title}) {
1126 $self->{title}{w} = $w;
1127 $self->{title}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h);
1129 }
1130
1131 my $border = $self->border;
1132
1073 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
1075 1135
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); 1136 $self->child->configure ($border, $border, $w, $h);
1080} 1137}
1081 1138
1082sub button_down { 1139sub button_down {
1083 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
1084 1141
… …
1103 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
1104 1161
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1164
1165 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1166 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1167 };
1111 1168
1112 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1118 1175
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1177
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1179 # HACK: the next line is required to enforce placement
1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1181 };
1182 } else {
1183 return 0;
1184 }
1185
1123 } 1186 1
1124} 1187}
1125 1188
1126sub button_up { 1189sub button_up {
1127 my ($self, $ev, $x, $y) = @_; 1190 my ($self, $ev, $x, $y) = @_;
1128 1191
1129 delete $self->{motion}; 1192 !!delete $self->{motion}
1130} 1193}
1131 1194
1132sub mouse_motion { 1195sub mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
1134 1197
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1198 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199
1200 !!$self->{motion}
1136} 1201}
1137 1202
1138sub _draw { 1203sub _draw {
1139 my ($self) = @_; 1204 my ($self) = @_;
1140 1205
1206 my $child = $self->{children}[0];
1207
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1208 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1209 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1210
1144 glEnable GL_TEXTURE_2D; 1211 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1213
1147 my $border = $self->border; 1214 my $border = $self->border;
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1229 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1230 }
1164 1231
1165 glDisable GL_TEXTURE_2D; 1232 glDisable GL_TEXTURE_2D;
1166 1233
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1234 $child->draw;
1235
1236 if ($self->{title}) {
1237 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw;
1239 }
1170} 1240}
1171 1241
1172############################################################################# 1242#############################################################################
1173 1243
1174package CFClient::UI::Table; 1244package CFClient::UI::Table;
… …
1522} 1592}
1523 1593
1524sub size_allocate { 1594sub size_allocate {
1525 my ($self, $w, $h) = @_; 1595 my ($self, $w, $h) = @_;
1526 1596
1597 delete $self->{ox};
1598
1527 delete $self->{texture} 1599 delete $self->{texture}
1528 ;#d# 1600 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1529} 1601}
1530 1602
1531sub set_fontsize { 1603sub set_fontsize {
1532 my ($self, $fontsize) = @_; 1604 my ($self, $fontsize) = @_;
1533 1605
… …
1548 $self->{layout}->set_width ($self->{w}); 1620 $self->{layout}->set_width ($self->{w});
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1621 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1622 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1623 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1624
1553 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1625 new_from_layout CFClient::Texture $self->{layout}
1626 };
1554 1627
1628 unless (exists $self->{ox}) {
1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1629 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1630 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1557 : ($self->{w} - $tex->{w}) * 0.5); 1631 : ($self->{w} - $tex->{w}) * 0.5);
1558 1632
1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1633 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1561 : ($self->{h} - $tex->{h}) * 0.5); 1635 : ($self->{h} - $tex->{h}) * 0.5);
1562
1563 $tex
1564 }; 1636 };
1565 1637
1566 glEnable GL_TEXTURE_2D; 1638 glEnable GL_TEXTURE_2D;
1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1568 1640
… …
1606 1678
1607 delete $self->{cur_h}; 1679 delete $self->{cur_h};
1608 1680
1609 return if $self->{text} eq $text; 1681 return if $self->{text} eq $text;
1610 1682
1611 delete $self->{texture};
1612
1613 $self->{last_activity} = $::NOW; 1683 $self->{last_activity} = $::NOW;
1614 $self->{text} = $text; 1684 $self->{text} = $text;
1615 1685
1616 $text =~ s/./*/g if $self->{hidden}; 1686 $text =~ s/./*/g if $self->{hidden};
1617 $self->{layout}->set_text ("$text "); 1687 $self->{layout}->set_text ("$text ");
1618 1688
1619 $self->_emit (changed => $self->{text}); 1689 $self->_emit (changed => $self->{text});
1690 $self->update;
1620} 1691}
1621 1692
1622sub set_text { 1693sub set_text {
1623 my ($self, $text) = @_; 1694 my ($self, $text) = @_;
1624 1695
… …
1663 $self->{cursor} = length $text; 1734 $self->{cursor} = length $text;
1664 } elsif ($uni == 27) { 1735 } elsif ($uni == 27) {
1665 $self->_emit ('escape'); 1736 $self->_emit ('escape');
1666 } elsif ($uni) { 1737 } elsif ($uni) {
1667 substr $text, $self->{cursor}++, 0, chr $uni; 1738 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else {
1740 return 0;
1668 } 1741 }
1669 1742
1670 $self->_set_text ($text); 1743 $self->_set_text ($text);
1671 1744
1672 $self->realloc; 1745 $self->realloc;
1746
1747 1
1673} 1748}
1674 1749
1675sub focus_in { 1750sub focus_in {
1676 my ($self) = @_; 1751 my ($self) = @_;
1677 1752
… …
1692 utf8::encode $text; 1767 utf8::encode $text;
1693 $self->{cursor} = length substr $text, 0, $idx; 1768 $self->{cursor} = length substr $text, 0, $idx;
1694 1769
1695 $self->_set_text ($self->{text}); 1770 $self->_set_text ($self->{text});
1696 $self->update; 1771 $self->update;
1772
1773 1
1697} 1774}
1698 1775
1699sub mouse_motion { 1776sub mouse_motion {
1700 my ($self, $ev, $x, $y) = @_; 1777 my ($self, $ev, $x, $y) = @_;
1701# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1778# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1779
1780 0
1702} 1781}
1703 1782
1704sub _draw { 1783sub _draw {
1705 my ($self) = @_; 1784 my ($self) = @_;
1706 1785
… …
1783 } else { 1862 } else {
1784 $self->set_text ($self->{history_saveback}); 1863 $self->set_text ($self->{history_saveback});
1785 } 1864 }
1786 1865
1787 } else { 1866 } else {
1788 $self->SUPER::key_down ($ev); 1867 return $self->SUPER::key_down ($ev)
1868 }
1869
1789 } 1870 1
1790
1791} 1871}
1792 1872
1793############################################################################# 1873#############################################################################
1794 1874
1795package CFClient::UI::Button; 1875package CFClient::UI::Button;
… …
1824 my ($self, $ev, $x, $y) = @_; 1904 my ($self, $ev, $x, $y) = @_;
1825 1905
1826 $self->emit ("activate") 1906 $self->emit ("activate")
1827 if $x >= 0 && $x < $self->{w} 1907 if $x >= 0 && $x < $self->{w}
1828 && $y >= 0 && $y < $self->{h}; 1908 && $y >= 0 && $y < $self->{h};
1909
1910 1
1829} 1911}
1830 1912
1831sub _draw { 1913sub _draw {
1832 my ($self) = @_; 1914 my ($self) = @_;
1833 1915
… …
1887 1969
1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1890 $self->{state} = !$self->{state}; 1972 $self->{state} = !$self->{state};
1891 $self->_emit (changed => $self->{state}); 1973 $self->_emit (changed => $self->{state});
1974 } else {
1975 return 0
1976 }
1977
1892 } 1978 1
1893} 1979}
1894 1980
1895sub _draw { 1981sub _draw {
1896 my ($self) = @_; 1982 my ($self) = @_;
1897 1983
… …
2235 2321
2236 $self->SUPER::button_down ($ev, $x, $y); 2322 $self->SUPER::button_down ($ev, $x, $y);
2237 2323
2238 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239 2325
2240 $self->mouse_motion ($ev, $x, $y); 2326 $self->mouse_motion ($ev, $x, $y)
2241} 2327}
2242 2328
2243sub mouse_motion { 2329sub mouse_motion {
2244 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2245 2331
… …
2249 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2335 my (undef, $lo, $hi, $page) = @{$self->{range}};
2250 2336
2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2337 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252 2338
2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2339 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2340 } else {
2341 return 0;
2342 }
2343
2254 } 2344 1
2255} 2345}
2256 2346
2257sub update { 2347sub update {
2258 my ($self) = @_; 2348 my ($self) = @_;
2259 2349
2260 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2350 delete $self->{knob_w};
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356
2357 unless ($self->{knob_w}) {
2261 $self->set_value ($self->{range}[0]); 2358 $self->set_value ($self->{range}[0]);
2262 2359
2263 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2360 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100; 2361 my $range = ($hi - $page - $lo) || 1e-100;
2265 2362
… …
2271 $value = ($value - $lo) / $range; 2368 $value = ($value - $lo) / $range;
2272 $value = $value * $self->{scale} + $self->{offset}; 2369 $value = $value * $self->{scale} + $self->{offset};
2273 2370
2274 $self->{knob_x} = $value - $knob_w * 0.5; 2371 $self->{knob_x} = $value - $knob_w * 0.5;
2275 $self->{knob_w} = $knob_w; 2372 $self->{knob_w} = $knob_w;
2276 }); 2373 }
2277
2278 $self->SUPER::update;
2279}
2280
2281sub _draw {
2282 my ($self) = @_;
2283 2374
2284 $self->SUPER::_draw (); 2375 $self->SUPER::_draw ();
2285 2376
2286 glScale $self->{w}, $self->{h}; 2377 glScale $self->{w}, $self->{h};
2287 2378
… …
2781 $self->SUPER::DESTROY; 2872 $self->SUPER::DESTROY;
2782} 2873}
2783 2874
2784############################################################################# 2875#############################################################################
2785 2876
2877package CFClient::UI::Buttonbar;
2878
2879our @ISA = CFClient::UI::HBox::;
2880
2881# TODO: should actualyl wrap buttons and other goodies.
2882
2883#############################################################################
2884
2786package CFClient::UI::Menu; 2885package CFClient::UI::Menu;
2787 2886
2788our @ISA = CFClient::UI::FancyFrame::; 2887our @ISA = CFClient::UI::FancyFrame::;
2789 2888
2790use CFClient::OpenGL; 2889use CFClient::OpenGL;
… …
2837 my ($self, $ev, $x, $y) = @_; 2936 my ($self, $ev, $x, $y) = @_;
2838 2937
2839 # TODO: should use vbox->find_widget or so 2938 # TODO: should use vbox->find_widget or so
2840 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2841 $self->{hover} = $self->{item}{$HOVER}; 2940 $self->{hover} = $self->{item}{$HOVER};
2941
2942 0
2842} 2943}
2843 2944
2844sub button_up { 2945sub button_up {
2845 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2846 2947
… …
2848 undef $GRAB; 2949 undef $GRAB;
2849 $self->hide; 2950 $self->hide;
2850 2951
2851 $self->_emit ("popdown"); 2952 $self->_emit ("popdown");
2852 $self->{hover}[1]->() if $self->{hover}; 2953 $self->{hover}[1]->() if $self->{hover};
2954 } else {
2955 return 0
2956 }
2957
2958 1
2959}
2960
2961#############################################################################
2962
2963package CFClient::UI::Multiplexer;
2964
2965our @ISA = CFClient::UI::Container::;
2966
2967sub new {
2968 my $class = shift;
2969
2970 my $self = $class->SUPER::new (
2971 @_,
2972 );
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976
2977 $self
2978}
2979
2980sub add {
2981 my ($self, @widgets) = @_;
2982
2983 $self->SUPER::add (@widgets);
2984
2985 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} };
2987}
2988
2989sub set_current_page {
2990 my ($self, $page_or_widget) = @_;
2991
2992 my $widget = ref $page_or_widget
2993 ? $page_or_widget
2994 : $self->{children}[$page_or_widget];
2995
2996 $self->{current} = $widget;
2997 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2998
2999 $self->_emit (page_changed => $self->{current});
3000
3001 $self->realloc;
3002}
3003
3004sub visible_children {
3005 $_[0]{current}
3006}
3007
3008sub size_request {
3009 my ($self) = @_;
3010
3011 $self->{current}->size_request
3012}
3013
3014sub size_allocate {
3015 my ($self, $w, $h) = @_;
3016
3017 $self->{current}->configure (0, 0, $w, $h);
3018}
3019
3020sub _draw {
3021 my ($self) = @_;
3022
3023 $self->{current}->draw;
3024}
3025
3026#############################################################################
3027
3028package CFClient::UI::Notebook;
3029
3030our @ISA = CFClient::UI::VBox::;
3031
3032sub new {
3033 my $class = shift;
3034
3035 my $self = $class->SUPER::new (
3036 buttonbar => (new CFClient::UI::Buttonbar),
3037 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3038 # filter => # will be put between multiplexer and $self
3039 @_,
3040 );
2853 } 3041
3042 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3043 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3044
3045 $self
3046}
3047
3048sub add {
3049 my ($self, $title, $widget, $tooltip) = @_;
3050
3051 Scalar::Util::weaken $self;
3052
3053 $self->{buttonbar}->add (new CFClient::UI::Button
3054 markup => $title,
3055 tooltip => $tooltip,
3056 on_activate => sub { $self->set_current_page ($widget) },
3057 );
3058
3059 $self->{multiplexer}->add ($widget);
3060}
3061
3062sub set_current_page {
3063 my ($self, $page) = @_;
3064
3065 $self->{multiplexer}->set_current_page ($page);
3066 $self->_emit (page_changed => $self->{multiplexer}{current});
2854} 3067}
2855 3068
2856############################################################################# 3069#############################################################################
2857 3070
2858package CFClient::UI::Statusbox; 3071package CFClient::UI::Statusbox;
… …
2971 3184
2972sub new { 3185sub new {
2973 my $class = shift; 3186 my $class = shift;
2974 3187
2975 my $self = $class->SUPER::new ( 3188 my $self = $class->SUPER::new (
2976 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3189 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2977 @_, 3190 @_,
2978 ); 3191 );
2979 3192
2980 $self 3193 $self
2981} 3194}
2982 3195
2983sub set_items { 3196sub set_items {
2984 my ($self, $items) = @_; 3197 my ($self, $items) = @_;
2985 3198
2986 $self->{scrolled}->clear; 3199 $self->{child}->clear;
2987 return unless $items; 3200 return unless $items;
2988 3201
2989 my @items = sort { 3202 my @items = sort {
2990 ($a->{type} <=> $b->{type}) 3203 ($a->{type} <=> $b->{type})
2991 or ($a->{name} cmp $b->{name}) 3204 or ($a->{name} cmp $b->{name})
… …
2995 3208
2996 my $row = 0; 3209 my $row = 0;
2997 for my $item (@items) { 3210 for my $item (@items) {
2998 CFClient::Item::update_widgets $item; 3211 CFClient::Item::update_widgets $item;
2999 3212
3000 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3213 $self->{child}->add (0, $row, $item->{face_widget});
3001 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3214 $self->{child}->add (1, $row, $item->{desc_widget});
3002 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3215 $self->{child}->add (2, $row, $item->{weight_widget});
3003 3216
3004 $row++; 3217 $row++;
3005 } 3218 }
3006} 3219}
3007 3220
… …
3105 $rec = $::CONN->stop_record if $::CONN; 3318 $rec = $::CONN->stop_record if $::CONN;
3106 return unless ref $rec eq 'ARRAY'; 3319 return unless ref $rec eq 'ARRAY';
3107 $self->set_command_list ($rec); 3320 $self->set_command_list ($rec);
3108} 3321}
3109 3322
3110# if $commit is true, the binding will be set after the user entered a key combo 3323
3324sub ask_for_bind_and_commit {
3325 my ($self) = @_;
3326 $self->ask_for_bind (1);
3327}
3328
3111sub ask_for_bind { 3329sub ask_for_bind {
3112 my ($self, $commit) = @_; 3330 my ($self, $commit) = @_;
3113 3331
3114 CFClient::Binder::open_binding_dialog (sub { 3332 CFClient::Binder::open_binding_dialog (sub {
3115 my ($mod, $sym) = @_; 3333 my ($mod, $sym) = @_;
… …
3199 3417
3200############################################################################# 3418#############################################################################
3201 3419
3202package CFClient::UI::SpellList; 3420package CFClient::UI::SpellList;
3203 3421
3204our @ISA = CFClient::UI::FancyFrame::; 3422our @ISA = CFClient::UI::Table::;
3205 3423
3206sub new { 3424sub new {
3207 my $class = shift; 3425 my $class = shift;
3208 3426
3209 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3427 my $self = $class->SUPER::new (
3210 3428 binding => [],
3211 $self->add (new CFClient::UI::ScrolledWindow 3429 commands => [],
3212 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3430 @_,
3213 3431 )
3214 $self;
3215} 3432}
3216 3433
3217# XXX: Do sorting? Argl... 3434# XXX: Do sorting? Argl...
3218sub add_spell { 3435sub add_spell {
3219 my ($self, $spell) = @_; 3436 my ($self, $spell) = @_;
3220 $self->{spells}->{$spell->{name}} = $spell; 3437 $self->{spells}->{$spell->{name}} = $spell;
3221 3438
3222 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face 3439 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223 face => $spell->{face}, 3440 face => $spell->{face},
3224 can_hover => 1, 3441 can_hover => 1,
3225 can_events => 1, 3442 can_events => 1,
3226 tooltip => $spell->{message}); 3443 tooltip => $spell->{message});
3227 3444
3228 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label 3445 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229 text => $spell->{name}, 3446 text => $spell->{name},
3230 can_hover => 1, 3447 can_hover => 1,
3231 can_events => 1, 3448 can_events => 1,
3232 tooltip => $spell->{message}, 3449 tooltip => $spell->{message},
3233 expand => 1); 3450 expand => 1);
3234 3451
3235 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label 3452 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236 text => (sprintf "lvl: %2d sp: %2d dmg: %2d", 3453 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}), 3454 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3238 expand => 1); 3455 expand => 1);
3239 3456
3240 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button 3457 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241 text => "bind to key", 3458 text => "bind to key",
3242 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); 3459 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243} 3460}
3244 3461
3245sub rebuild_spell_list { 3462sub rebuild_spell_list {
… …
3372 $_->() 3589 $_->()
3373 for values %{delete $self->{refresh_hook}}; 3590 for values %{delete $self->{refresh_hook}};
3374 } 3591 }
3375 3592
3376 if ($self->{realloc}) { 3593 if ($self->{realloc}) {
3594 my %queue;
3377 my @queue; 3595 my @queue;
3596 my $widget;
3378 3597
3598 outer:
3379 while () { 3599 while () {
3380 if ($self->{realloc}) { 3600 if (my $realloc = delete $self->{realloc}) {
3381 #TODO use array-of-depth approach 3601 for $widget (values %$realloc) {
3602 $widget->{visible} or next; # do not resize invisible widgets
3382 3603
3383 use sort 'stable'; 3604 $queue{$widget+0}++ and next; # duplicates are common
3384 3605
3385 @queue = sort { $a->{visible} <=> $b->{visible} } 3606 push @{ $queue[$widget->{visible}] }, $widget;
3386 @queue, values %{delete $self->{realloc}}; 3607 }
3387 } 3608 }
3388 3609
3610 while () {
3611 @queue or last outer;
3612
3389 my $widget = pop @queue || last; 3613 $widget = pop @{ $queue[-1] || [] }
3614 and last;
3615
3616 pop @queue;
3617 }
3390 3618
3391 $widget->{visible} or last; # do not resize invisible widgets 3619 delete $queue{$widget+0};
3392 3620
3393 my ($w, $h) = $widget->size_request; 3621 my ($w, $h) = $widget->size_request;
3394 3622
3395 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3396 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3624 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
… …
3404 $widget->{req_h} = $h; 3632 $widget->{req_h} = $h;
3405 3633
3406 $self->{size_alloc}{$widget+0} = $widget; 3634 $self->{size_alloc}{$widget+0} = $widget;
3407 3635
3408 if (my $parent = $widget->{parent}) { 3636 if (my $parent = $widget->{parent}) {
3409 $self->{realloc}{$parent+0} = $parent; 3637 $self->{realloc}{$parent+0} = $parent
3410 #unshift @queue, $parent; 3638 unless $queue{$parent+0};
3639
3411 $parent->{force_size_alloc} = 1; 3640 $parent->{force_size_alloc} = 1;
3412 $self->{size_alloc}{$parent+0} = $parent; 3641 $self->{size_alloc}{$parent+0} = $parent;
3413 } 3642 }
3414 } 3643 }
3415 3644
… …
3431 3660
3432 $w = int $w + 0.5; 3661 $w = int $w + 0.5;
3433 $h = int $h + 0.5; 3662 $h = int $h + 0.5;
3434 3663
3435 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3664 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3665 $widget->{old_w} = $widget->{w};
3666 $widget->{old_h} = $widget->{h};
3667
3436 $widget->{w} = $w; 3668 $widget->{w} = $w;
3437 $widget->{h} = $h; 3669 $widget->{h} = $h;
3438 3670
3439 $widget->emit (size_allocate => $w, $h); 3671 $widget->emit (size_allocate => $w, $h);
3440 } 3672 }
… …
3455 glLoadIdentity; 3687 glLoadIdentity;
3456 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3688 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3457 glMatrixMode GL_MODELVIEW; 3689 glMatrixMode GL_MODELVIEW;
3458 glLoadIdentity; 3690 glLoadIdentity;
3459 3691
3692 {
3693 package CFClient::UI::Base;
3694
3695 ($draw_x, $draw_y, $draw_w, $draw_h) =
3696 (0, 0, $self->{w}, $self->{h});
3697 }
3698
3460 $self->_draw; 3699 $self->_draw;
3461} 3700}
3462 3701
3463############################################################################# 3702#############################################################################
3464 3703

Diff Legend

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