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.267 by root, Thu Jun 1 04:10:29 2006 UTC vs.
Revision 1.277 by root, Sun Jun 4 00:21:52 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;
458
459 0
453} 460}
454 461
455sub find_widget { 462sub find_widget {
456 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
457 464
… …
529sub draw { 536sub draw {
530 my ($self) = @_; 537 my ($self) = @_;
531 538
532 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
533 540
541 # update screen rectangle
534 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
535 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
536 546
537 return if $draw_x + $self->{w} < 0; 547 # skip widgets that are entirely outside the drawing area
538 return if $draw_x >= $draw_w; 548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
539 return if $draw_y + $self->{h} < 0; 549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
540 return if $draw_y >= $draw_h;
541 550
542 glPushMatrix; 551 glPushMatrix;
543 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
544 $self->_draw; 553 $self->_draw;
545 glPopMatrix; 554 glPopMatrix;
… …
659our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
660 669
661sub new { 670sub new {
662 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
663 672
664 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
665 674
666 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
667 children => [], 676 children => [],
668 can_events => 0, 677 can_events => 0,
669 %arg, 678 %arg,
670 ); 679 );
680
671 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
672 683
673 $self 684 $self
674} 685}
675 686
676sub add { 687sub add {
… …
724 $x -= $self->{x}; 735 $x -= $self->{x};
725 $y -= $self->{y}; 736 $y -= $self->{y};
726 737
727 my $res; 738 my $res;
728 739
729 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
730 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
731 and return $res; 742 and return $res;
732 } 743 }
733 744
734 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
782 793
783 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
784} 795}
785 796
786############################################################################# 797#############################################################################
798
799# back-buffered drawing area
787 800
788package CFClient::UI::Window; 801package CFClient::UI::Window;
789 802
790our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
791 804
… …
944package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
945 958
946our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
947 960
948sub new { 961sub new {
949 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
950 965
951 my $self; 966 my $self;
952 967
953 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
954 vertical => 1, 969 vertical => 1,
… …
959 ; 974 ;
960 975
961 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
962 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
963 slider => $slider, 978 slider => $slider,
964 @_, 979 %arg,
965 ); 980 );
966 981
967 $self->{vp}->add ($self->{scrolled});
968 $self->add ($self->{vp});
969 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
970 984
971 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
972} 992}
973 993
974sub update { 994sub update {
975 my ($self) = @_; 995 my ($self) = @_;
976 996
… …
1048my @border = 1068my @border =
1049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1050 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);
1051 1071
1052sub new { 1072sub new {
1053 my $class = shift; 1073 my ($class, %arg) = @_;
1074
1075 my $title = delete $arg{title};
1054 1076
1055 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
1056 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
1057 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
1058 border => 0.6, 1080 border => 0.6,
1059 can_events => 1, 1081 can_events => 1,
1060 min_w => 16, 1082 min_w => 16,
1061 min_h => 16, 1083 min_h => 16,
1062 @_ 1084 %arg,
1063 ); 1085 );
1064 1086
1065 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
1066 align => 0, 1088 align => 0,
1067 valign => 1, 1089 valign => 1,
1068 text => $self->{title}, 1090 text => $title,
1069 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
1070 1093
1071 $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};
1072} 1102}
1073 1103
1074sub border { 1104sub border {
1075 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
1076} 1106}
1077 1107
1078sub size_request { 1108sub size_request {
1079 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
1080 1113
1081 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
1082 1115
1083 ( 1116 (
1084 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
1087} 1120}
1088 1121
1089sub size_allocate { 1122sub size_allocate {
1090 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
1091 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
1092 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
1093 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
1094 1135
1095 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1096 if $self->{title};
1097
1098 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
1099} 1137}
1100 1138
1101sub button_down { 1139sub button_down {
1102 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
1103 1141
… …
1122 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
1123 1161
1124 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1125 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1126 1164
1165 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1127 $self->realloc; 1166 $self->realloc;
1128 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1129 }; 1167 };
1130 1168
1131 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
1132 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1133 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1136 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1137 1175
1138 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
1139 1177
1140 $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});
1141 }; 1181 };
1182 } else {
1183 return 0;
1184 }
1185
1142 } 1186 1
1143} 1187}
1144 1188
1145sub button_up { 1189sub button_up {
1146 my ($self, $ev, $x, $y) = @_; 1190 my ($self, $ev, $x, $y) = @_;
1147 1191
1148 delete $self->{motion}; 1192 !!delete $self->{motion}
1149} 1193}
1150 1194
1151sub mouse_motion { 1195sub mouse_motion {
1152 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
1153 1197
1154 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1198 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199
1200 !!$self->{motion}
1155} 1201}
1156 1202
1157sub _draw { 1203sub _draw {
1158 my ($self) = @_; 1204 my ($self) = @_;
1159 1205
1206 my $child = $self->{children}[0];
1207
1160 my ($w, $h ) = ($self->{w}, $self->{h}); 1208 my ($w, $h ) = ($self->{w}, $self->{h});
1161 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1209 my ($cw, $ch) = ($child->{w}, $child->{h});
1162 1210
1163 glEnable GL_TEXTURE_2D; 1211 glEnable GL_TEXTURE_2D;
1164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1165 1213
1166 my $border = $self->border; 1214 my $border = $self->border;
… …
1181 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1229 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1182 } 1230 }
1183 1231
1184 glDisable GL_TEXTURE_2D; 1232 glDisable GL_TEXTURE_2D;
1185 1233
1186 $self->{title}->draw if $self->{title};
1187
1188 $self->child->draw; 1234 $child->draw;
1235
1236 if ($self->{title}) {
1237 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw;
1239 }
1189} 1240}
1190 1241
1191############################################################################# 1242#############################################################################
1192 1243
1193package CFClient::UI::Table; 1244package CFClient::UI::Table;
… …
1541} 1592}
1542 1593
1543sub size_allocate { 1594sub size_allocate {
1544 my ($self, $w, $h) = @_; 1595 my ($self, $w, $h) = @_;
1545 1596
1597 delete $self->{ox};
1598
1546 delete $self->{texture} 1599 delete $self->{texture}
1547 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1600 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1548} 1601}
1549 1602
1550sub set_fontsize { 1603sub set_fontsize {
… …
1567 $self->{layout}->set_width ($self->{w}); 1620 $self->{layout}->set_width ($self->{w});
1568 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1621 $self->{layout}->set_ellipsise ($self->{ellipsise});
1569 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1622 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1623 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1571 1624
1572 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1625 new_from_layout CFClient::Texture $self->{layout}
1626 };
1573 1627
1628 unless (exists $self->{ox}) {
1574 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1629 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1575 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1630 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1576 : ($self->{w} - $tex->{w}) * 0.5); 1631 : ($self->{w} - $tex->{w}) * 0.5);
1577 1632
1578 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1633 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1579 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1580 : ($self->{h} - $tex->{h}) * 0.5); 1635 : ($self->{h} - $tex->{h}) * 0.5);
1581
1582 $tex
1583 }; 1636 };
1584 1637
1585 glEnable GL_TEXTURE_2D; 1638 glEnable GL_TEXTURE_2D;
1586 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1587 1640
… …
1625 1678
1626 delete $self->{cur_h}; 1679 delete $self->{cur_h};
1627 1680
1628 return if $self->{text} eq $text; 1681 return if $self->{text} eq $text;
1629 1682
1630 delete $self->{texture};
1631
1632 $self->{last_activity} = $::NOW; 1683 $self->{last_activity} = $::NOW;
1633 $self->{text} = $text; 1684 $self->{text} = $text;
1634 1685
1635 $text =~ s/./*/g if $self->{hidden}; 1686 $text =~ s/./*/g if $self->{hidden};
1636 $self->{layout}->set_text ("$text "); 1687 $self->{layout}->set_text ("$text ");
1637 1688
1638 $self->_emit (changed => $self->{text}); 1689 $self->_emit (changed => $self->{text});
1690 $self->update;
1639} 1691}
1640 1692
1641sub set_text { 1693sub set_text {
1642 my ($self, $text) = @_; 1694 my ($self, $text) = @_;
1643 1695
… …
1682 $self->{cursor} = length $text; 1734 $self->{cursor} = length $text;
1683 } elsif ($uni == 27) { 1735 } elsif ($uni == 27) {
1684 $self->_emit ('escape'); 1736 $self->_emit ('escape');
1685 } elsif ($uni) { 1737 } elsif ($uni) {
1686 substr $text, $self->{cursor}++, 0, chr $uni; 1738 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else {
1740 return 0;
1687 } 1741 }
1688 1742
1689 $self->_set_text ($text); 1743 $self->_set_text ($text);
1690 1744
1691 $self->realloc; 1745 $self->realloc;
1746
1747 1
1692} 1748}
1693 1749
1694sub focus_in { 1750sub focus_in {
1695 my ($self) = @_; 1751 my ($self) = @_;
1696 1752
… …
1711 utf8::encode $text; 1767 utf8::encode $text;
1712 $self->{cursor} = length substr $text, 0, $idx; 1768 $self->{cursor} = length substr $text, 0, $idx;
1713 1769
1714 $self->_set_text ($self->{text}); 1770 $self->_set_text ($self->{text});
1715 $self->update; 1771 $self->update;
1772
1773 1
1716} 1774}
1717 1775
1718sub mouse_motion { 1776sub mouse_motion {
1719 my ($self, $ev, $x, $y) = @_; 1777 my ($self, $ev, $x, $y) = @_;
1720# 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
1721} 1781}
1722 1782
1723sub _draw { 1783sub _draw {
1724 my ($self) = @_; 1784 my ($self) = @_;
1725 1785
… …
1802 } else { 1862 } else {
1803 $self->set_text ($self->{history_saveback}); 1863 $self->set_text ($self->{history_saveback});
1804 } 1864 }
1805 1865
1806 } else { 1866 } else {
1807 $self->SUPER::key_down ($ev); 1867 return $self->SUPER::key_down ($ev)
1868 }
1869
1808 } 1870 1
1809
1810} 1871}
1811 1872
1812############################################################################# 1873#############################################################################
1813 1874
1814package CFClient::UI::Button; 1875package CFClient::UI::Button;
… …
1843 my ($self, $ev, $x, $y) = @_; 1904 my ($self, $ev, $x, $y) = @_;
1844 1905
1845 $self->emit ("activate") 1906 $self->emit ("activate")
1846 if $x >= 0 && $x < $self->{w} 1907 if $x >= 0 && $x < $self->{w}
1847 && $y >= 0 && $y < $self->{h}; 1908 && $y >= 0 && $y < $self->{h};
1909
1910 1
1848} 1911}
1849 1912
1850sub _draw { 1913sub _draw {
1851 my ($self) = @_; 1914 my ($self) = @_;
1852 1915
… …
1906 1969
1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1909 $self->{state} = !$self->{state}; 1972 $self->{state} = !$self->{state};
1910 $self->_emit (changed => $self->{state}); 1973 $self->_emit (changed => $self->{state});
1974 } else {
1975 return 0
1976 }
1977
1911 } 1978 1
1912} 1979}
1913 1980
1914sub _draw { 1981sub _draw {
1915 my ($self) = @_; 1982 my ($self) = @_;
1916 1983
… …
2254 2321
2255 $self->SUPER::button_down ($ev, $x, $y); 2322 $self->SUPER::button_down ($ev, $x, $y);
2256 2323
2257 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2258 2325
2259 $self->mouse_motion ($ev, $x, $y); 2326 $self->mouse_motion ($ev, $x, $y)
2260} 2327}
2261 2328
2262sub mouse_motion { 2329sub mouse_motion {
2263 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2264 2331
… …
2268 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2335 my (undef, $lo, $hi, $page) = @{$self->{range}};
2269 2336
2270 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2337 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2271 2338
2272 $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
2273 } 2344 1
2274} 2345}
2275 2346
2276sub update { 2347sub update {
2277 my ($self) = @_; 2348 my ($self) = @_;
2278 2349
2279 $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}) {
2280 $self->set_value ($self->{range}[0]); 2358 $self->set_value ($self->{range}[0]);
2281 2359
2282 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2360 my ($value, $lo, $hi, $page) = @{$self->{range}};
2283 my $range = ($hi - $page - $lo) || 1e-100; 2361 my $range = ($hi - $page - $lo) || 1e-100;
2284 2362
… …
2290 $value = ($value - $lo) / $range; 2368 $value = ($value - $lo) / $range;
2291 $value = $value * $self->{scale} + $self->{offset}; 2369 $value = $value * $self->{scale} + $self->{offset};
2292 2370
2293 $self->{knob_x} = $value - $knob_w * 0.5; 2371 $self->{knob_x} = $value - $knob_w * 0.5;
2294 $self->{knob_w} = $knob_w; 2372 $self->{knob_w} = $knob_w;
2295 }); 2373 }
2296
2297 $self->SUPER::update;
2298}
2299
2300sub _draw {
2301 my ($self) = @_;
2302 2374
2303 $self->SUPER::_draw (); 2375 $self->SUPER::_draw ();
2304 2376
2305 glScale $self->{w}, $self->{h}; 2377 glScale $self->{w}, $self->{h};
2306 2378
… …
2800 $self->SUPER::DESTROY; 2872 $self->SUPER::DESTROY;
2801} 2873}
2802 2874
2803############################################################################# 2875#############################################################################
2804 2876
2877package CFClient::UI::Buttonbar;
2878
2879our @ISA = CFClient::UI::HBox::;
2880
2881# TODO: should actualyl wrap buttons and other goodies.
2882
2883#############################################################################
2884
2805package CFClient::UI::Menu; 2885package CFClient::UI::Menu;
2806 2886
2807our @ISA = CFClient::UI::FancyFrame::; 2887our @ISA = CFClient::UI::FancyFrame::;
2808 2888
2809use CFClient::OpenGL; 2889use CFClient::OpenGL;
… …
2856 my ($self, $ev, $x, $y) = @_; 2936 my ($self, $ev, $x, $y) = @_;
2857 2937
2858 # TODO: should use vbox->find_widget or so 2938 # TODO: should use vbox->find_widget or so
2859 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2860 $self->{hover} = $self->{item}{$HOVER}; 2940 $self->{hover} = $self->{item}{$HOVER};
2941
2942 0
2861} 2943}
2862 2944
2863sub button_up { 2945sub button_up {
2864 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2865 2947
… …
2867 undef $GRAB; 2949 undef $GRAB;
2868 $self->hide; 2950 $self->hide;
2869 2951
2870 $self->_emit ("popdown"); 2952 $self->_emit ("popdown");
2871 $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 );
2872 } 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});
2873} 3067}
2874 3068
2875############################################################################# 3069#############################################################################
2876 3070
2877package CFClient::UI::Statusbox; 3071package CFClient::UI::Statusbox;
… …
2990 3184
2991sub new { 3185sub new {
2992 my $class = shift; 3186 my $class = shift;
2993 3187
2994 my $self = $class->SUPER::new ( 3188 my $self = $class->SUPER::new (
2995 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3189 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2996 @_, 3190 @_,
2997 ); 3191 );
2998 3192
2999 $self 3193 $self
3000} 3194}
3001 3195
3002sub set_items { 3196sub set_items {
3003 my ($self, $items) = @_; 3197 my ($self, $items) = @_;
3004 3198
3005 $self->{scrolled}->clear; 3199 $self->{child}->clear;
3006 return unless $items; 3200 return unless $items;
3007 3201
3008 my @items = sort { 3202 my @items = sort {
3009 ($a->{type} <=> $b->{type}) 3203 ($a->{type} <=> $b->{type})
3010 or ($a->{name} cmp $b->{name}) 3204 or ($a->{name} cmp $b->{name})
… …
3014 3208
3015 my $row = 0; 3209 my $row = 0;
3016 for my $item (@items) { 3210 for my $item (@items) {
3017 CFClient::Item::update_widgets $item; 3211 CFClient::Item::update_widgets $item;
3018 3212
3019 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3213 $self->{child}->add (0, $row, $item->{face_widget});
3020 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3214 $self->{child}->add (1, $row, $item->{desc_widget});
3021 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3215 $self->{child}->add (2, $row, $item->{weight_widget});
3022 3216
3023 $row++; 3217 $row++;
3024 } 3218 }
3025} 3219}
3026 3220
… …
3124 $rec = $::CONN->stop_record if $::CONN; 3318 $rec = $::CONN->stop_record if $::CONN;
3125 return unless ref $rec eq 'ARRAY'; 3319 return unless ref $rec eq 'ARRAY';
3126 $self->set_command_list ($rec); 3320 $self->set_command_list ($rec);
3127} 3321}
3128 3322
3129# 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
3130sub ask_for_bind { 3329sub ask_for_bind {
3131 my ($self, $commit) = @_; 3330 my ($self, $commit) = @_;
3132 3331
3133 CFClient::Binder::open_binding_dialog (sub { 3332 CFClient::Binder::open_binding_dialog (sub {
3134 my ($mod, $sym) = @_; 3333 my ($mod, $sym) = @_;
… …
3218 3417
3219############################################################################# 3418#############################################################################
3220 3419
3221package CFClient::UI::SpellList; 3420package CFClient::UI::SpellList;
3222 3421
3223our @ISA = CFClient::UI::FancyFrame::; 3422our @ISA = CFClient::UI::Table::;
3224 3423
3225sub new { 3424sub new {
3226 my $class = shift; 3425 my $class = shift;
3227 3426
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3427 my $self = $class->SUPER::new (
3229 3428 binding => [],
3230 $self->add (new CFClient::UI::ScrolledWindow 3429 commands => [],
3231 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3430 @_,
3232 3431 )
3233 $self;
3234} 3432}
3235 3433
3236# XXX: Do sorting? Argl... 3434# XXX: Do sorting? Argl...
3237sub add_spell { 3435sub add_spell {
3238 my ($self, $spell) = @_; 3436 my ($self, $spell) = @_;
3239 $self->{spells}->{$spell->{name}} = $spell; 3437 $self->{spells}->{$spell->{name}} = $spell;
3240 3438
3241 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face 3439 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3242 face => $spell->{face}, 3440 face => $spell->{face},
3243 can_hover => 1, 3441 can_hover => 1,
3244 can_events => 1, 3442 can_events => 1,
3245 tooltip => $spell->{message}); 3443 tooltip => $spell->{message});
3246 3444
3247 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label 3445 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3248 text => $spell->{name}, 3446 text => $spell->{name},
3249 can_hover => 1, 3447 can_hover => 1,
3250 can_events => 1, 3448 can_events => 1,
3251 tooltip => $spell->{message}, 3449 tooltip => $spell->{message},
3252 expand => 1); 3450 expand => 1);
3253 3451
3254 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label 3452 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3255 text => (sprintf "lvl: %2d sp: %2d dmg: %2d", 3453 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3256 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}), 3454 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3257 expand => 1); 3455 expand => 1);
3258 3456
3259 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button 3457 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3260 text => "bind to key", 3458 text => "bind to key",
3261 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); 3459 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3262} 3460}
3263 3461
3264sub rebuild_spell_list { 3462sub rebuild_spell_list {

Diff Legend

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