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.266 by root, Thu Jun 1 03:42:58 2006 UTC vs.
Revision 1.276 by root, Sun Jun 4 00:16:01 2006 UTC

… …
171sub rescale_widgets { 171sub rescale_widgets {
172 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
173 173
174 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178 178
179 $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.]+$/;
180 $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};
181 $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};
182 $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.]+$/;
183 $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};
184 $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};
185 185
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188 188
189 } 189 }
190 } 190 }
191 191
192 reconfigure_widgets; 192 reconfigure_widgets;
… …
371sub size_allocate { 371sub size_allocate {
372 # nothing to be done 372 # nothing to be done
373} 373}
374 374
375sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
376} 381}
377 382
378sub set_max_size { 383sub set_max_size {
379 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
380 385
… …
439 444
440 $::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
441 unless $FOCUS; 446 unless $FOCUS;
442} 447}
443 448
444sub mouse_motion { } 449sub mouse_motion { 0 }
445sub button_up { } 450sub button_up { 0 }
446sub key_down { } 451sub key_down { 0 }
447sub key_up { } 452sub key_up { 0 }
448 453
449sub button_down { 454sub button_down {
450 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
451 456
452 $self->focus_in; 457 $self->focus_in;
453}
454 458
455sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
456sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
457sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
458sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
459sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
460 461
461sub find_widget { 462sub find_widget {
462 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
463 464
464 return () unless $self->{can_events}; 465 return () unless $self->{can_events};
… …
526 527
527 $self->realloc; 528 $self->realloc;
528 $self->update; 529 $self->update;
529} 530}
530 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
531sub draw { 536sub draw {
532 my ($self) = @_; 537 my ($self) = @_;
533 538
534 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);
535 550
536 glPushMatrix; 551 glPushMatrix;
537 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
538 $self->_draw; 553 $self->_draw;
539 glPopMatrix; 554 glPopMatrix;
… …
653our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
654 669
655sub new { 670sub new {
656 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
657 672
658 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
659 674
660 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
661 children => [], 676 children => [],
662 can_events => 0, 677 can_events => 0,
663 %arg, 678 %arg,
664 ); 679 );
680
665 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
666 683
667 $self 684 $self
668} 685}
669 686
670sub add { 687sub add {
… …
718 $x -= $self->{x}; 735 $x -= $self->{x};
719 $y -= $self->{y}; 736 $y -= $self->{y};
720 737
721 my $res; 738 my $res;
722 739
723 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
724 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
725 and return $res; 742 and return $res;
726 } 743 }
727 744
728 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
777 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
778} 795}
779 796
780############################################################################# 797#############################################################################
781 798
799# back-buffered drawing area
800
782package CFClient::UI::Window; 801package CFClient::UI::Window;
783 802
784our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
785 804
786use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
804 $self->SUPER::size_allocate ($w, $h); 823 $self->SUPER::size_allocate ($w, $h);
805 $self->update; 824 $self->update;
806} 825}
807 826
808sub _render { 827sub _render {
828 my ($self) = @_;
829
809 $_[0]{children}[0]->draw; 830 $self->{children}[0]->draw;
810} 831}
811 832
812sub render_child { 833sub render_child {
813 my ($self) = @_; 834 my ($self) = @_;
814 835
815 $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 {
816 glClearColor 0, 0, 0, 0; 837 glClearColor 0, 0, 0, 0;
817 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
818 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
819 $self->_render; 847 $self->_render;
820 }; 848 };
821} 849}
822 850
823sub _draw { 851sub _draw {
824 my ($self) = @_; 852 my ($self) = @_;
825 853
826 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
827 855
828 my $tex = $self->{texture} 856 my $tex = $self->{texture}
829 or return; 857 or return;
830 858
831 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
… …
914} 942}
915 943
916sub _render { 944sub _render {
917 my ($self) = @_; 945 my ($self) = @_;
918 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
919 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
920 951
921 $self->SUPER::_render; 952 $self->SUPER::_render;
922} 953}
923 954
… …
926package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
927 958
928our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
929 960
930sub new { 961sub new {
931 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
932 965
933 my $self; 966 my $self;
934 967
935 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
936 vertical => 1, 969 vertical => 1,
… …
941 ; 974 ;
942 975
943 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
944 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
945 slider => $slider, 978 slider => $slider,
946 @_, 979 %arg,
947 ); 980 );
948 981
949 $self->{vp}->add ($self->{scrolled});
950 $self->add ($self->{vp});
951 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
952 984
953 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
954} 992}
955 993
956sub update { 994sub update {
957 my ($self) = @_; 995 my ($self) = @_;
958 996
… …
1030my @border = 1068my @border =
1031 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1032 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);
1033 1071
1034sub new { 1072sub new {
1035 my $class = shift; 1073 my ($class, %arg) = @_;
1074
1075 my $title = delete $arg{title};
1036 1076
1037 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
1038 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
1039 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
1040 border => 0.6, 1080 border => 0.6,
1041 can_events => 1, 1081 can_events => 1,
1042 min_w => 16, 1082 min_w => 16,
1043 min_h => 16, 1083 min_h => 16,
1044 @_ 1084 %arg,
1045 ); 1085 );
1046 1086
1047 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
1048 align => 0, 1088 align => 0,
1049 valign => 1, 1089 valign => 1,
1050 text => $self->{title}, 1090 text => $title,
1051 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
1052 1093
1053 $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};
1054} 1102}
1055 1103
1056sub border { 1104sub border {
1057 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
1058} 1106}
1059 1107
1060sub size_request { 1108sub size_request {
1061 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
1062 1113
1063 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
1064 1115
1065 ( 1116 (
1066 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
1069} 1120}
1070 1121
1071sub size_allocate { 1122sub size_allocate {
1072 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
1073 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
1074 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
1075 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
1076 1135
1077 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1078 if $self->{title};
1079
1080 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
1081} 1137}
1082 1138
1083sub button_down { 1139sub button_down {
1084 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
1085 1141
… …
1119 1175
1120 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
1121 1177
1122 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1123 }; 1179 };
1180 } else {
1181 return 0;
1182 }
1183
1124 } 1184 1
1125} 1185}
1126 1186
1127sub button_up { 1187sub button_up {
1128 my ($self, $ev, $x, $y) = @_; 1188 my ($self, $ev, $x, $y) = @_;
1129 1189
1130 delete $self->{motion}; 1190 !!delete $self->{motion}
1131} 1191}
1132 1192
1133sub mouse_motion { 1193sub mouse_motion {
1134 my ($self, $ev, $x, $y) = @_; 1194 my ($self, $ev, $x, $y) = @_;
1135 1195
1136 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1196 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197
1198 !!$self->{motion}
1137} 1199}
1138 1200
1139sub _draw { 1201sub _draw {
1140 my ($self) = @_; 1202 my ($self) = @_;
1141 1203
1204 my $child = $self->{children}[0];
1205
1142 my ($w, $h ) = ($self->{w}, $self->{h}); 1206 my ($w, $h ) = ($self->{w}, $self->{h});
1143 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1207 my ($cw, $ch) = ($child->{w}, $child->{h});
1144 1208
1145 glEnable GL_TEXTURE_2D; 1209 glEnable GL_TEXTURE_2D;
1146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1210 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1147 1211
1148 my $border = $self->border; 1212 my $border = $self->border;
… …
1163 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1227 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1164 } 1228 }
1165 1229
1166 glDisable GL_TEXTURE_2D; 1230 glDisable GL_TEXTURE_2D;
1167 1231
1168 $self->{title}->draw if $self->{title};
1169
1170 $self->child->draw; 1232 $child->draw;
1233
1234 if ($self->{title}) {
1235 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw;
1237 }
1171} 1238}
1172 1239
1173############################################################################# 1240#############################################################################
1174 1241
1175package CFClient::UI::Table; 1242package CFClient::UI::Table;
… …
1523} 1590}
1524 1591
1525sub size_allocate { 1592sub size_allocate {
1526 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1527 1594
1595 delete $self->{ox};
1596
1528 delete $self->{texture} 1597 delete $self->{texture}
1529 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1598 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1530} 1599}
1531 1600
1532sub set_fontsize { 1601sub set_fontsize {
… …
1549 $self->{layout}->set_width ($self->{w}); 1618 $self->{layout}->set_width ($self->{w});
1550 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1619 $self->{layout}->set_ellipsise ($self->{ellipsise});
1551 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1620 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1552 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1553 1622
1554 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1623 new_from_layout CFClient::Texture $self->{layout}
1624 };
1555 1625
1626 unless (exists $self->{ox}) {
1556 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1557 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1558 : ($self->{w} - $tex->{w}) * 0.5); 1629 : ($self->{w} - $tex->{w}) * 0.5);
1559 1630
1560 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1561 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1562 : ($self->{h} - $tex->{h}) * 0.5); 1633 : ($self->{h} - $tex->{h}) * 0.5);
1563
1564 $tex
1565 }; 1634 };
1566 1635
1567 glEnable GL_TEXTURE_2D; 1636 glEnable GL_TEXTURE_2D;
1568 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1569 1638
… …
1607 1676
1608 delete $self->{cur_h}; 1677 delete $self->{cur_h};
1609 1678
1610 return if $self->{text} eq $text; 1679 return if $self->{text} eq $text;
1611 1680
1612 delete $self->{texture};
1613
1614 $self->{last_activity} = $::NOW; 1681 $self->{last_activity} = $::NOW;
1615 $self->{text} = $text; 1682 $self->{text} = $text;
1616 1683
1617 $text =~ s/./*/g if $self->{hidden}; 1684 $text =~ s/./*/g if $self->{hidden};
1618 $self->{layout}->set_text ("$text "); 1685 $self->{layout}->set_text ("$text ");
1619 1686
1620 $self->_emit (changed => $self->{text}); 1687 $self->_emit (changed => $self->{text});
1688 $self->update;
1621} 1689}
1622 1690
1623sub set_text { 1691sub set_text {
1624 my ($self, $text) = @_; 1692 my ($self, $text) = @_;
1625 1693
… …
1664 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1665 } elsif ($uni == 27) { 1733 } elsif ($uni == 27) {
1666 $self->_emit ('escape'); 1734 $self->_emit ('escape');
1667 } elsif ($uni) { 1735 } elsif ($uni) {
1668 substr $text, $self->{cursor}++, 0, chr $uni; 1736 substr $text, $self->{cursor}++, 0, chr $uni;
1737 } else {
1738 return 0;
1669 } 1739 }
1670 1740
1671 $self->_set_text ($text); 1741 $self->_set_text ($text);
1672 1742
1673 $self->realloc; 1743 $self->realloc;
1744
1745 1
1674} 1746}
1675 1747
1676sub focus_in { 1748sub focus_in {
1677 my ($self) = @_; 1749 my ($self) = @_;
1678 1750
… …
1693 utf8::encode $text; 1765 utf8::encode $text;
1694 $self->{cursor} = length substr $text, 0, $idx; 1766 $self->{cursor} = length substr $text, 0, $idx;
1695 1767
1696 $self->_set_text ($self->{text}); 1768 $self->_set_text ($self->{text});
1697 $self->update; 1769 $self->update;
1770
1771 1
1698} 1772}
1699 1773
1700sub mouse_motion { 1774sub mouse_motion {
1701 my ($self, $ev, $x, $y) = @_; 1775 my ($self, $ev, $x, $y) = @_;
1702# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1776# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1777
1778 0
1703} 1779}
1704 1780
1705sub _draw { 1781sub _draw {
1706 my ($self) = @_; 1782 my ($self) = @_;
1707 1783
… …
1784 } else { 1860 } else {
1785 $self->set_text ($self->{history_saveback}); 1861 $self->set_text ($self->{history_saveback});
1786 } 1862 }
1787 1863
1788 } else { 1864 } else {
1789 $self->SUPER::key_down ($ev); 1865 return $self->SUPER::key_down ($ev)
1866 }
1867
1790 } 1868 1
1791
1792} 1869}
1793 1870
1794############################################################################# 1871#############################################################################
1795 1872
1796package CFClient::UI::Button; 1873package CFClient::UI::Button;
… …
1825 my ($self, $ev, $x, $y) = @_; 1902 my ($self, $ev, $x, $y) = @_;
1826 1903
1827 $self->emit ("activate") 1904 $self->emit ("activate")
1828 if $x >= 0 && $x < $self->{w} 1905 if $x >= 0 && $x < $self->{w}
1829 && $y >= 0 && $y < $self->{h}; 1906 && $y >= 0 && $y < $self->{h};
1907
1908 1
1830} 1909}
1831 1910
1832sub _draw { 1911sub _draw {
1833 my ($self) = @_; 1912 my ($self) = @_;
1834 1913
… …
1888 1967
1889 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1968 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1890 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1969 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1891 $self->{state} = !$self->{state}; 1970 $self->{state} = !$self->{state};
1892 $self->_emit (changed => $self->{state}); 1971 $self->_emit (changed => $self->{state});
1972 } else {
1973 return 0
1974 }
1975
1893 } 1976 1
1894} 1977}
1895 1978
1896sub _draw { 1979sub _draw {
1897 my ($self) = @_; 1980 my ($self) = @_;
1898 1981
… …
2236 2319
2237 $self->SUPER::button_down ($ev, $x, $y); 2320 $self->SUPER::button_down ($ev, $x, $y);
2238 2321
2239 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2322 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240 2323
2241 $self->mouse_motion ($ev, $x, $y); 2324 $self->mouse_motion ($ev, $x, $y)
2242} 2325}
2243 2326
2244sub mouse_motion { 2327sub mouse_motion {
2245 my ($self, $ev, $x, $y) = @_; 2328 my ($self, $ev, $x, $y) = @_;
2246 2329
… …
2250 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2333 my (undef, $lo, $hi, $page) = @{$self->{range}};
2251 2334
2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2335 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253 2336
2254 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2337 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2338 } else {
2339 return 0;
2340 }
2341
2255 } 2342 1
2256} 2343}
2257 2344
2258sub update { 2345sub update {
2259 my ($self) = @_; 2346 my ($self) = @_;
2260 2347
2261 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2348 delete $self->{knob_w};
2349 $self->SUPER::update;
2350}
2351
2352sub _draw {
2353 my ($self) = @_;
2354
2355 unless ($self->{knob_w}) {
2262 $self->set_value ($self->{range}[0]); 2356 $self->set_value ($self->{range}[0]);
2263 2357
2264 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2358 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100; 2359 my $range = ($hi - $page - $lo) || 1e-100;
2266 2360
… …
2272 $value = ($value - $lo) / $range; 2366 $value = ($value - $lo) / $range;
2273 $value = $value * $self->{scale} + $self->{offset}; 2367 $value = $value * $self->{scale} + $self->{offset};
2274 2368
2275 $self->{knob_x} = $value - $knob_w * 0.5; 2369 $self->{knob_x} = $value - $knob_w * 0.5;
2276 $self->{knob_w} = $knob_w; 2370 $self->{knob_w} = $knob_w;
2277 }); 2371 }
2278
2279 $self->SUPER::update;
2280}
2281
2282sub _draw {
2283 my ($self) = @_;
2284 2372
2285 $self->SUPER::_draw (); 2373 $self->SUPER::_draw ();
2286 2374
2287 glScale $self->{w}, $self->{h}; 2375 glScale $self->{w}, $self->{h};
2288 2376
… …
2782 $self->SUPER::DESTROY; 2870 $self->SUPER::DESTROY;
2783} 2871}
2784 2872
2785############################################################################# 2873#############################################################################
2786 2874
2875package CFClient::UI::Buttonbar;
2876
2877our @ISA = CFClient::UI::HBox::;
2878
2879# TODO: should actualyl wrap buttons and other goodies.
2880
2881#############################################################################
2882
2787package CFClient::UI::Menu; 2883package CFClient::UI::Menu;
2788 2884
2789our @ISA = CFClient::UI::FancyFrame::; 2885our @ISA = CFClient::UI::FancyFrame::;
2790 2886
2791use CFClient::OpenGL; 2887use CFClient::OpenGL;
… …
2838 my ($self, $ev, $x, $y) = @_; 2934 my ($self, $ev, $x, $y) = @_;
2839 2935
2840 # TODO: should use vbox->find_widget or so 2936 # TODO: should use vbox->find_widget or so
2841 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2937 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2842 $self->{hover} = $self->{item}{$HOVER}; 2938 $self->{hover} = $self->{item}{$HOVER};
2939
2940 0
2843} 2941}
2844 2942
2845sub button_up { 2943sub button_up {
2846 my ($self, $ev, $x, $y) = @_; 2944 my ($self, $ev, $x, $y) = @_;
2847 2945
… …
2849 undef $GRAB; 2947 undef $GRAB;
2850 $self->hide; 2948 $self->hide;
2851 2949
2852 $self->_emit ("popdown"); 2950 $self->_emit ("popdown");
2853 $self->{hover}[1]->() if $self->{hover}; 2951 $self->{hover}[1]->() if $self->{hover};
2952 } else {
2953 return 0
2954 }
2955
2956 1
2957}
2958
2959#############################################################################
2960
2961package CFClient::UI::Multiplexer;
2962
2963our @ISA = CFClient::UI::Container::;
2964
2965sub new {
2966 my $class = shift;
2967
2968 my $self = $class->SUPER::new (
2969 @_,
2970 );
2971
2972 $self->{current} = $self->{children}[0]
2973 if @{ $self->{children} };
2974
2975 $self
2976}
2977
2978sub add {
2979 my ($self, @widgets) = @_;
2980
2981 $self->SUPER::add (@widgets);
2982
2983 $self->{current} = $self->{children}[0]
2984 if @{ $self->{children} };
2985}
2986
2987sub set_current_page {
2988 my ($self, $page_or_widget) = @_;
2989
2990 my $widget = ref $page_or_widget
2991 ? $page_or_widget
2992 : $self->{children}[$page_or_widget];
2993
2994 $self->{current} = $widget;
2995 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2996
2997 $self->_emit (page_changed => $self->{current});
2998
2999 $self->realloc;
3000}
3001
3002sub visible_children {
3003 $_[0]{current}
3004}
3005
3006sub size_request {
3007 my ($self) = @_;
3008
3009 $self->{current}->size_request
3010}
3011
3012sub size_allocate {
3013 my ($self, $w, $h) = @_;
3014
3015 $self->{current}->configure (0, 0, $w, $h);
3016}
3017
3018sub _draw {
3019 my ($self) = @_;
3020
3021 $self->{current}->draw;
3022}
3023
3024#############################################################################
3025
3026package CFClient::UI::Notebook;
3027
3028our @ISA = CFClient::UI::VBox::;
3029
3030sub new {
3031 my $class = shift;
3032
3033 my $self = $class->SUPER::new (
3034 buttonbar => (new CFClient::UI::Buttonbar),
3035 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3036 # filter => # will be put between multiplexer and $self
3037 @_,
3038 );
2854 } 3039
3040 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3041 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3042
3043 $self
3044}
3045
3046sub add {
3047 my ($self, $title, $widget, $tooltip) = @_;
3048
3049 Scalar::Util::weaken $self;
3050
3051 $self->{buttonbar}->add (new CFClient::UI::Button
3052 markup => $title,
3053 tooltip => $tooltip,
3054 on_activate => sub { $self->set_current_page ($widget) },
3055 );
3056
3057 $self->{multiplexer}->add ($widget);
3058}
3059
3060sub set_current_page {
3061 my ($self, $page) = @_;
3062
3063 $self->{multiplexer}->set_current_page ($page);
3064 $self->_emit (page_changed => $self->{multiplexer}{current});
2855} 3065}
2856 3066
2857############################################################################# 3067#############################################################################
2858 3068
2859package CFClient::UI::Statusbox; 3069package CFClient::UI::Statusbox;
… …
2972 3182
2973sub new { 3183sub new {
2974 my $class = shift; 3184 my $class = shift;
2975 3185
2976 my $self = $class->SUPER::new ( 3186 my $self = $class->SUPER::new (
2977 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3187 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2978 @_, 3188 @_,
2979 ); 3189 );
2980 3190
2981 $self 3191 $self
2982} 3192}
2983 3193
2984sub set_items { 3194sub set_items {
2985 my ($self, $items) = @_; 3195 my ($self, $items) = @_;
2986 3196
2987 $self->{scrolled}->clear; 3197 $self->{child}->clear;
2988 return unless $items; 3198 return unless $items;
2989 3199
2990 my @items = sort { 3200 my @items = sort {
2991 ($a->{type} <=> $b->{type}) 3201 ($a->{type} <=> $b->{type})
2992 or ($a->{name} cmp $b->{name}) 3202 or ($a->{name} cmp $b->{name})
… …
2996 3206
2997 my $row = 0; 3207 my $row = 0;
2998 for my $item (@items) { 3208 for my $item (@items) {
2999 CFClient::Item::update_widgets $item; 3209 CFClient::Item::update_widgets $item;
3000 3210
3001 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3211 $self->{child}->add (0, $row, $item->{face_widget});
3002 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3212 $self->{child}->add (1, $row, $item->{desc_widget});
3003 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3213 $self->{child}->add (2, $row, $item->{weight_widget});
3004 3214
3005 $row++; 3215 $row++;
3006 } 3216 }
3007} 3217}
3008 3218
… …
3106 $rec = $::CONN->stop_record if $::CONN; 3316 $rec = $::CONN->stop_record if $::CONN;
3107 return unless ref $rec eq 'ARRAY'; 3317 return unless ref $rec eq 'ARRAY';
3108 $self->set_command_list ($rec); 3318 $self->set_command_list ($rec);
3109} 3319}
3110 3320
3111# if $commit is true, the binding will be set after the user entered a key combo 3321
3322sub ask_for_bind_and_commit {
3323 my ($self) = @_;
3324 $self->ask_for_bind (1);
3325}
3326
3112sub ask_for_bind { 3327sub ask_for_bind {
3113 my ($self, $commit) = @_; 3328 my ($self, $commit) = @_;
3114 3329
3115 CFClient::Binder::open_binding_dialog (sub { 3330 CFClient::Binder::open_binding_dialog (sub {
3116 my ($mod, $sym) = @_; 3331 my ($mod, $sym) = @_;
… …
3200 3415
3201############################################################################# 3416#############################################################################
3202 3417
3203package CFClient::UI::SpellList; 3418package CFClient::UI::SpellList;
3204 3419
3205our @ISA = CFClient::UI::FancyFrame::; 3420our @ISA = CFClient::UI::Table::;
3206 3421
3207sub new { 3422sub new {
3208 my $class = shift; 3423 my $class = shift;
3209 3424
3210 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3425 my $self = $class->SUPER::new (
3211 3426 binding => [],
3212 $self->add (new CFClient::UI::ScrolledWindow 3427 commands => [],
3213 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3428 @_,
3214 3429 )
3215 $self;
3216} 3430}
3217 3431
3218# XXX: Do sorting? Argl... 3432# XXX: Do sorting? Argl...
3219sub add_spell { 3433sub add_spell {
3220 my ($self, $spell) = @_; 3434 my ($self, $spell) = @_;
3221 $self->{spells}->{$spell->{name}} = $spell; 3435 $self->{spells}->{$spell->{name}} = $spell;
3222 3436
3223 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face 3437 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3224 face => $spell->{face}, 3438 face => $spell->{face},
3225 can_hover => 1, 3439 can_hover => 1,
3226 can_events => 1, 3440 can_events => 1,
3227 tooltip => $spell->{message}); 3441 tooltip => $spell->{message});
3228 3442
3229 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label 3443 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3230 text => $spell->{name}, 3444 text => $spell->{name},
3231 can_hover => 1, 3445 can_hover => 1,
3232 can_events => 1, 3446 can_events => 1,
3233 tooltip => $spell->{message}, 3447 tooltip => $spell->{message},
3234 expand => 1); 3448 expand => 1);
3235 3449
3236 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label 3450 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3237 text => (sprintf "lvl: %2d sp: %2d dmg: %2d", 3451 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3238 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}), 3452 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3239 expand => 1); 3453 expand => 1);
3240 3454
3241 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button 3455 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3242 text => "bind to key", 3456 text => "bind to key",
3243 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); 3457 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3244} 3458}
3245 3459
3246sub rebuild_spell_list { 3460sub rebuild_spell_list {
… …
3471 glLoadIdentity; 3685 glLoadIdentity;
3472 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3686 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3473 glMatrixMode GL_MODELVIEW; 3687 glMatrixMode GL_MODELVIEW;
3474 glLoadIdentity; 3688 glLoadIdentity;
3475 3689
3690 {
3691 package CFClient::UI::Base;
3692
3693 ($draw_x, $draw_y, $draw_w, $draw_h) =
3694 (0, 0, $self->{w}, $self->{h});
3695 }
3696
3476 $self->_draw; 3697 $self->_draw;
3477} 3698}
3478 3699
3479############################################################################# 3700#############################################################################
3480 3701

Diff Legend

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