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.264 by root, Thu Jun 1 02:58:30 2006 UTC vs.
Revision 1.273 by root, Sat Jun 3 02:32:35 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;
… …
913} 940}
914 941
915sub _render { 942sub _render {
916 my ($self) = @_; 943 my ($self) = @_;
917 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};
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}
922 952
… …
925package CFClient::UI::ScrolledWindow; 955package CFClient::UI::ScrolledWindow;
926 956
927our @ISA = CFClient::UI::HBox::; 957our @ISA = CFClient::UI::HBox::;
928 958
929sub new { 959sub new {
930 my $class = shift; 960 my ($class, %arg) = @_;
961
962 my $child = delete $arg{child};
931 963
932 my $self; 964 my $self;
933 965
934 my $slider = new CFClient::UI::Slider 966 my $slider = new CFClient::UI::Slider
935 vertical => 1, 967 vertical => 1,
… …
940 ; 972 ;
941 973
942 $self = $class->SUPER::new ( 974 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 975 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider, 976 slider => $slider,
945 @_, 977 %arg,
946 ); 978 );
947 979
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider}); 980 $self->SUPER::add ($self->{vp}, $self->{slider});
981 $self->add ($child) if $child;
951 982
952 $self 983 $self
984}
985
986sub add {
987 my ($self, $widget) = @_;
988
989 $self->{vp}->add ($self->{child} = $widget);
953} 990}
954 991
955sub update { 992sub update {
956 my ($self) = @_; 993 my ($self) = @_;
957 994
… …
1029my @border = 1066my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1067 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); 1068 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1069
1033sub new { 1070sub new {
1034 my $class = shift; 1071 my ($class, %arg) = @_;
1072
1073 my $title = delete $arg{title};
1035 1074
1036 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1078 border => 0.6,
1040 can_events => 1, 1079 can_events => 1,
1041 min_w => 16, 1080 min_w => 16,
1042 min_h => 16, 1081 min_h => 16,
1043 @_ 1082 %arg,
1044 ); 1083 );
1045 1084
1046 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title} = new CFClient::UI::Label
1047 align => 0, 1086 align => 0,
1048 valign => 1, 1087 valign => 1,
1049 text => $self->{title}, 1088 text => $title,
1050 fontsize => $self->{border}; 1089 fontsize => $self->{border}
1090 if defined $title;
1051 1091
1052 $self 1092 $self
1093}
1094
1095sub add {
1096 my ($self, @widgets) = @_;
1097
1098 $self->SUPER::add (@widgets);
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1053} 1100}
1054 1101
1055sub border { 1102sub border {
1056 int $_[0]{border} * $::FONTSIZE 1103 int $_[0]{border} * $::FONTSIZE
1057} 1104}
1058 1105
1059sub size_request { 1106sub size_request {
1060 my ($self) = @_; 1107 my ($self) = @_;
1108
1109 $self->{title}->size_request
1110 if $self->{title};
1061 1111
1062 my ($w, $h) = $self->SUPER::size_request; 1112 my ($w, $h) = $self->SUPER::size_request;
1063 1113
1064 ( 1114 (
1065 $w + $self->border * 2, 1115 $w + $self->border * 2,
… …
1068} 1118}
1069 1119
1070sub size_allocate { 1120sub size_allocate {
1071 my ($self, $w, $h) = @_; 1121 my ($self, $w, $h) = @_;
1072 1122
1123 if ($self->{title}) {
1124 $self->{title}{w} = $w;
1125 $self->{title}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h);
1127 }
1128
1129 my $border = $self->border;
1130
1073 $h -= List::Util::max 0, $self->border * 2; 1131 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1132 $w -= List::Util::max 0, $border * 2;
1075 1133
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); 1134 $self->child->configure ($border, $border, $w, $h);
1080} 1135}
1081 1136
1082sub button_down { 1137sub button_down {
1083 my ($self, $ev, $x, $y) = @_; 1138 my ($self, $ev, $x, $y) = @_;
1084 1139
… …
1118 1173
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1174 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1175
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1176 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1122 }; 1177 };
1178 } else {
1179 return 0;
1180 }
1181
1123 } 1182 1
1124} 1183}
1125 1184
1126sub button_up { 1185sub button_up {
1127 my ($self, $ev, $x, $y) = @_; 1186 my ($self, $ev, $x, $y) = @_;
1128 1187
1129 delete $self->{motion}; 1188 !!delete $self->{motion}
1130} 1189}
1131 1190
1132sub mouse_motion { 1191sub mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1134 1193
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1194 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195
1196 !!$self->{motion}
1136} 1197}
1137 1198
1138sub _draw { 1199sub _draw {
1139 my ($self) = @_; 1200 my ($self) = @_;
1140 1201
1202 my $child = $self->{children}[0];
1203
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1204 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1205 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1206
1144 glEnable GL_TEXTURE_2D; 1207 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1208 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1209
1147 my $border = $self->border; 1210 my $border = $self->border;
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1225 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1226 }
1164 1227
1165 glDisable GL_TEXTURE_2D; 1228 glDisable GL_TEXTURE_2D;
1166 1229
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1230 $child->draw;
1231
1232 if ($self->{title}) {
1233 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw;
1235 }
1170} 1236}
1171 1237
1172############################################################################# 1238#############################################################################
1173 1239
1174package CFClient::UI::Table; 1240package CFClient::UI::Table;
… …
1522} 1588}
1523 1589
1524sub size_allocate { 1590sub size_allocate {
1525 my ($self, $w, $h) = @_; 1591 my ($self, $w, $h) = @_;
1526 1592
1593 delete $self->{ox};
1594
1527 delete $self->{texture} 1595 delete $self->{texture}
1528 ;#d# 1596 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1529} 1597}
1530 1598
1531sub set_fontsize { 1599sub set_fontsize {
1532 my ($self, $fontsize) = @_; 1600 my ($self, $fontsize) = @_;
1533 1601
… …
1548 $self->{layout}->set_width ($self->{w}); 1616 $self->{layout}->set_width ($self->{w});
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1617 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1618 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1619 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1620
1553 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1621 new_from_layout CFClient::Texture $self->{layout}
1622 };
1554 1623
1624 unless (exists $self->{ox}) {
1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1625 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1626 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1557 : ($self->{w} - $tex->{w}) * 0.5); 1627 : ($self->{w} - $tex->{w}) * 0.5);
1558 1628
1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1629 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1561 : ($self->{h} - $tex->{h}) * 0.5); 1631 : ($self->{h} - $tex->{h}) * 0.5);
1562
1563 $tex
1564 }; 1632 };
1565 1633
1566 glEnable GL_TEXTURE_2D; 1634 glEnable GL_TEXTURE_2D;
1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1568 1636
… …
1663 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1664 } elsif ($uni == 27) { 1732 } elsif ($uni == 27) {
1665 $self->_emit ('escape'); 1733 $self->_emit ('escape');
1666 } elsif ($uni) { 1734 } elsif ($uni) {
1667 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1668 } 1738 }
1669 1739
1670 $self->_set_text ($text); 1740 $self->_set_text ($text);
1671 1741
1672 $self->realloc; 1742 $self->realloc;
1743
1744 1
1673} 1745}
1674 1746
1675sub focus_in { 1747sub focus_in {
1676 my ($self) = @_; 1748 my ($self) = @_;
1677 1749
… …
1692 utf8::encode $text; 1764 utf8::encode $text;
1693 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1694 1766
1695 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1696 $self->update; 1768 $self->update;
1769
1770 1
1697} 1771}
1698 1772
1699sub mouse_motion { 1773sub mouse_motion {
1700 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1701# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1702} 1778}
1703 1779
1704sub _draw { 1780sub _draw {
1705 my ($self) = @_; 1781 my ($self) = @_;
1706 1782
… …
1783 } else { 1859 } else {
1784 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1785 } 1861 }
1786 1862
1787 } else { 1863 } else {
1788 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1789 } 1867 1
1790
1791} 1868}
1792 1869
1793############################################################################# 1870#############################################################################
1794 1871
1795package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1824 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1825 1902
1826 $self->emit ("activate") 1903 $self->emit ("activate")
1827 if $x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1828 && $y >= 0 && $y < $self->{h}; 1905 && $y >= 0 && $y < $self->{h};
1906
1907 1
1829} 1908}
1830 1909
1831sub _draw { 1910sub _draw {
1832 my ($self) = @_; 1911 my ($self) = @_;
1833 1912
… …
1887 1966
1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1890 $self->{state} = !$self->{state}; 1969 $self->{state} = !$self->{state};
1891 $self->_emit (changed => $self->{state}); 1970 $self->_emit (changed => $self->{state});
1971 } else {
1972 return 0
1973 }
1974
1892 } 1975 1
1893} 1976}
1894 1977
1895sub _draw { 1978sub _draw {
1896 my ($self) = @_; 1979 my ($self) = @_;
1897 1980
… …
2235 2318
2236 $self->SUPER::button_down ($ev, $x, $y); 2319 $self->SUPER::button_down ($ev, $x, $y);
2237 2320
2238 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239 2322
2240 $self->mouse_motion ($ev, $x, $y); 2323 $self->mouse_motion ($ev, $x, $y)
2241} 2324}
2242 2325
2243sub mouse_motion { 2326sub mouse_motion {
2244 my ($self, $ev, $x, $y) = @_; 2327 my ($self, $ev, $x, $y) = @_;
2245 2328
… …
2249 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2332 my (undef, $lo, $hi, $page) = @{$self->{range}};
2250 2333
2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2334 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252 2335
2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2336 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2337 } else {
2338 return 0;
2339 }
2340
2254 } 2341 1
2255} 2342}
2256 2343
2257sub update { 2344sub update {
2258 my ($self) = @_; 2345 my ($self) = @_;
2259 2346
… …
2781 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2782} 2869}
2783 2870
2784############################################################################# 2871#############################################################################
2785 2872
2786package CFClient::UI::Inventory; 2873package CFClient::UI::Buttonbar;
2787 2874
2788our @ISA = CFClient::UI::ScrolledWindow::; 2875our @ISA = CFClient::UI::HBox::;
2789 2876
2790sub new { 2877# TODO: should actualyl wrap buttons and other goodies.
2791 my $class = shift;
2792
2793 my $self = $class->SUPER::new (
2794 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2795 @_,
2796 );
2797
2798 $self
2799}
2800
2801sub set_items {
2802 my ($self, $items) = @_;
2803
2804 $self->{scrolled}->clear;
2805 return unless $items;
2806
2807 my @items = sort {
2808 ($a->{type} <=> $b->{type})
2809 or ($a->{name} cmp $b->{name})
2810 } @$items;
2811
2812 $self->{real_items} = \@items;
2813
2814 my $row = 0;
2815 for my $item (@items) {
2816 CFClient::Item::update_widgets $item;
2817
2818 $self->{scrolled}->add (0, $row, $item->{face_widget});
2819 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2820 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2821
2822 $row++;
2823 }
2824}
2825 2878
2826############################################################################# 2879#############################################################################
2827 2880
2828package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2829 2882
… …
2879 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2880 2933
2881 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2882 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2883 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2884} 2939}
2885 2940
2886sub button_up { 2941sub button_up {
2887 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2888 2943
… …
2890 undef $GRAB; 2945 undef $GRAB;
2891 $self->hide; 2946 $self->hide;
2892 2947
2893 $self->_emit ("popdown"); 2948 $self->_emit ("popdown");
2894 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2954 1
2955}
2956
2957#############################################################################
2958
2959package CFClient::UI::Multiplexer;
2960
2961our @ISA = CFClient::UI::Container::;
2962
2963sub new {
2964 my $class = shift;
2965
2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
2895 } 3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
2896} 3063}
2897 3064
2898############################################################################# 3065#############################################################################
2899 3066
2900package CFClient::UI::Statusbox; 3067package CFClient::UI::Statusbox;
… …
3005 $self->SUPER::reconfigure; 3172 $self->SUPER::reconfigure;
3006} 3173}
3007 3174
3008############################################################################# 3175#############################################################################
3009 3176
3010package CFClient::UI::Root; 3177package CFClient::UI::Inventory;
3011 3178
3012our @ISA = CFClient::UI::Container::; 3179our @ISA = CFClient::UI::ScrolledWindow::;
3013
3014use CFClient::OpenGL;
3015 3180
3016sub new { 3181sub new {
3017 my $class = shift; 3182 my $class = shift;
3018 3183
3019 my $self = $class->SUPER::new ( 3184 my $self = $class->SUPER::new (
3020 visible => 1, 3185 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3021 @_, 3186 @_,
3022 ); 3187 );
3023 3188
3024 Scalar::Util::weaken ($self->{root} = $self);
3025
3026 $self 3189 $self
3027} 3190}
3028 3191
3029sub size_request { 3192sub set_items {
3030 my ($self) = @_;
3031
3032 ($self->{w}, $self->{h})
3033}
3034
3035sub _to_pixel {
3036 my ($coord, $size, $max) = @_;
3037
3038 $coord =
3039 $coord eq "center" ? ($max - $size) * 0.5
3040 : $coord eq "max" ? $max
3041 : $coord;
3042
3043 $coord = 0 if $coord < 0;
3044 $coord = $max - $size if $coord > $max - $size;
3045
3046 int $coord + 0.5
3047}
3048
3049sub size_allocate {
3050 my ($self, $w, $h) = @_;
3051
3052 for my $child ($self->children) {
3053 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3054
3055 $X = $child->{force_x} if exists $child->{force_x};
3056 $Y = $child->{force_y} if exists $child->{force_y};
3057
3058 $X = _to_pixel $X, $W, $self->{w};
3059 $Y = _to_pixel $Y, $H, $self->{h};
3060
3061 $child->configure ($X, $Y, $W, $H);
3062 }
3063}
3064
3065sub coord2local {
3066 my ($self, $x, $y) = @_;
3067
3068 ($x, $y)
3069}
3070
3071sub coord2global {
3072 my ($self, $x, $y) = @_;
3073
3074 ($x, $y)
3075}
3076
3077sub update {
3078 my ($self) = @_;
3079
3080 $::WANT_REFRESH++;
3081}
3082
3083sub add {
3084 my ($self, @children) = @_;
3085
3086 $_->{is_toplevel} = 1
3087 for @children;
3088
3089 $self->SUPER::add (@children);
3090}
3091
3092sub remove {
3093 my ($self, @children) = @_;
3094
3095 $self->SUPER::remove (@children);
3096
3097 delete $self->{is_toplevel}
3098 for @children;
3099
3100 while (@children) {
3101 my $w = pop @children;
3102 push @children, $w->children;
3103 $w->set_invisible;
3104 }
3105}
3106
3107sub on_refresh {
3108 my ($self, $id, $cb) = @_;
3109
3110 $self->{refresh_hook}{$id} = $cb;
3111}
3112
3113sub on_post_alloc {
3114 my ($self, $id, $cb) = @_;
3115
3116 $self->{post_alloc_hook}{$id} = $cb;
3117}
3118
3119sub draw {
3120 my ($self) = @_;
3121
3122 while ($self->{refresh_hook}) {
3123 $_->()
3124 for values %{delete $self->{refresh_hook}};
3125 }
3126
3127 if ($self->{realloc}) {
3128 my @queue;
3129
3130 while () {
3131 if ($self->{realloc}) {
3132 #TODO use array-of-depth approach
3133
3134 use sort 'stable';
3135
3136 @queue = sort { $a->{visible} <=> $b->{visible} }
3137 @queue, values %{delete $self->{realloc}};
3138 }
3139
3140 my $widget = pop @queue || last;
3141
3142 $widget->{visible} or last; # do not resize invisible widgets
3143
3144 my ($w, $h) = $widget->size_request;
3145
3146 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3147 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3148
3149 $w = $widget->{force_w} if exists $widget->{force_w};
3150 $h = $widget->{force_h} if exists $widget->{force_h};
3151
3152 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3153 || delete $widget->{force_realloc}) {
3154 $widget->{req_w} = $w;
3155 $widget->{req_h} = $h;
3156
3157 $self->{size_alloc}{$widget+0} = $widget;
3158
3159 if (my $parent = $widget->{parent}) {
3160 $self->{realloc}{$parent+0} = $parent;
3161 #unshift @queue, $parent;
3162 $parent->{force_size_alloc} = 1;
3163 $self->{size_alloc}{$parent+0} = $parent;
3164 }
3165 }
3166
3167 delete $self->{realloc}{$widget+0};
3168 }
3169 }
3170
3171 while (my $size_alloc = delete $self->{size_alloc}) {
3172 my @queue = sort { $b->{visible} <=> $a->{visible} }
3173 values %$size_alloc;
3174
3175 while () {
3176 my $widget = pop @queue || last;
3177
3178 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3179
3180 $w = 0 if $w < 0;
3181 $h = 0 if $h < 0;
3182
3183 $w = int $w + 0.5;
3184 $h = int $h + 0.5;
3185
3186 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3187 $widget->{w} = $w;
3188 $widget->{h} = $h;
3189
3190 $widget->emit (size_allocate => $w, $h);
3191 }
3192 }
3193 }
3194
3195 while ($self->{post_alloc_hook}) {
3196 $_->()
3197 for values %{delete $self->{post_alloc_hook}};
3198 }
3199
3200
3201 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3202 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3203 glClear GL_COLOR_BUFFER_BIT;
3204
3205 glMatrixMode GL_PROJECTION;
3206 glLoadIdentity;
3207 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3208 glMatrixMode GL_MODELVIEW;
3209 glLoadIdentity;
3210
3211 $self->_draw;
3212}
3213
3214#############################################################################
3215
3216package CFClient::UI::SpellList;
3217
3218our @ISA = CFClient::UI::FancyFrame::;
3219
3220sub new {
3221 my $class = shift;
3222
3223 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3224
3225 $self->add (new CFClient::UI::ScrolledWindow
3226 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3227
3228 $self;
3229}
3230
3231# XXX: Do sorting? Argl...
3232sub add_spell {
3233 my ($self, $spell) = @_; 3193 my ($self, $items) = @_;
3234 $self->{spells}->{$spell->{name}} = $spell;
3235 3194
3236 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face 3195 $self->{child}->clear;
3237 face => $spell->{face}, 3196 return unless $items;
3238 can_hover => 1,
3239 can_events => 1,
3240 tooltip => $spell->{message});
3241 3197
3242 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label 3198 my @items = sort {
3243 text => $spell->{name}, 3199 ($a->{type} <=> $b->{type})
3244 can_hover => 1, 3200 or ($a->{name} cmp $b->{name})
3245 can_events => 1, 3201 } @$items;
3246 tooltip => $spell->{message},
3247 expand => 1);
3248 3202
3249 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label 3203 $self->{real_items} = \@items;
3250 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3251 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3252 expand => 1);
3253 3204
3254 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button 3205 my $row = 0;
3255 text => "bind to key", 3206 for my $item (@items) {
3256 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); 3207 CFClient::Item::update_widgets $item;
3257}
3258 3208
3259sub rebuild_spell_list { 3209 $self->{child}->add (0, $row, $item->{face_widget});
3260 my ($self) = @_; 3210 $self->{child}->add (1, $row, $item->{desc_widget});
3261 $self->{tbl_idx} = 0; 3211 $self->{child}->add (2, $row, $item->{weight_widget});
3262 $self->add_spell ($_) for values %{$self->{spells}};
3263}
3264 3212
3265sub remove_spell { 3213 $row++;
3266 my ($self, $spell) = @_; 3214 }
3267 delete $self->{spells}->{$spell->{name}};
3268 $self->rebuild_spell_list;
3269} 3215}
3270 3216
3271############################################################################# 3217#############################################################################
3272 3218
3273package CFClient::UI::BindEditor; 3219package CFClient::UI::BindEditor;
… …
3368 $rec = $::CONN->stop_record if $::CONN; 3314 $rec = $::CONN->stop_record if $::CONN;
3369 return unless ref $rec eq 'ARRAY'; 3315 return unless ref $rec eq 'ARRAY';
3370 $self->set_command_list ($rec); 3316 $self->set_command_list ($rec);
3371} 3317}
3372 3318
3373# if $commit is true, the binding will be set after the user entered a key combo 3319
3320sub ask_for_bind_and_commit {
3321 my ($self) = @_;
3322 $self->ask_for_bind (1);
3323}
3324
3374sub ask_for_bind { 3325sub ask_for_bind {
3375 my ($self, $commit) = @_; 3326 my ($self, $commit) = @_;
3376 3327
3377 CFClient::Binder::open_binding_dialog (sub { 3328 CFClient::Binder::open_binding_dialog (sub {
3378 my ($mod, $sym) = @_; 3329 my ($mod, $sym) = @_;
… …
3460 } 3411 }
3461} 3412}
3462 3413
3463############################################################################# 3414#############################################################################
3464 3415
3416package CFClient::UI::SpellList;
3417
3418our @ISA = CFClient::UI::Table::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (
3424 binding => [],
3425 commands => [],
3426 @_,
3427 )
3428}
3429
3430# XXX: Do sorting? Argl...
3431sub add_spell {
3432 my ($self, $spell) = @_;
3433 $self->{spells}->{$spell->{name}} = $spell;
3434
3435 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3436 face => $spell->{face},
3437 can_hover => 1,
3438 can_events => 1,
3439 tooltip => $spell->{message});
3440
3441 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => $spell->{name},
3443 can_hover => 1,
3444 can_events => 1,
3445 tooltip => $spell->{message},
3446 expand => 1);
3447
3448 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3450 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3451 expand => 1);
3452
3453 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3454 text => "bind to key",
3455 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3456}
3457
3458sub rebuild_spell_list {
3459 my ($self) = @_;
3460 $self->{tbl_idx} = 0;
3461 $self->add_spell ($_) for values %{$self->{spells}};
3462}
3463
3464sub remove_spell {
3465 my ($self, $spell) = @_;
3466 delete $self->{spells}->{$spell->{name}};
3467 $self->rebuild_spell_list;
3468}
3469
3470#############################################################################
3471
3472package CFClient::UI::Root;
3473
3474our @ISA = CFClient::UI::Container::;
3475
3476use CFClient::OpenGL;
3477
3478sub new {
3479 my $class = shift;
3480
3481 my $self = $class->SUPER::new (
3482 visible => 1,
3483 @_,
3484 );
3485
3486 Scalar::Util::weaken ($self->{root} = $self);
3487
3488 $self
3489}
3490
3491sub size_request {
3492 my ($self) = @_;
3493
3494 ($self->{w}, $self->{h})
3495}
3496
3497sub _to_pixel {
3498 my ($coord, $size, $max) = @_;
3499
3500 $coord =
3501 $coord eq "center" ? ($max - $size) * 0.5
3502 : $coord eq "max" ? $max
3503 : $coord;
3504
3505 $coord = 0 if $coord < 0;
3506 $coord = $max - $size if $coord > $max - $size;
3507
3508 int $coord + 0.5
3509}
3510
3511sub size_allocate {
3512 my ($self, $w, $h) = @_;
3513
3514 for my $child ($self->children) {
3515 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3516
3517 $X = $child->{force_x} if exists $child->{force_x};
3518 $Y = $child->{force_y} if exists $child->{force_y};
3519
3520 $X = _to_pixel $X, $W, $self->{w};
3521 $Y = _to_pixel $Y, $H, $self->{h};
3522
3523 $child->configure ($X, $Y, $W, $H);
3524 }
3525}
3526
3527sub coord2local {
3528 my ($self, $x, $y) = @_;
3529
3530 ($x, $y)
3531}
3532
3533sub coord2global {
3534 my ($self, $x, $y) = @_;
3535
3536 ($x, $y)
3537}
3538
3539sub update {
3540 my ($self) = @_;
3541
3542 $::WANT_REFRESH++;
3543}
3544
3545sub add {
3546 my ($self, @children) = @_;
3547
3548 $_->{is_toplevel} = 1
3549 for @children;
3550
3551 $self->SUPER::add (@children);
3552}
3553
3554sub remove {
3555 my ($self, @children) = @_;
3556
3557 $self->SUPER::remove (@children);
3558
3559 delete $self->{is_toplevel}
3560 for @children;
3561
3562 while (@children) {
3563 my $w = pop @children;
3564 push @children, $w->children;
3565 $w->set_invisible;
3566 }
3567}
3568
3569sub on_refresh {
3570 my ($self, $id, $cb) = @_;
3571
3572 $self->{refresh_hook}{$id} = $cb;
3573}
3574
3575sub on_post_alloc {
3576 my ($self, $id, $cb) = @_;
3577
3578 $self->{post_alloc_hook}{$id} = $cb;
3579}
3580
3581sub draw {
3582 my ($self) = @_;
3583
3584 while ($self->{refresh_hook}) {
3585 $_->()
3586 for values %{delete $self->{refresh_hook}};
3587 }
3588
3589 if ($self->{realloc}) {
3590 my %queue;
3591 my @queue;
3592 my $widget;
3593
3594 outer:
3595 while () {
3596 if (my $realloc = delete $self->{realloc}) {
3597 for $widget (values %$realloc) {
3598 $widget->{visible} or next; # do not resize invisible widgets
3599
3600 $queue{$widget+0}++ and next; # duplicates are common
3601
3602 push @{ $queue[$widget->{visible}] }, $widget;
3603 }
3604 }
3605
3606 while () {
3607 @queue or last outer;
3608
3609 $widget = pop @{ $queue[-1] || [] }
3610 and last;
3611
3612 pop @queue;
3613 }
3614
3615 delete $queue{$widget+0};
3616
3617 my ($w, $h) = $widget->size_request;
3618
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3621
3622 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h};
3624
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3626 || delete $widget->{force_realloc}) {
3627 $widget->{req_w} = $w;
3628 $widget->{req_h} = $h;
3629
3630 $self->{size_alloc}{$widget+0} = $widget;
3631
3632 if (my $parent = $widget->{parent}) {
3633 $self->{realloc}{$parent+0} = $parent
3634 unless $queue{$parent+0};
3635
3636 $parent->{force_size_alloc} = 1;
3637 $self->{size_alloc}{$parent+0} = $parent;
3638 }
3639 }
3640
3641 delete $self->{realloc}{$widget+0};
3642 }
3643 }
3644
3645 while (my $size_alloc = delete $self->{size_alloc}) {
3646 my @queue = sort { $b->{visible} <=> $a->{visible} }
3647 values %$size_alloc;
3648
3649 while () {
3650 my $widget = pop @queue || last;
3651
3652 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3653
3654 $w = 0 if $w < 0;
3655 $h = 0 if $h < 0;
3656
3657 $w = int $w + 0.5;
3658 $h = int $h + 0.5;
3659
3660 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3661 $widget->{old_w} = $widget->{w};
3662 $widget->{old_h} = $widget->{h};
3663
3664 $widget->{w} = $w;
3665 $widget->{h} = $h;
3666
3667 $widget->emit (size_allocate => $w, $h);
3668 }
3669 }
3670 }
3671
3672 while ($self->{post_alloc_hook}) {
3673 $_->()
3674 for values %{delete $self->{post_alloc_hook}};
3675 }
3676
3677
3678 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3679 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3680 glClear GL_COLOR_BUFFER_BIT;
3681
3682 glMatrixMode GL_PROJECTION;
3683 glLoadIdentity;
3684 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3685 glMatrixMode GL_MODELVIEW;
3686 glLoadIdentity;
3687
3688 {
3689 package CFClient::UI::Base;
3690
3691 ($draw_x, $draw_y, $draw_w, $draw_h) =
3692 (0, 0, $self->{w}, $self->{h});
3693 }
3694
3695 $self->_draw;
3696}
3697
3698#############################################################################
3699
3465package CFClient::UI; 3700package CFClient::UI;
3466 3701
3467$ROOT = new CFClient::UI::Root; 3702$ROOT = new CFClient::UI::Root;
3468$TOOLTIP = new CFClient::UI::Tooltip z => 900; 3703$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3469 3704

Diff Legend

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