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.272 by root, Sat Jun 3 01:47:14 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})
… …
803 $self->SUPER::size_allocate ($w, $h); 821 $self->SUPER::size_allocate ($w, $h);
804 $self->update; 822 $self->update;
805} 823}
806 824
807sub _render { 825sub _render {
826 my ($self) = @_;
827
808 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
809} 829}
810 830
811sub render_child { 831sub render_child {
812 my ($self) = @_; 832 my ($self) = @_;
813 833
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
817 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
818 $self->_render; 845 $self->_render;
819 }; 846 };
820} 847}
821 848
822sub _draw { 849sub _draw {
823 my ($self) = @_; 850 my ($self) = @_;
824 851
825 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
826 853
827 my $tex = $self->{texture} 854 my $tex = $self->{texture}
828 or return; 855 or return;
829 856
830 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
… …
912 } 939 }
913} 940}
914 941
915sub _render { 942sub _render {
916 my ($self) = @_; 943 my ($self) = @_;
944
945 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
946 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
917 947
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 949
920 $self->SUPER::_render; 950 $self->SUPER::_render;
921} 951}
… …
1029my @border = 1059my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1060 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); 1061 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1062
1033sub new { 1063sub new {
1034 my $class = shift; 1064 my ($class, %arg) = @_;
1065
1066 my $title = delete $arg{title};
1035 1067
1036 my $self = $class->SUPER::new ( 1068 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1069 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1070 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1071 border => 0.6,
1040 can_events => 1, 1072 can_events => 1,
1041 min_w => 16, 1073 min_w => 16,
1042 min_h => 16, 1074 min_h => 16,
1043 @_ 1075 %arg,
1044 ); 1076 );
1045 1077
1046 $self->{title} &&= new CFClient::UI::Label 1078 $self->{title} = new CFClient::UI::Label
1047 align => 0, 1079 align => 0,
1048 valign => 1, 1080 valign => 1,
1049 text => $self->{title}, 1081 text => $title,
1050 fontsize => $self->{border}; 1082 fontsize => $self->{border}
1083 if defined $title;
1051 1084
1052 $self 1085 $self
1086}
1087
1088sub add {
1089 my ($self, @widgets) = @_;
1090
1091 $self->SUPER::add (@widgets);
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1053} 1093}
1054 1094
1055sub border { 1095sub border {
1056 int $_[0]{border} * $::FONTSIZE 1096 int $_[0]{border} * $::FONTSIZE
1057} 1097}
1058 1098
1059sub size_request { 1099sub size_request {
1060 my ($self) = @_; 1100 my ($self) = @_;
1101
1102 $self->{title}->size_request
1103 if $self->{title};
1061 1104
1062 my ($w, $h) = $self->SUPER::size_request; 1105 my ($w, $h) = $self->SUPER::size_request;
1063 1106
1064 ( 1107 (
1065 $w + $self->border * 2, 1108 $w + $self->border * 2,
… …
1068} 1111}
1069 1112
1070sub size_allocate { 1113sub size_allocate {
1071 my ($self, $w, $h) = @_; 1114 my ($self, $w, $h) = @_;
1072 1115
1116 if ($self->{title}) {
1117 $self->{title}{w} = $w;
1118 $self->{title}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h);
1120 }
1121
1122 my $border = $self->border;
1123
1073 $h -= List::Util::max 0, $self->border * 2; 1124 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1125 $w -= List::Util::max 0, $border * 2;
1075 1126
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); 1127 $self->child->configure ($border, $border, $w, $h);
1080} 1128}
1081 1129
1082sub button_down { 1130sub button_down {
1083 my ($self, $ev, $x, $y) = @_; 1131 my ($self, $ev, $x, $y) = @_;
1084 1132
… …
1118 1166
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1167 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1168
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1122 }; 1170 };
1171 } else {
1172 return 0;
1173 }
1174
1123 } 1175 1
1124} 1176}
1125 1177
1126sub button_up { 1178sub button_up {
1127 my ($self, $ev, $x, $y) = @_; 1179 my ($self, $ev, $x, $y) = @_;
1128 1180
1129 delete $self->{motion}; 1181 !!delete $self->{motion}
1130} 1182}
1131 1183
1132sub mouse_motion { 1184sub mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1185 my ($self, $ev, $x, $y) = @_;
1134 1186
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1187 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188
1189 !!$self->{motion}
1136} 1190}
1137 1191
1138sub _draw { 1192sub _draw {
1139 my ($self) = @_; 1193 my ($self) = @_;
1140 1194
1195 my $child = $self->{children}[0];
1196
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1197 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1198 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1199
1144 glEnable GL_TEXTURE_2D; 1200 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1201 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1202
1147 my $border = $self->border; 1203 my $border = $self->border;
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1218 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1219 }
1164 1220
1165 glDisable GL_TEXTURE_2D; 1221 glDisable GL_TEXTURE_2D;
1166 1222
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1223 $child->draw;
1224
1225 if ($self->{title}) {
1226 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw;
1228 }
1170} 1229}
1171 1230
1172############################################################################# 1231#############################################################################
1173 1232
1174package CFClient::UI::Table; 1233package CFClient::UI::Table;
… …
1522} 1581}
1523 1582
1524sub size_allocate { 1583sub size_allocate {
1525 my ($self, $w, $h) = @_; 1584 my ($self, $w, $h) = @_;
1526 1585
1586 delete $self->{ox};
1587
1527 delete $self->{texture} 1588 delete $self->{texture}
1528 ;#d# 1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1529} 1590}
1530 1591
1531sub set_fontsize { 1592sub set_fontsize {
1532 my ($self, $fontsize) = @_; 1593 my ($self, $fontsize) = @_;
1533 1594
… …
1548 $self->{layout}->set_width ($self->{w}); 1609 $self->{layout}->set_width ($self->{w});
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1610 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1613
1553 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1614 new_from_layout CFClient::Texture $self->{layout}
1615 };
1554 1616
1617 unless (exists $self->{ox}) {
1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1557 : ($self->{w} - $tex->{w}) * 0.5); 1620 : ($self->{w} - $tex->{w}) * 0.5);
1558 1621
1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1561 : ($self->{h} - $tex->{h}) * 0.5); 1624 : ($self->{h} - $tex->{h}) * 0.5);
1562
1563 $tex
1564 }; 1625 };
1565 1626
1566 glEnable GL_TEXTURE_2D; 1627 glEnable GL_TEXTURE_2D;
1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1568 1629
… …
1663 $self->{cursor} = length $text; 1724 $self->{cursor} = length $text;
1664 } elsif ($uni == 27) { 1725 } elsif ($uni == 27) {
1665 $self->_emit ('escape'); 1726 $self->_emit ('escape');
1666 } elsif ($uni) { 1727 } elsif ($uni) {
1667 substr $text, $self->{cursor}++, 0, chr $uni; 1728 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else {
1730 return 0;
1668 } 1731 }
1669 1732
1670 $self->_set_text ($text); 1733 $self->_set_text ($text);
1671 1734
1672 $self->realloc; 1735 $self->realloc;
1736
1737 1
1673} 1738}
1674 1739
1675sub focus_in { 1740sub focus_in {
1676 my ($self) = @_; 1741 my ($self) = @_;
1677 1742
… …
1692 utf8::encode $text; 1757 utf8::encode $text;
1693 $self->{cursor} = length substr $text, 0, $idx; 1758 $self->{cursor} = length substr $text, 0, $idx;
1694 1759
1695 $self->_set_text ($self->{text}); 1760 $self->_set_text ($self->{text});
1696 $self->update; 1761 $self->update;
1762
1763 1
1697} 1764}
1698 1765
1699sub mouse_motion { 1766sub mouse_motion {
1700 my ($self, $ev, $x, $y) = @_; 1767 my ($self, $ev, $x, $y) = @_;
1701# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1768# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769
1770 0
1702} 1771}
1703 1772
1704sub _draw { 1773sub _draw {
1705 my ($self) = @_; 1774 my ($self) = @_;
1706 1775
… …
1783 } else { 1852 } else {
1784 $self->set_text ($self->{history_saveback}); 1853 $self->set_text ($self->{history_saveback});
1785 } 1854 }
1786 1855
1787 } else { 1856 } else {
1788 $self->SUPER::key_down ($ev); 1857 return $self->SUPER::key_down ($ev)
1858 }
1859
1789 } 1860 1
1790
1791} 1861}
1792 1862
1793############################################################################# 1863#############################################################################
1794 1864
1795package CFClient::UI::Button; 1865package CFClient::UI::Button;
… …
1824 my ($self, $ev, $x, $y) = @_; 1894 my ($self, $ev, $x, $y) = @_;
1825 1895
1826 $self->emit ("activate") 1896 $self->emit ("activate")
1827 if $x >= 0 && $x < $self->{w} 1897 if $x >= 0 && $x < $self->{w}
1828 && $y >= 0 && $y < $self->{h}; 1898 && $y >= 0 && $y < $self->{h};
1899
1900 1
1829} 1901}
1830 1902
1831sub _draw { 1903sub _draw {
1832 my ($self) = @_; 1904 my ($self) = @_;
1833 1905
… …
1887 1959
1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1890 $self->{state} = !$self->{state}; 1962 $self->{state} = !$self->{state};
1891 $self->_emit (changed => $self->{state}); 1963 $self->_emit (changed => $self->{state});
1964 } else {
1965 return 0
1966 }
1967
1892 } 1968 1
1893} 1969}
1894 1970
1895sub _draw { 1971sub _draw {
1896 my ($self) = @_; 1972 my ($self) = @_;
1897 1973
… …
2235 2311
2236 $self->SUPER::button_down ($ev, $x, $y); 2312 $self->SUPER::button_down ($ev, $x, $y);
2237 2313
2238 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239 2315
2240 $self->mouse_motion ($ev, $x, $y); 2316 $self->mouse_motion ($ev, $x, $y)
2241} 2317}
2242 2318
2243sub mouse_motion { 2319sub mouse_motion {
2244 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
2245 2321
… …
2249 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2325 my (undef, $lo, $hi, $page) = @{$self->{range}};
2250 2326
2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2327 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252 2328
2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2329 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2330 } else {
2331 return 0;
2332 }
2333
2254 } 2334 1
2255} 2335}
2256 2336
2257sub update { 2337sub update {
2258 my ($self) = @_; 2338 my ($self) = @_;
2259 2339
… …
2781 $self->SUPER::DESTROY; 2861 $self->SUPER::DESTROY;
2782} 2862}
2783 2863
2784############################################################################# 2864#############################################################################
2785 2865
2866package CFClient::UI::Buttonbar;
2867
2868our @ISA = CFClient::UI::HBox::;
2869
2870# TODO: should actualyl wrap buttons and other goodies.
2871
2872#############################################################################
2873
2786package CFClient::UI::Menu; 2874package CFClient::UI::Menu;
2787 2875
2788our @ISA = CFClient::UI::FancyFrame::; 2876our @ISA = CFClient::UI::FancyFrame::;
2789 2877
2790use CFClient::OpenGL; 2878use CFClient::OpenGL;
… …
2837 my ($self, $ev, $x, $y) = @_; 2925 my ($self, $ev, $x, $y) = @_;
2838 2926
2839 # TODO: should use vbox->find_widget or so 2927 # TODO: should use vbox->find_widget or so
2840 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2841 $self->{hover} = $self->{item}{$HOVER}; 2929 $self->{hover} = $self->{item}{$HOVER};
2930
2931 0
2842} 2932}
2843 2933
2844sub button_up { 2934sub button_up {
2845 my ($self, $ev, $x, $y) = @_; 2935 my ($self, $ev, $x, $y) = @_;
2846 2936
… …
2848 undef $GRAB; 2938 undef $GRAB;
2849 $self->hide; 2939 $self->hide;
2850 2940
2851 $self->_emit ("popdown"); 2941 $self->_emit ("popdown");
2852 $self->{hover}[1]->() if $self->{hover}; 2942 $self->{hover}[1]->() if $self->{hover};
2943 } else {
2944 return 0
2945 }
2946
2853 } 2947 1
2948}
2949
2950#############################################################################
2951
2952package CFClient::UI::Multiplexer;
2953
2954our @ISA = CFClient::UI::Container::;
2955
2956sub new {
2957 my $class = shift;
2958
2959 my $self = $class->SUPER::new (
2960 @_,
2961 );
2962
2963 $self->{current} = $self->{children}[0]
2964 if @{ $self->{children} };
2965
2966 $self
2967}
2968
2969sub add {
2970 my ($self, @widgets) = @_;
2971
2972 $self->SUPER::add (@widgets);
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976}
2977
2978sub set_current_page {
2979 my ($self, $page_or_widget) = @_;
2980
2981 my $widget = ref $page_or_widget
2982 ? $page_or_widget
2983 : $self->{children}[$page_or_widget];
2984
2985 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987
2988 $self->_emit (page_changed => $self->{current});
2989
2990 $self->realloc;
2991}
2992
2993sub visible_children {
2994 $_[0]{current}
2995}
2996
2997sub size_request {
2998 my ($self) = @_;
2999
3000 $self->{current}->size_request
3001}
3002
3003sub size_allocate {
3004 my ($self, $w, $h) = @_;
3005
3006 $self->{current}->configure (0, 0, $w, $h);
3007}
3008
3009sub _draw {
3010 my ($self) = @_;
3011
3012 $self->{current}->draw;
3013}
3014
3015#############################################################################
3016
3017package CFClient::UI::Notebook;
3018
3019our @ISA = CFClient::UI::VBox::;
3020
3021sub new {
3022 my $class = shift;
3023
3024 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3027 @_,
3028 );
3029
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer});
3031
3032 $self
3033}
3034
3035sub add {
3036 my ($self, $title, $widget, $tooltip) = @_;
3037
3038 Scalar::Util::weaken $self;
3039
3040 $self->{buttonbar}->add (new CFClient::UI::Button
3041 markup => $title,
3042 tooltip => $tooltip,
3043 on_activate => sub { $self->set_current_page ($widget) },
3044 );
3045
3046 $self->{multiplexer}->add ($widget);
3047}
3048
3049sub set_current_page {
3050 my ($self, $page) = @_;
3051
3052 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current});
2854} 3054}
2855 3055
2856############################################################################# 3056#############################################################################
2857 3057
2858package CFClient::UI::Statusbox; 3058package CFClient::UI::Statusbox;
… …
3105 $rec = $::CONN->stop_record if $::CONN; 3305 $rec = $::CONN->stop_record if $::CONN;
3106 return unless ref $rec eq 'ARRAY'; 3306 return unless ref $rec eq 'ARRAY';
3107 $self->set_command_list ($rec); 3307 $self->set_command_list ($rec);
3108} 3308}
3109 3309
3110# if $commit is true, the binding will be set after the user entered a key combo 3310
3311sub ask_for_bind_and_commit {
3312 my ($self) = @_;
3313 $self->ask_for_bind (1);
3314}
3315
3111sub ask_for_bind { 3316sub ask_for_bind {
3112 my ($self, $commit) = @_; 3317 my ($self, $commit) = @_;
3113 3318
3114 CFClient::Binder::open_binding_dialog (sub { 3319 CFClient::Binder::open_binding_dialog (sub {
3115 my ($mod, $sym) = @_; 3320 my ($mod, $sym) = @_;
… …
3199 3404
3200############################################################################# 3405#############################################################################
3201 3406
3202package CFClient::UI::SpellList; 3407package CFClient::UI::SpellList;
3203 3408
3204our @ISA = CFClient::UI::FancyFrame::; 3409our @ISA = CFClient::UI::ScrolledWindow::;
3205 3410
3206sub new { 3411sub new {
3207 my $class = shift; 3412 my $class = shift;
3208 3413
3209 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3414 my $self = $class->SUPER::new (
3210 3415 binding => [],
3211 $self->add (new CFClient::UI::ScrolledWindow 3416 commands => [],
3212 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3417 scrolled => (new CFClient::UI::Table),
3213 3418 @_,
3214 $self; 3419 )
3215} 3420}
3216 3421
3217# XXX: Do sorting? Argl... 3422# XXX: Do sorting? Argl...
3218sub add_spell { 3423sub add_spell {
3219 my ($self, $spell) = @_; 3424 my ($self, $spell) = @_;
3220 $self->{spells}->{$spell->{name}} = $spell; 3425 $self->{spells}->{$spell->{name}} = $spell;
3221 3426
3222 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face 3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223 face => $spell->{face}, 3428 face => $spell->{face},
3224 can_hover => 1, 3429 can_hover => 1,
3225 can_events => 1, 3430 can_events => 1,
3226 tooltip => $spell->{message}); 3431 tooltip => $spell->{message});
3227 3432
3228 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label 3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229 text => $spell->{name}, 3434 text => $spell->{name},
3230 can_hover => 1, 3435 can_hover => 1,
3231 can_events => 1, 3436 can_events => 1,
3232 tooltip => $spell->{message}, 3437 tooltip => $spell->{message},
3233 expand => 1); 3438 expand => 1);
3234 3439
3235 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label 3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236 text => (sprintf "lvl: %2d sp: %2d dmg: %2d", 3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}), 3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3238 expand => 1); 3443 expand => 1);
3239 3444
3240 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button 3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241 text => "bind to key", 3446 text => "bind to key",
3242 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); 3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243} 3448}
3244 3449
3245sub rebuild_spell_list { 3450sub rebuild_spell_list {
… …
3372 $_->() 3577 $_->()
3373 for values %{delete $self->{refresh_hook}}; 3578 for values %{delete $self->{refresh_hook}};
3374 } 3579 }
3375 3580
3376 if ($self->{realloc}) { 3581 if ($self->{realloc}) {
3582 my %queue;
3377 my @queue; 3583 my @queue;
3584 my $widget;
3378 3585
3586 outer:
3379 while () { 3587 while () {
3380 if ($self->{realloc}) { 3588 if (my $realloc = delete $self->{realloc}) {
3381 #TODO use array-of-depth approach 3589 for $widget (values %$realloc) {
3590 $widget->{visible} or next; # do not resize invisible widgets
3382 3591
3383 use sort 'stable'; 3592 $queue{$widget+0}++ and next; # duplicates are common
3384 3593
3385 @queue = sort { $a->{visible} <=> $b->{visible} } 3594 push @{ $queue[$widget->{visible}] }, $widget;
3386 @queue, values %{delete $self->{realloc}}; 3595 }
3387 } 3596 }
3388 3597
3598 while () {
3599 @queue or last outer;
3600
3389 my $widget = pop @queue || last; 3601 $widget = pop @{ $queue[-1] || [] }
3602 and last;
3603
3604 pop @queue;
3605 }
3390 3606
3391 $widget->{visible} or last; # do not resize invisible widgets 3607 delete $queue{$widget+0};
3392 3608
3393 my ($w, $h) = $widget->size_request; 3609 my ($w, $h) = $widget->size_request;
3394 3610
3395 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3611 $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; 3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
… …
3404 $widget->{req_h} = $h; 3620 $widget->{req_h} = $h;
3405 3621
3406 $self->{size_alloc}{$widget+0} = $widget; 3622 $self->{size_alloc}{$widget+0} = $widget;
3407 3623
3408 if (my $parent = $widget->{parent}) { 3624 if (my $parent = $widget->{parent}) {
3409 $self->{realloc}{$parent+0} = $parent; 3625 $self->{realloc}{$parent+0} = $parent
3410 #unshift @queue, $parent; 3626 unless $queue{$parent+0};
3627
3411 $parent->{force_size_alloc} = 1; 3628 $parent->{force_size_alloc} = 1;
3412 $self->{size_alloc}{$parent+0} = $parent; 3629 $self->{size_alloc}{$parent+0} = $parent;
3413 } 3630 }
3414 } 3631 }
3415 3632
… …
3431 3648
3432 $w = int $w + 0.5; 3649 $w = int $w + 0.5;
3433 $h = int $h + 0.5; 3650 $h = int $h + 0.5;
3434 3651
3435 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3652 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3653 $widget->{old_w} = $widget->{w};
3654 $widget->{old_h} = $widget->{h};
3655
3436 $widget->{w} = $w; 3656 $widget->{w} = $w;
3437 $widget->{h} = $h; 3657 $widget->{h} = $h;
3438 3658
3439 $widget->emit (size_allocate => $w, $h); 3659 $widget->emit (size_allocate => $w, $h);
3440 } 3660 }
… …
3455 glLoadIdentity; 3675 glLoadIdentity;
3456 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3676 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3457 glMatrixMode GL_MODELVIEW; 3677 glMatrixMode GL_MODELVIEW;
3458 glLoadIdentity; 3678 glLoadIdentity;
3459 3679
3680 {
3681 package CFClient::UI::Base;
3682
3683 ($draw_x, $draw_y, $draw_w, $draw_h) =
3684 (0, 0, $self->{w}, $self->{h});
3685 }
3686
3460 $self->_draw; 3687 $self->_draw;
3461} 3688}
3462 3689
3463############################################################################# 3690#############################################################################
3464 3691

Diff Legend

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