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.359 by root, Fri Dec 8 15:07:08 2006 UTC vs.
Revision 1.382 by root, Thu Jul 19 19:58:56 2007 UTC

1package CFPlus::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFPlus; 9use CFPlus;
11use CFPlus::Pod; 10use CFPlus::Pod;
… …
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24 if (!$GRAB) { 23 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 28 $TOOLTIP->hide;
29 29
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 32
32 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
33 34
34 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
35 36
… …
43 } 44 }
44 } 45 }
45 } 46 }
46 47
47 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
49}); 51});
50 52
51sub get_layout { 53sub get_layout {
52 my $layout; 54 my $layout;
… …
235 h => undef, 237 h => undef,
236 can_events => 1, 238 can_events => 1,
237 @_ 239 @_
238 }, $class; 240 }, $class;
239 241
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 243
242 for (keys %$self) { 244 for (keys %$self) {
243 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
245 } 247 }
… …
262 264
263sub destroy { 265sub destroy {
264 my ($self) = @_; 266 my ($self) = @_;
265 267
266 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
267 %$self = (); 270 %$self = ();
271}
272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
268} 275}
269 276
270sub show { 277sub show {
271 my ($self) = @_; 278 my ($self) = @_;
272 279
… …
313sub set_visibility { 320sub set_visibility {
314 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
315 322
316 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
317 324
318 $visible ? $self->hide 325 $visible ? $self->show
319 : $self->show; 326 : $self->hide;
320} 327}
321 328
322sub toggle_visibility { 329sub toggle_visibility {
323 my ($self) = @_; 330 my ($self) = @_;
324 331
… …
502 509
503 defined wantarray and CFPlus::guard { 510 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} }; 512 @{ $self->{signal_cb}{$signal} };
506 } 513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
507} 520}
508 521
509my %has_coords = ( 522my %has_coords = (
510 button_down => 1, 523 button_down => 1,
511 button_up => 1, 524 button_up => 1,
… …
523 ? $args[0]->xy ($self) 536 ? $args[0]->xy ($self)
524 : (); 537 : ();
525 538
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527 540
528 #d##TODO# stop propagating at first true, do not use sum 541 for my $cb (
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 542 @{$self->{signal_cb}{$signal} || []}, # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
532} 550}
533 551
534sub find_widget { 552sub find_widget {
535 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
536 554
… …
544} 562}
545 563
546sub set_parent { 564sub set_parent {
547 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
548 566
549 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
550 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
551} 569}
552 570
553sub realloc { 571sub realloc {
554 my ($self) = @_; 572 my ($self) = @_;
… …
633 my ($self) = @_; 651 my ($self) = @_;
634 652
635 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
636} 654}
637 655
656my $cntx;#d#
638sub DESTROY { 657sub DESTROY {
639 my ($self) = @_; 658 my ($self) = @_;
640 659
641 return if CFPlus::in_destruct; 660 return if CFPlus::in_destruct;
642
643 delete $WIDGET{$self+0};
644 661
645 eval { $self->destroy }; 662 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
665 delete $WIDGET{$self+0};
647} 666}
648 667
649############################################################################# 668#############################################################################
650 669
651package CFPlus::UI::DrawBG; 670package CFPlus::UI::DrawBG;
… …
925 944
926############################################################################# 945#############################################################################
927 946
928package CFPlus::UI::ViewPort; 947package CFPlus::UI::ViewPort;
929 948
949use List::Util qw(min max);
950
930our @ISA = CFPlus::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
931 952
932sub new { 953sub new {
933 my $class = shift; 954 my $class = shift;
934 955
… …
965} 986}
966 987
967sub set_offset { 988sub set_offset {
968 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
969 990
991 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993
994 if ($x != $self->{view_x} or $y != $self->{view_y}) {
970 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
971 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
972 997
998 $self->emit (changed => $x, $y);
973 $self->update; 999 $self->update;
1000 }
974} 1001}
975 1002
976# hmm, this does not work for topleft of $self... but we should not ask for that 1003# hmm, this does not work for topleft of $self... but we should not ask for that
977sub coord2local { 1004sub coord2local {
978 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
1014 1041
1015############################################################################# 1042#############################################################################
1016 1043
1017package CFPlus::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
1018 1045
1019our @ISA = CFPlus::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
1020 1047
1021sub new { 1048sub new {
1022 my ($class, %arg) = @_; 1049 my ($class, %arg) = @_;
1023 1050
1024 my $child = delete $arg{child}; 1051 my $child = delete $arg{child};
1025 1052
1026 my $self; 1053 my $self;
1027 1054
1028 my $slider = new CFPlus::UI::Slider 1055 my $hslider = new CFPlus::UI::Slider
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
1029 vertical => 1, 1065 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1067 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1070 },
1034 ; 1071 ;
1035 1072
1036 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1038 can_events => 1, 1076 can_events => 1,
1039 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1040 %arg, 1081 %arg,
1041 ); 1082 );
1042 1083
1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 expand => 1,
1086 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y},
1088 on_changed => sub {
1089 my ($vp, $x, $y) = @_;
1090
1091 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y);
1093
1094 0
1095 },
1096 ;
1097
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1098 $self->SUPER::add (0, 0, $self->{vp});
1099
1044 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
1045 1101
1046 $self 1102 $self
1047} 1103}
1048 1104
… …
1052 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1053 1109
1054 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1055} 1111}
1056 1112
1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide;
1125 }
1126
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129
1130 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide;
1134 }
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142}
1143
1057sub invoke_mouse_wheel { 1144sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1145 my ($self, $ev) = @_;
1059 1146
1060 return 0 unless $ev->{dy}; # only vertical movements 1147 return 0 unless $ev->{dy}; # only vertical movements for now
1061 1148
1062 $self->{slider}->emit (mouse_wheel => $ev); 1149 $self->{vslider}->emit (mouse_wheel => $ev);
1063 1150
1064 1 1151 1
1065} 1152}
1066 1153
1067sub update_slider { 1154sub invoke_button_down {
1068 my ($self) = @_; 1155 my ($self, $ev, $x, $y) = @_;
1069 1156
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1157 if ($ev->{button} == 2) {
1071} 1158 $self->grab_focus;
1072 1159
1073sub update { 1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1074 my ($self) = @_; 1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1075 1165
1076 $self->SUPER::update; 1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1077 1169
1078 $self->update_slider; 1170 return 1;
1171 }
1172
1173 0
1174}
1175
1176sub invoke_button_up {
1177 my ($self, $ev, $x, $y) = @_;
1178
1179 if (delete $self->{motion}) {
1180 return 1;
1181 }
1182
1183 0
1184}
1185
1186sub invoke_mouse_motion {
1187 my ($self, $ev, $x, $y) = @_;
1188
1189 if ($self->{motion}) {
1190 $self->{motion}->($ev, $x, $y);
1191 return 1;
1192 }
1193
1194 0
1079} 1195}
1080 1196
1081sub invoke_size_allocate { 1197sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1083 1199
1084 $self->update_slider; 1200 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1201 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1202}
1088 1203
1089############################################################################# 1204#############################################################################
1090 1205
… …
1240 1355
1241my @border = 1356my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1243 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244 1359
1360my @icon =
1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1362 qw(x1_move.png x1_resize.png);
1363
1245sub new { 1364sub new {
1246 my ($class, %arg) = @_; 1365 my ($class, %arg) = @_;
1247 1366
1248 my $self = $class->SUPER::new ( 1367 my $self = $class->SUPER::new (
1249 bg => [1, 1, 1, 1], 1368 bg => [1, 1, 1, 1],
… …
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1536 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1418 1537
1419 my $border = $self->border; 1538 my $border = $self->border;
1420 1539
1421 glColor @{ $self->{border_bg} }; 1540 glColor @{ $self->{border_bg} };
1422 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1541 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1423 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1542 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1424 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1543 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1425 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1544 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1545
1546 # move
1547 my $w2 = ($w - $border) * .5;
1548 my $h2 = ($h - $border) * .5;
1549 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1550 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1551 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1552
1553 # resize
1554 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1556 unless $self->{has_close_button};
1557 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1558 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1426 1559
1427 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1560 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1428 glColor @{ $self->{bg} }; 1561 glColor @{ $self->{bg} };
1429 1562
1430 # TODO: repeat texture not scale 1563 # TODO: repeat texture not scale
… …
1461 1594
1462sub new { 1595sub new {
1463 my $class = shift; 1596 my $class = shift;
1464 1597
1465 $class->SUPER::new ( 1598 $class->SUPER::new (
1599 children => [],
1466 col_expand => [], 1600 col_expand => [],
1601 row_expand => [],
1467 @_, 1602 @_,
1468 ) 1603 )
1469} 1604}
1470 1605
1471sub children { 1606sub children {
1472 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473} 1608}
1474 1609
1610# TODO: store row/col info in child widget and use standard add/del
1475sub add { 1611sub add {
1476 my ($self) = shift; 1612 my ($self) = shift;
1477 1613
1478 while (@_) { 1614 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, (); 1615 my ($x, $y, $child) = splice @_, 0, 3, ();
1480 $child->set_parent ($self); 1616 $child->set_parent ($self);
1481 $self->{children}[$y][$x] = $child; 1617 $self->{children}[$y][$x] = $child;
1482 } 1618 }
1483 1619
1484 $self->{force_realloc} = 1; 1620 $self->{force_realloc} = 1;
1485 $self->{force_size_alloc} = 1; 1621 $self->{force_size_alloc} = 1;
1486 $self->realloc; 1622 $self->realloc;
1487} 1623}
1488 1624
1489sub remove { 1625sub remove {
1490 my ($self, $child) = @_; 1626 my ($self, $child) = @_;
1491 1627
1492 # TODO: not yet implemented 1628 for (@{ $self->{children} }) {
1629 for (@{ $_ || [] }) {
1630 $_ = undef if $_ == $child;
1631 }
1632 }
1493} 1633}
1494 1634
1495# TODO: move to container class maybe? send children a signal on removal? 1635# TODO: move to container class maybe? send children a signal on removal?
1496sub clear { 1636sub clear {
1497 my ($self) = @_; 1637 my ($self) = @_;
… …
1546 my ($ws, $hs) = $self->get_wh; 1686 my ($ws, $hs) = $self->get_wh;
1547 1687
1548 my $req_w = (sum @$ws) || 1; 1688 my $req_w = (sum @$ws) || 1;
1549 my $req_h = (sum @$hs) || 1; 1689 my $req_h = (sum @$hs) || 1;
1550 1690
1551 # TODO: nicer code && do row_expand 1691 # TODO: nicer code
1552 my @col_expand = @{$self->{col_expand}}; 1692 my @col_expand = @{$self->{col_expand}};
1553 @col_expand = (1) x @$ws unless @col_expand; 1693 @col_expand = (1) x @$ws unless @col_expand;
1554 my $col_expand = (sum @col_expand) || 1; 1694 my $col_expand = (sum @col_expand) || 1;
1555 1695
1556 # linearly scale sizes
1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1696 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559 1697
1560 CFPlus::UI::harmonize $ws; 1698 CFPlus::UI::harmonize $ws;
1699
1700 my @row_expand = @{$self->{row_expand}};
1701 @row_expand = (1) x @$ws unless @row_expand;
1702 my $row_expand = (sum @row_expand) || 1;
1703
1704 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1705
1561 CFPlus::UI::harmonize $hs; 1706 CFPlus::UI::harmonize $hs;
1562 1707
1563 my $y; 1708 my $y;
1564 1709
1565 for my $r (0 .. $#{$self->{children}}) { 1710 for my $r (0 .. $#{$self->{children}}) {
… …
1605 my ($self) = @_; 1750 my ($self) = @_;
1606 1751
1607 for (grep $_, @{$self->{children}}) { 1752 for (grep $_, @{$self->{children}}) {
1608 $_->draw for grep $_, @$_; 1753 $_->draw for grep $_, @$_;
1609 } 1754 }
1755}
1756
1757#############################################################################
1758
1759package CFPlus::UI::Fixed;
1760
1761use List::Util qw(min max);
1762
1763our @ISA = CFPlus::UI::Container::;
1764
1765sub add {
1766 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1767
1768 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1769 $self->SUPER::add ($child);
1770}
1771
1772sub _scale($$$) {
1773 my ($mode, $val, $max) = @_;
1774
1775 $mode eq "abs" ? $val
1776 : $mode eq "rel" ? $val * $max
1777 : 0
1778}
1779
1780sub size_request {
1781 my ($self) = @_;
1782
1783 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1784
1785 # determine overall size by querying abs widgets
1786 for my $child ($self->visible_children) {
1787 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1788
1789 if ($pos eq "abs") {
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792
1793 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1794 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1795 }
1796 }
1797
1798 my $W = $x2 - $x1;
1799 my $H = $y2 - $y1;
1800
1801 # now layout remaining widgets
1802 for my $child ($self->visible_children) {
1803 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1804
1805 if ($pos ne "abs") {
1806 $x = _scale $pos, $x, $W;
1807 $y = _scale $pos, $x, $H;
1808 $w = _scale $size, $w, $child->{req_w};
1809 $h = _scale $size, $h, $child->{req_h};
1810
1811 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1812 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1813 }
1814 }
1815
1816 my $W = $x2 - $x1;
1817 my $H = $y2 - $y1;
1818
1819 ($W, $H)
1820}
1821
1822sub invoke_size_allocate {
1823 my ($self, $W, $H) = @_;
1824
1825 for my $child ($self->visible_children) {
1826 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1827
1828 $x = _scale $pos, $x, $W;
1829 $y = _scale $pos, $x, $H;
1830 $w = _scale $size, $w, $child->{req_w};
1831 $h = _scale $size, $h, $child->{req_h};
1832
1833 $child->configure ($x, $y, $w, $h);
1834 }
1835
1836 1
1610} 1837}
1611 1838
1612############################################################################# 1839#############################################################################
1613 1840
1614package CFPlus::UI::Box; 1841package CFPlus::UI::Box;
… …
1955 my $sym = $ev->{sym}; 2182 my $sym = $ev->{sym};
1956 my $uni = $ev->{unicode}; 2183 my $uni = $ev->{unicode};
1957 2184
1958 my $text = $self->get_text; 2185 my $text = $self->get_text;
1959 2186
2187 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2188
1960 if ($uni == 8) { 2189 if ($uni == 8) {
1961 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2190 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1962 } elsif ($uni == 127) { 2191 } elsif ($uni == 127) {
1963 substr $text, $self->{cursor}, 1, ""; 2192 substr $text, $self->{cursor}, 1, "";
1964 } elsif ($sym == CFPlus::SDLK_LEFT) { 2193 } elsif ($sym == CFPlus::SDLK_LEFT) {
1965 --$self->{cursor} if $self->{cursor}; 2194 --$self->{cursor} if $self->{cursor};
1966 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2195 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1967 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2196 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1968 } elsif ($sym == CFPlus::SDLK_HOME) { 2197 } elsif ($sym == CFPlus::SDLK_HOME) {
2198 # what a hack
1969 $self->{cursor} = 0; 2199 $self->{cursor} =
2200 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2201 ? length $1
2202 : 0;
1970 } elsif ($sym == CFPlus::SDLK_END) { 2203 } elsif ($sym == CFPlus::SDLK_END) {
2204 # uh, again
2205 $self->{cursor} =
2206 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1971 $self->{cursor} = length $text; 2207 ? $self->{cursor} + length $1
2208 : length $self->{text};
1972 } elsif ($uni == 21) { # ctrl-u 2209 } elsif ($uni == 21) { # ctrl-u
1973 $text = ""; 2210 $text = "";
1974 $self->{cursor} = 0; 2211 $self->{cursor} = 0;
1975 } elsif ($uni == 27) { 2212 } elsif ($uni == 27) {
1976 $self->emit ('escape'); 2213 $self->emit ('escape');
1977 } elsif ($uni) { 2214 } elsif ($uni == 0x0d) {
2215 substr $text, $self->{cursor}++, 0, "\012";
2216 } elsif ($uni >= 0x20) {
1978 substr $text, $self->{cursor}++, 0, chr $uni; 2217 substr $text, $self->{cursor}++, 0, chr $uni;
1979 } else { 2218 } else {
1980 return 0; 2219 return 0;
1981 } 2220 }
1982 2221
… …
2073sub invoke_key_down { 2312sub invoke_key_down {
2074 my ($self, $ev) = @_; 2313 my ($self, $ev) = @_;
2075 2314
2076 my $sym = $ev->{sym}; 2315 my $sym = $ev->{sym};
2077 2316
2078 if ($sym == 13) { 2317 if ($ev->{uni} == 0x0d || $sym == 13) {
2079 unshift @{$self->{history}}, 2318 unshift @{$self->{history}},
2080 my $txt = $self->get_text; 2319 my $txt = $self->get_text;
2081 2320
2082 $self->{history_pointer} = -1; 2321 $self->{history_pointer} = -1;
2083 $self->{history_saveback} = ''; 2322 $self->{history_saveback} = '';
… …
2104 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2105 } else { 2344 } else {
2106 $self->set_text ($self->{history_saveback}); 2345 $self->set_text ($self->{history_saveback});
2107 } 2346 }
2108 2347
2109 } elsif ($ev->{unicode} >= 0x20) { 2348 } else {
2110 return $self->SUPER::invoke_key_down ($ev) 2349 return $self->SUPER::invoke_key_down ($ev)
2111 } 2350 }
2112 2351
2113 1 2352 1
2114} 2353}
… …
2160 2399
2161use CFPlus::OpenGL; 2400use CFPlus::OpenGL;
2162 2401
2163my @tex = 2402my @tex =
2164 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2403 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2165 qw(b1_button_active.png); 2404 qw(b1_button_inactive.png b1_button_active.png);
2166 2405
2167sub new { 2406sub new {
2168 my $class = shift; 2407 my $class = shift;
2169 2408
2170 $class->SUPER::new ( 2409 $class->SUPER::new (
2171 padding_x => 4, 2410 padding_x => 4,
2172 padding_y => 4, 2411 padding_y => 4,
2173 fg => [1, 1, 1], 2412 fg => [1.0, 1.0, 1.0],
2174 active_fg => [0, 0, 1], 2413 active_fg => [0.8, 0.8, 0.8],
2175 can_hover => 1, 2414 can_hover => 1,
2176 align => 0, 2415 align => 0,
2177 valign => 0, 2416 valign => 0,
2178 can_events => 1, 2417 can_events => 1,
2179 @_ 2418 @_
… …
2197 2436
2198 glEnable GL_TEXTURE_2D; 2437 glEnable GL_TEXTURE_2D;
2199 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2438 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2200 glColor 0, 0, 0, 1; 2439 glColor 0, 0, 0, 1;
2201 2440
2441 my $tex = $tex[$GRAB == $self];
2202 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2442 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2203 2443
2204 glDisable GL_TEXTURE_2D; 2444 glDisable GL_TEXTURE_2D;
2205 2445
2206 $self->SUPER::_draw; 2446 $self->SUPER::_draw;
2207} 2447}
… …
2303 or Carp::croak "'path' or 'tex' attributes required"; 2543 or Carp::croak "'path' or 'tex' attributes required";
2304 2544
2305 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2545 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2306 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2546 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2307 2547
2308 Scalar::Util::weaken $texture_cache{$self->{path}}; 2548 CFPlus::weaken $texture_cache{$self->{path}};
2309 2549
2310 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2550 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2311 2551
2312 $self 2552 $self
2313} 2553}
… …
2686sub invoke_mouse_wheel { 2926sub invoke_mouse_wheel {
2687 my ($self, $ev) = @_; 2927 my ($self, $ev) = @_;
2688 2928
2689 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2929 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2690 2930
2931 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2932
2691 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2933 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2692 2934
2693 ! ! $delta 2935 ! ! $delta
2694} 2936}
2695 2937
2696sub update { 2938sub update {
… …
2806 #font => default_font 3048 #font => default_font
2807 @_, 3049 @_,
2808 3050
2809 layout => (new CFPlus::Layout), 3051 layout => (new CFPlus::Layout),
2810 par => [], 3052 par => [],
3053 max_par => 0,
2811 height => 0, 3054 height => 0,
2812 children => [ 3055 children => [
2813 (new CFPlus::UI::Empty expand => 1), 3056 (new CFPlus::UI::Empty expand => 1),
2814 (new CFPlus::UI::Slider vertical => 1), 3057 (new CFPlus::UI::Slider vertical => 1),
2815 ], 3058 ],
… …
2938 wrapped => 1, 3181 wrapped => 1,
2939 }; 3182 };
2940 3183
2941 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3184 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2942 push @{$self->{par}}, $para; 3185 push @{$self->{par}}, $para;
3186 }
3187
3188 if (my $max = $self->{max_par}) {
3189 shift @{$self->{par}} while @{$self->{par}} > $max;
2943 } 3190 }
2944 3191
2945 $self->{need_reflow}++; 3192 $self->{need_reflow}++;
2946 $self->update; 3193 $self->update;
2947} 3194}
… …
3255 3502
3256sub new { 3503sub new {
3257 my $class = shift; 3504 my $class = shift;
3258 3505
3259 my $self = $class->SUPER::new ( 3506 my $self = $class->SUPER::new (
3507 size_w => 32,
3508 size_h => 8,
3260 aspect => 1, 3509 aspect => 1,
3261 can_events => 0, 3510 can_events => 0,
3262 @_, 3511 @_,
3263 ); 3512 );
3264 3513
3265 if ($self->{anim} && $self->{animspeed}) { 3514 if ($self->{anim} && $self->{animspeed}) {
3266 Scalar::Util::weaken (my $widget = $self); 3515 CFPlus::weaken (my $widget = $self);
3267 3516
3517 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3518 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3268 $self->{timer} = Event->timer ( 3519 $self->{timer} = Event->timer (
3269 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3270 hard => 1, 3520 parked => 1,
3271 interval => $self->{animspeed},
3272 cb => sub { 3521 cb => sub {
3522 return unless $::CONN && $widget;
3523
3273 ++$widget->{frame}; 3524 ++$widget->{frame};
3525 $widget->update_face;
3274 $widget->update; 3526 $widget->update;
3527
3528 $widget->update_timer;
3275 }, 3529 },
3276 ); 3530 );
3531
3532 $self->update_face;
3533 $self->update_timer;
3277 } 3534 }
3278 3535
3279 $self 3536 $self
3280} 3537}
3281 3538
3539sub update_timer {
3540 my ($self) = @_;
3541
3542 return unless $self->{timer};
3543
3544 if ($self->{visible}) {
3545 $self->{timer}->at (
3546 $self->{anim_start}
3547 + $self->{animspeed}
3548 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3549 );
3550 $self->{timer}->start;
3551 } else {
3552 $self->{timer}->stop;
3553 }
3554}
3555
3556sub update_face {
3557 my ($self) = @_;
3558
3559 return unless $::CONN;
3560
3561 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3562 if ($anim && @$anim) {
3563 delete $self->{wait_face};
3564 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3565 }
3566 }
3567}
3568
3282sub size_request { 3569sub size_request {
3283 (32, 8) 3570 my ($self) = @_;
3571
3572 if ($::CONN) {
3573 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3574 if (my $tex = $::CONN->{texture}[$faceid]) {
3575 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3576 } else {
3577 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3578 $self->realloc;
3579 });
3580 }
3581 }
3582 }
3583
3584 ($self->{size_w} || 8, $self->{size_h} || 8)
3284} 3585}
3285 3586
3286sub update { 3587sub update {
3287 my ($self) = @_; 3588 my ($self) = @_;
3288 3589
3289 return unless $self->{visible}; 3590 return unless $self->{visible};
3290 3591
3291 $self->SUPER::update; 3592 $self->SUPER::update;
3292} 3593}
3293 3594
3595sub invoke_visibility_change {
3596 my ($self) = @_;
3597
3598 $self->update_timer;
3599
3600 0
3601}
3602
3294sub _draw { 3603sub _draw {
3295 my ($self) = @_; 3604 my ($self) = @_;
3296 3605
3297 return unless $::CONN; 3606 return unless $::CONN;
3298 3607
3299 $self->SUPER::_draw; 3608 $self->SUPER::_draw;
3300 3609
3301 my $face;
3302
3303 if ($self->{frame}) {
3304 my $anim = $::CONN->{anim}[$self->{anim}]; 3610 my $faceid = $::CONN->{faceid}[$self->{face}]
3305 3611 or return;
3306 $face = $anim->[ $self->{frame} % @$anim ]
3307 if $anim && @$anim;
3308 }
3309 3612
3310 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3613 my $tex = $::CONN->{texture}[$faceid];
3311 3614
3312 if ($tex) { 3615 if ($tex) {
3313 glEnable GL_TEXTURE_2D; 3616 glEnable GL_TEXTURE_2D;
3314 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3315 glColor 0, 0, 0, 1; 3618 glColor 0, 0, 0, 1;
… …
3319} 3622}
3320 3623
3321sub destroy { 3624sub destroy {
3322 my ($self) = @_; 3625 my ($self) = @_;
3323 3626
3324 $self->{timer}->cancel 3627 (delete $self->{timer})->cancel
3325 if $self->{timer}; 3628 if $self->{timer};
3326 3629
3327 $self->SUPER::destroy; 3630 $self->SUPER::destroy;
3328} 3631}
3329 3632
… …
3525} 3828}
3526 3829
3527sub add { 3830sub add {
3528 my ($self, $title, $widget, $tooltip) = @_; 3831 my ($self, $title, $widget, $tooltip) = @_;
3529 3832
3530 Scalar::Util::weaken $self; 3833 CFPlus::weaken $self;
3531 3834
3532 $self->{buttonbar}->add (new CFPlus::UI::Button 3835 $self->{buttonbar}->add (new CFPlus::UI::Button
3533 markup => $title, 3836 markup => $title,
3534 tooltip => $tooltip, 3837 tooltip => $tooltip,
3535 on_activate => sub { $self->set_current_page ($widget) }, 3838 on_activate => sub { $self->set_current_page ($widget) },
… …
3619 my $self = $class->SUPER::new ( 3922 my $self = $class->SUPER::new (
3620 fontsize => 0.8, 3923 fontsize => 0.8,
3621 @_, 3924 @_,
3622 ); 3925 );
3623 3926
3624 Scalar::Util::weaken (my $this = $self); 3927 CFPlus::weaken (my $this = $self);
3625 3928
3626 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3929 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3627 3930
3628 $self 3931 $self
3629} 3932}
… …
3752 $self->SUPER::destroy; 4055 $self->SUPER::destroy;
3753} 4056}
3754 4057
3755############################################################################# 4058#############################################################################
3756 4059
3757package CFPlus::UI::Inventory;
3758
3759our @ISA = CFPlus::UI::Table::;
3760
3761sub new {
3762 my $class = shift;
3763
3764 my $self = $class->SUPER::new (
3765 col_expand => [0, 1, 0],
3766 items => [],
3767 @_,
3768 );
3769
3770 $self->set_sort_order (undef);
3771
3772 $self
3773}
3774
3775sub update_items {
3776 my ($self) = @_;
3777
3778 $self->clear;
3779
3780 my @item = $self->{sort}->(@{ $self->{items} });
3781
3782 my @adds;
3783 my $row = 0;
3784 for my $item ($self->{sort}->(@{ $self->{items} })) {
3785 CFPlus::Item::update_widgets $item;
3786
3787 push @adds, 0, $row, $item->{face_widget};
3788 push @adds, 1, $row, $item->{desc_widget};
3789 push @adds, 2, $row, $item->{weight_widget};
3790
3791 $row++;
3792 }
3793
3794 $self->add (@adds);
3795}
3796
3797sub set_sort_order {
3798 my ($self, $order) = @_;
3799
3800 $self->{sort} = $order ||= sub {
3801 sort {
3802 $a->{type} <=> $b->{type}
3803 or $a->{name} cmp $b->{name}
3804 } @_
3805 };
3806
3807 $self->update_items;
3808}
3809
3810sub set_items {
3811 my ($self, $items) = @_;
3812
3813 $self->{items} = [$items ? values %$items : ()];
3814 $self->update_items;
3815}
3816
3817#############################################################################
3818
3819package CFPlus::UI::SpellList;
3820
3821our @ISA = CFPlus::UI::Table::;
3822
3823sub new {
3824 my $class = shift;
3825
3826 my $self = $class->SUPER::new (
3827 binding => [],
3828 commands => [],
3829 @_,
3830 )
3831}
3832
3833my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3834
3835my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3836 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3837my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3838 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3839my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3840 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3841my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3842 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3843my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3844 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3845
3846sub rebuild_spell_list {
3847 my ($self) = @_;
3848
3849 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3850 $self->clear;
3851
3852 return unless $::CONN;
3853
3854 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3855 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3856 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3857 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3858 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3859
3860 my $row = 0;
3861
3862 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3863 my $spell = $self->{spell}{$_};
3864
3865 $row++;
3866
3867 my $spell_cb = sub {
3868 my ($widget, $ev) = @_;
3869
3870 if ($ev->{button} == 1) {
3871 $::CONN->user_send ("cast $spell->{name}");
3872 } elsif ($ev->{button} == 2) {
3873 $::CONN->user_send ("invoke $spell->{name}");
3874 } elsif ($ev->{button} == 3) {
3875 my $shortname = CFPlus::shorten $spell->{name}, 14;
3876 (new CFPlus::UI::Menu
3877 items => [
3878 ["bind <i>cast $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3879 ["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3880 ],
3881 )->popup ($ev);
3882 } else {
3883 return 0;
3884 }
3885
3886 1
3887 };
3888
3889 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3890
3891 #TODO: add path info to tooltip
3892 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3893
3894 $self->add (0, $row, new CFPlus::UI::Face
3895 face => $spell->{face},
3896 can_hover => 1,
3897 can_events => 1,
3898 tooltip => $tooltip,
3899 on_button_down => $spell_cb,
3900 );
3901
3902 $self->add (1, $row, new CFPlus::UI::Label
3903 expand => 1,
3904 text => $spell->{name},
3905 can_hover => 1,
3906 can_events => 1,
3907 tooltip => $tooltip,
3908 on_button_down => $spell_cb,
3909 );
3910
3911 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3912 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3913 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3914 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3915 }
3916 });
3917}
3918
3919sub add_spell {
3920 my ($self, $spell) = @_;
3921
3922 $self->{spell}->{$spell->{name}} = $spell;
3923 $self->rebuild_spell_list;
3924}
3925
3926sub remove_spell {
3927 my ($self, $spell) = @_;
3928
3929 delete $self->{spell}->{$spell->{name}};
3930 $self->rebuild_spell_list;
3931}
3932
3933sub clear_spells {
3934 my ($self) = @_;
3935
3936 $self->{spell} = {};
3937 $self->rebuild_spell_list;
3938}
3939
3940#############################################################################
3941
3942package CFPlus::UI::Root; 4060package CFPlus::UI::Root;
3943 4061
3944our @ISA = CFPlus::UI::Container::; 4062our @ISA = CFPlus::UI::Container::;
3945 4063
3946use List::Util qw(min max); 4064use List::Util qw(min max);
… …
3953 my $self = $class->SUPER::new ( 4071 my $self = $class->SUPER::new (
3954 visible => 1, 4072 visible => 1,
3955 @_, 4073 @_,
3956 ); 4074 );
3957 4075
3958 Scalar::Util::weaken ($self->{root} = $self); 4076 CFPlus::weaken ($self->{root} = $self);
3959 4077
3960 $self 4078 $self
3961} 4079}
3962 4080
3963sub size_request { 4081sub size_request {
… …
4158 while ($self->{post_alloc_hook}) { 4276 while ($self->{post_alloc_hook}) {
4159 $_->() 4277 $_->()
4160 for values %{delete $self->{post_alloc_hook}}; 4278 for values %{delete $self->{post_alloc_hook}};
4161 } 4279 }
4162 4280
4163
4164 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4281 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4165 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4282 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4166 glClear GL_COLOR_BUFFER_BIT; 4283 glClear GL_COLOR_BUFFER_BIT;
4167 4284
4168 glMatrixMode GL_PROJECTION; 4285 glMatrixMode GL_PROJECTION;

Diff Legend

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