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.249 by root, Sun May 28 01:40:02 2006 UTC vs.
Revision 1.255 by root, Mon May 29 02:01:56 2006 UTC

… …
40 if (!$GRAB) { 40 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
43 43
44 if ($TOOLTIP->{owner} != $widget) { 44 if ($TOOLTIP->{owner} != $widget) {
45 $TOOLTIP->hide;
46
45 $TOOLTIP->{owner} = $widget; 47 $TOOLTIP->{owner} = $widget;
46 48
47 my $tip = $widget->{tooltip}; 49 my $tip = $widget->{tooltip};
48 50
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 51 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 52
51 $TOOLTIP->set_tooltip_from ($widget); 53 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 54 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 55 }
63 56
64 return; 57 return;
65 } 58 }
66 } 59 }
… …
221 } 214 }
222 215
223 $self 216 $self
224} 217}
225 218
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234}
235
236sub destroy { 219sub destroy {
237 my ($self) = @_; 220 my ($self) = @_;
238 221
239 $self->hide; 222 $self->hide;
240 %$self = (); 223 %$self = ();
… …
267 250
268 $self->{root} = $self->{parent}{root}; 251 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1; 252 $self->{visible} = $self->{parent}{visible} + 1;
270 253
271 $self->emit (visibility_change => 1); 254 $self->emit (visibility_change => 1);
255
256 $self->realloc if !exists $self->{req_w};
257
258 $_->set_visible for $self->children;
272} 259}
273 260
274sub set_invisible { 261sub set_invisible {
275 my ($self) = @_; 262 my ($self) = @_;
276 263
277 return unless $self->{visible}; 264 return unless $self->{visible};
278 265
279 # broken show/hide model 266 $_->set_invisible for $self->children;
280 267
281 delete $self->{root}; 268 delete $self->{root};
282 delete $self->{visible}; 269 delete $self->{visible};
283 270
284 undef $GRAB if $GRAB == $self; 271 undef $GRAB if $GRAB == $self;
285 undef $HOVER if $HOVER == $self; 272 undef $HOVER if $HOVER == $self;
286 273
287 CFClient::UI::check_tooltip 274 CFClient::UI::check_tooltip
288 if $CFClient::UI::TOOLTIP->{owner} == $self; 275 if $TOOLTIP->{owner} == $self;
289 276
290 $self->focus_out; 277 $self->focus_out;
291 278
292 $self->emit (visibility_change => 0); 279 $self->emit (visibility_change => 0);
280}
281
282sub set_visibility {
283 my ($self, $visible) = @_;
284
285 return if $self->{visible} == $visible;
286
287 $visible ? $self->hide
288 : $self->show;
289}
290
291sub toggle_visibility {
292 my ($self) = @_;
293
294 $self->{visible}
295 ? $self->hide
296 : $self->show;
293} 297}
294 298
295sub hide { 299sub hide {
296 my ($self) = @_; 300 my ($self) = @_;
297 301
… …
315 my ($self, $w, $h) = @_; 319 my ($self, $w, $h) = @_;
316 320
317 $self->{def_w} = $w; 321 $self->{def_w} = $w;
318 $self->{def_h} = $h; 322 $self->{def_h} = $h;
319 323
320 $self->check_size; 324 $self->realloc;
321} 325}
322 326
323sub size_request { 327sub size_request {
324 require Carp; 328 require Carp;
325 Carp::confess "size_request is abstract"; 329 Carp::confess "size_request is abstract";
… …
345 $self->{y} = $y; 349 $self->{y} = $y;
346 $self->update; 350 $self->update;
347 } 351 }
348 352
349 if ($self->{w} != $w || $self->{h} != $h) { 353 if ($self->{w} != $w || $self->{h} != $h) {
354 return unless $self->{visible};
355
350 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
351 } 357 }
352} 358}
353 359
354sub size_allocate { 360sub size_allocate {
355 # nothing to be done 361 # nothing to be done
356}
357
358sub reconfigure {
359 my ($self) = @_;
360
361 $self->check_size (1);
362 $self->update;
363} 362}
364 363
365sub children { 364sub children {
366} 365}
367 366
… …
445sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
446sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
447sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
448sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
449sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
449
450sub find_widget {
451 my ($self, $x, $y) = @_;
452
453 return () unless $self->{can_events};
454
455 return $self
456 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
457 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
458
459 ()
460}
461
462sub set_parent {
463 my ($self, $parent) = @_;
464
465 Scalar::Util::weaken ($self->{parent} = $parent);
466
467 $self->set_visible if $parent->{visible};
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub _emit {
477 my ($self, $signal, @args) = @_;
478
479 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
480}
481
482sub emit {
483 my ($self, $signal, @args) = @_;
484
485 $self->_emit ($signal, @args)
486 || $self->$signal (@args);
487}
488
489sub visibility_change {
490 #my ($self, $visible) = @_;
491}
492
493sub realloc {
494 my ($self) = @_;
495
496 if ($self->{visible}) {
497 return if $self->{root}{realloc}{$self};
498
499 $self->{root}{realloc}{$self} = $self;
500 $self->{root}->update;
501 } else {
502 delete $self->{req_w};
503 }
504}
505
506sub update {
507 my ($self) = @_;
508
509 $self->{parent}->update
510 if $self->{parent};
511}
450 512
451sub draw { 513sub draw {
452 my ($self) = @_; 514 my ($self) = @_;
453 515
454 return unless $self->{h} && $self->{w}; 516 return unless $self->{h} && $self->{w};
… …
492 my ($self) = @_; 554 my ($self) = @_;
493 555
494 warn "no draw defined for $self\n"; 556 warn "no draw defined for $self\n";
495} 557}
496 558
497sub find_widget {
498 my ($self, $x, $y) = @_;
499
500 return () unless $self->{can_events};
501
502 return $self
503 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
504 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
505
506 ()
507}
508
509sub set_parent {
510 my ($self, $parent) = @_;
511
512 Scalar::Util::weaken ($self->{parent} = $parent);
513
514 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
515
516 $self->check_size;
517}
518
519sub check_size {
520 my ($self, $forced) = @_;
521
522 $self->{force_alloc} = 1 if $forced;
523 $CFClient::UI::ROOT->{check_size}{$self} = $self;
524}
525
526sub update {
527 my ($self) = @_;
528
529 $self->{parent}->update
530 if $self->{parent};
531}
532
533sub connect {
534 my ($self, $signal, $cb) = @_;
535
536 push @{ $self->{signal_cb}{$signal} }, $cb;
537}
538
539sub _emit {
540 my ($self, $signal, @args) = @_;
541
542 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
543}
544
545sub emit {
546 my ($self, $signal, @args) = @_;
547
548 $self->_emit ($signal, @args)
549 || $self->$signal (@args);
550}
551
552sub visibility_change {
553 #my ($self, $visible) = @_;
554}
555
556sub DESTROY { 559sub DESTROY {
557 my ($self) = @_; 560 my ($self) = @_;
558 561
559 delete $WIDGET{$self+0}; 562 delete $WIDGET{$self+0};
560 #$self->deactivate; 563 #$self->deactivate;
… …
655 $self->{children} = [ 658 $self->{children} = [
656 sort { $a->{z} <=> $b->{z} } 659 sort { $a->{z} <=> $b->{z} }
657 @{$self->{children}}, @widgets 660 @{$self->{children}}, @widgets
658 ]; 661 ];
659 662
660 $self->check_size (1); 663 $self->realloc;
661 $self->update;
662} 664}
663 665
664sub children { 666sub children {
665 @{ $_[0]{children} } 667 @{ $_[0]{children} }
666} 668}
… …
671 delete $child->{parent}; 673 delete $child->{parent};
672 $child->hide; 674 $child->hide;
673 675
674 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 676 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
675 677
676 $self->check_size (1); 678 $self->realloc;
677 $self->update;
678} 679}
679 680
680sub clear { 681sub clear {
681 my ($self) = @_; 682 my ($self) = @_;
682 683
… …
686 for (@$children) { 687 for (@$children) {
687 delete $_->{parent}; 688 delete $_->{parent};
688 $_->hide; 689 $_->hide;
689 } 690 }
690 691
691 $self->check_size; 692 $self->realloc;
692 $self->update;
693} 693}
694 694
695sub find_widget { 695sub find_widget {
696 my ($self, $x, $y) = @_; 696 my ($self, $x, $y) = @_;
697 697
… …
750sub size_request { 750sub size_request {
751 $_[0]{children}[0]->size_request 751 $_[0]{children}[0]->size_request
752} 752}
753 753
754sub size_allocate { 754sub size_allocate {
755 my ($self, $w, $h) = @_; 755 my ($self, $w, $h, $changed) = @_;
756 756
757 $self->{children}[0]->configure (0, 0, $w, $h); 757 $self->{children}[0]->configure (0, 0, $w, $h);
758} 758}
759 759
760############################################################################# 760#############################################################################
… …
777 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 777 $ROOT->on_post_alloc ($self => sub { $self->render_child });
778 $self->SUPER::update; 778 $self->SUPER::update;
779} 779}
780 780
781sub size_allocate { 781sub size_allocate {
782 my ($self, $w, $h) = @_; 782 my ($self, $w, $h, $changed) = @_;
783 783
784 $self->SUPER::size_allocate ($w, $h); 784 $self->SUPER::size_allocate ($w, $h, $changed);
785 $self->update; 785 $self->update
786 if $changed;
786} 787}
787 788
788sub _render { 789sub _render {
789 $_[0]{children}[0]->draw; 790 $_[0]{children}[0]->draw;
790} 791}
… …
843 844
844 ($w, $h) 845 ($w, $h)
845} 846}
846 847
847sub size_allocate { 848sub size_allocate {
848 my ($self, $w, $h) = @_; 849 my ($self, $w, $h, $changed) = @_;
849 850
850 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
851 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
852 853
853 $self->child->configure (0, 0, $w, $h); 854 $self->child->configure (0, 0, $w, $h);
… …
940 my $child = $self->{vp}->child; 941 my $child = $self->{vp}->child;
941 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
942} 943}
943 944
944sub size_allocate { 945sub size_allocate {
945 my ($self, $w, $h) = @_; 946 my ($self, $w, $h, $changed) = @_;
946 947
947 $self->SUPER::size_allocate ($w, $h); 948 $self->SUPER::size_allocate ($w, $h, $changed);
948 949
949 my $child = $self->{vp}->child; 950 my $child = $self->{vp}->child;
950 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 951 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
951} 952}
952 953
… …
999 1000
1000our @ISA = CFClient::UI::Bin::; 1001our @ISA = CFClient::UI::Bin::;
1001 1002
1002use CFClient::OpenGL; 1003use CFClient::OpenGL;
1003 1004
1004my @tex = 1005my $bg =
1006 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1007 mipmap => 1, wrap => 1;
1008
1009my @border =
1005 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1010 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1006 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1011 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1007 1012
1008sub new { 1013sub new {
1009 my $class = shift; 1014 my $class = shift;
1010 1015
1011 my $self = $class->SUPER::new ( 1016 my $self = $class->SUPER::new (
… …
1040 $h + $self->border * 2, 1045 $h + $self->border * 2,
1041 ) 1046 )
1042} 1047}
1043 1048
1044sub size_allocate { 1049sub size_allocate {
1045 my ($self, $w, $h) = @_; 1050 my ($self, $w, $h, $changed) = @_;
1051
1052 return unless $changed;
1046 1053
1047 $h -= List::Util::max 0, $self->border * 2; 1054 $h -= List::Util::max 0, $self->border * 2;
1048 $w -= List::Util::max 0, $self->border * 2; 1055 $w -= List::Util::max 0, $self->border * 2;
1049 1056
1050 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1079 $self->{user_x} = $wx + $dx * $mx; 1086 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my; 1087 $self->{user_y} = $wy + $dy * $my;
1081 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1090 $self->move ($self->{user_x}, $self->{user_y});
1084 $self->check_size; 1091 $self->realloc;
1085 }; 1092 };
1086 1093
1087 } elsif ($lr ^ $td) { 1094 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1095 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1096 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1095 1102
1096 $self->{user_x} = $bx + $x - $ox; 1103 $self->{user_x} = $bx + $x - $ox;
1097 $self->{user_y} = $by + $y - $oy; 1104 $self->{user_y} = $by + $y - $oy;
1098 1105
1099 $self->move ($self->{user_x}, $self->{user_y}); 1106 $self->move ($self->{user_x}, $self->{user_y});
1100 $self->update; 1107 $self->realloc;
1101 }; 1108 };
1102 } 1109 }
1103} 1110}
1104 1111
1105sub button_up { 1112sub button_up {
… …
1124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1125 1132
1126 my $border = $self->border; 1133 my $border = $self->border;
1127 1134
1128 glColor @{ $self->{border_bg} }; 1135 glColor @{ $self->{border_bg} };
1129 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1136 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1130 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1137 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1131 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1138 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1132 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1139 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1133 1140
1134 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1141 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1135 my $bg = $tex[0]; 1142 glColor @{ $self->{bg} };
1136 1143
1137 # TODO: repeat texture not scale 1144 # TODO: repeat texture not scale
1145 # solve this better(?)
1138 my $rep_x = $cw / $bg->{w}; 1146 $bg->{s} = $cw / $bg->{w};
1139 my $rep_y = $ch / $bg->{h}; 1147 $bg->{t} = $ch / $bg->{h};
1140
1141 glColor @{ $self->{bg} };
1142
1143 $bg->{s} = $rep_x;
1144 $bg->{t} = $rep_y;
1145 $bg->{wrap_mode} = 1;
1146 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1148 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1147 } 1149 }
1148 1150
1149 glDisable GL_TEXTURE_2D; 1151 glDisable GL_TEXTURE_2D;
1150 1152
… …
1180 my ($self, $x, $y, $child) = @_; 1182 my ($self, $x, $y, $child) = @_;
1181 1183
1182 $child->set_parent ($self); 1184 $child->set_parent ($self);
1183 $self->{children}[$y][$x] = $child; 1185 $self->{children}[$y][$x] = $child;
1184 1186
1185 $self->check_size (1); 1187 $self->realloc;
1186} 1188}
1187 1189
1188# TODO: move to container class maybe? send children a signal on removal? 1190# TODO: move to container class maybe? send children a signal on removal?
1189sub clear { 1191sub clear {
1190 my ($self) = @_; 1192 my ($self) = @_;
… …
1195 for (@children) { 1197 for (@children) {
1196 delete $_->{parent}; 1198 delete $_->{parent};
1197 $_->hide; 1199 $_->hide;
1198 } 1200 }
1199 1201
1200 $self->check_size (1); 1202 $self->realloc;
1201 $self->update;
1202} 1203}
1203 1204
1204sub get_wh { 1205sub get_wh {
1205 my ($self) = @_; 1206 my ($self) = @_;
1206 1207
… …
1233 (sum @$hs), 1234 (sum @$hs),
1234 ) 1235 )
1235} 1236}
1236 1237
1237sub size_allocate { 1238sub size_allocate {
1238 my ($self, $w, $h) = @_; 1239 my ($self, $w, $h, $changed) = @_;
1239 1240
1240 my ($ws, $hs) = $self->get_wh; 1241 my ($ws, $hs) = $self->get_wh;
1241 1242
1242 my $req_w = (sum @$ws) || 1; 1243 my $req_w = (sum @$ws) || 1;
1243 my $req_h = (sum @$hs) || 1; 1244 my $req_h = (sum @$hs) || 1;
… …
1321 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1322 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1322 ) 1323 )
1323} 1324}
1324 1325
1325sub size_allocate { 1326sub size_allocate {
1326 my ($self, $w, $h) = @_; 1327 my ($self, $w, $h, $changed) = @_;
1327 1328
1328 my $space = $self->{vertical} ? $h : $w; 1329 my $space = $self->{vertical} ? $h : $w;
1329 my $children = $self->{children}; 1330 my $children = $self->{children};
1330 1331
1331 my @req; 1332 my @req;
… …
1460 $self->{text} = "T$text"; 1461 $self->{text} = "T$text";
1461 1462
1462 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1463 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463 $self->{layout}->set_text ($text); 1464 $self->{layout}->set_text ($text);
1464 1465
1466 $self->realloc;
1465 $self->update; 1467 $self->update;
1466 $self->check_size;
1467} 1468}
1468 1469
1469sub set_markup { 1470sub set_markup {
1470 my ($self, $markup) = @_; 1471 my ($self, $markup) = @_;
1471 1472
… …
1475 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1476 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476 1477
1477 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1478 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1478 $self->{layout}->set_markup ($markup); 1479 $self->{layout}->set_markup ($markup);
1479 1480
1481 $self->realloc;
1480 $self->update; 1482 $self->update;
1481 $self->check_size;
1482} 1483}
1483 1484
1484sub size_request { 1485sub size_request {
1485 my ($self) = @_; 1486 my ($self) = @_;
1486 1487
… …
1507 $h + $self->{padding} * 2, 1508 $h + $self->{padding} * 2,
1508 ) 1509 )
1509} 1510}
1510 1511
1511sub size_allocate { 1512sub size_allocate {
1512 my ($self, $w, $h) = @_; 1513 my ($self, $w, $h, $changed) = @_;
1513 1514
1514 delete $self->{texture}; 1515 delete $self->{texture}
1516 if $changed;
1515} 1517}
1516 1518
1517sub set_fontsize { 1519sub set_fontsize {
1518 my ($self, $fontsize) = @_; 1520 my ($self, $fontsize) = @_;
1519 1521
1520 $self->{fontsize} = $fontsize; 1522 $self->{fontsize} = $fontsize;
1521 delete $self->{texture}; 1523 delete $self->{texture};
1522 1524
1523 $self->update; 1525 $self->realloc;
1524 $self->check_size;
1525} 1526}
1526 1527
1527sub _draw { 1528sub _draw {
1528 my ($self) = @_; 1529 my ($self) = @_;
1529 1530
… …
1609sub set_text { 1610sub set_text {
1610 my ($self, $text) = @_; 1611 my ($self, $text) = @_;
1611 1612
1612 $self->{cursor} = length $text; 1613 $self->{cursor} = length $text;
1613 $self->_set_text ($text); 1614 $self->_set_text ($text);
1614 $self->update; 1615
1615 $self->check_size; 1616 $self->realloc;
1616} 1617}
1617 1618
1618sub get_text { 1619sub get_text {
1619 $_[0]{text} 1620 $_[0]{text}
1620} 1621}
… …
1653 } elsif ($uni) { 1654 } elsif ($uni) {
1654 substr $text, $self->{cursor}++, 0, chr $uni; 1655 substr $text, $self->{cursor}++, 0, chr $uni;
1655 } 1656 }
1656 1657
1657 $self->_set_text ($text); 1658 $self->_set_text ($text);
1658 $self->update; 1659
1659 $self->check_size; 1660 $self->realloc;
1660} 1661}
1661 1662
1662sub focus_in { 1663sub focus_in {
1663 my ($self) = @_; 1664 my ($self) = @_;
1664 1665
… …
2171 $self->update; 2172 $self->update;
2172 2173
2173 $self 2174 $self
2174} 2175}
2175 2176
2177sub changed { }
2178
2176sub set_range { 2179sub set_range {
2177 my ($self, $range) = @_; 2180 my ($self, $range) = @_;
2178 2181
2179 ($range, $self->{range}) = ($self->{range}, $range); 2182 ($range, $self->{range}) = ($self->{range}, $range);
2180 2183
… …
2369 $self->{fontsize} = $fontsize; 2372 $self->{fontsize} = $fontsize;
2370 $self->reflow; 2373 $self->reflow;
2371} 2374}
2372 2375
2373sub size_allocate { 2376sub size_allocate {
2374 my ($self, $w, $h) = @_; 2377 my ($self, $w, $h, $changed) = @_;
2375 2378
2376 $self->SUPER::size_allocate ($w, $h); 2379 $self->SUPER::size_allocate ($w, $h, $changed);
2380
2381 return unless $changed;
2377 2382
2378 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2383 $self->{layout}->set_font ($self->{font}) if $self->{font};
2379 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2380 $self->{layout}->set_width ($self->{children}[0]{w}); 2385 $self->{layout}->set_width ($self->{children}[0]{w});
2381 2386
… …
2623 2628
2624 ($w + 4, $h + 4) 2629 ($w + 4, $h + 4)
2625} 2630}
2626 2631
2627sub size_allocate { 2632sub size_allocate {
2628 my ($self, $w, $h) = @_; 2633 my ($self, $w, $h, $changed) = @_;
2629 2634
2635 return unless $changed;
2636
2630 $self->SUPER::size_allocate ($w - 4, $h - 4); 2637 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2638}
2639
2640sub visibility_change {
2641 my ($self, $visible) = @_;
2642
2643 return unless $visible;
2644
2645 $self->{root}->on_post_alloc ("move_$self" => sub {
2646 my $widget = $self->{owner}
2647 or return;
2648
2649 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2650
2651 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2652 if $x + $self->{w} > $::WIDTH;
2653
2654 $self->move ($x, $y);
2655 });
2631} 2656}
2632 2657
2633sub _draw { 2658sub _draw {
2634 my ($self) = @_; 2659 my ($self) = @_;
2635 2660
… …
2652 glVertex $w, $h; 2677 glVertex $w, $h;
2653 glVertex $w, 0; 2678 glVertex $w, 0;
2654 glEnd; 2679 glEnd;
2655 2680
2656 glTranslate 2 - 0.375, 2 - 0.375; 2681 glTranslate 2 - 0.375, 2 - 0.375;
2682
2657 $self->SUPER::_draw; 2683 $self->SUPER::_draw;
2658} 2684}
2659 2685
2660############################################################################# 2686#############################################################################
2661 2687
… …
2970use CFClient::OpenGL; 2996use CFClient::OpenGL;
2971 2997
2972sub new { 2998sub new {
2973 my $class = shift; 2999 my $class = shift;
2974 3000
2975 $class->SUPER::new ( 3001 my $self = $class->SUPER::new (
2976 visible => 1, 3002 visible => 1,
2977 @_, 3003 @_,
2978 ) 3004 );
3005
3006 Scalar::Util::weaken ($self->{root} = $self);
3007
3008 $self
2979} 3009}
2980 3010
2981sub configure { 3011sub configure {
2982 my ($self, $x, $y, $w, $h) = @_; 3012 my ($self, $x, $y, $w, $h) = @_;
2983 3013
2984 $self->{w} = $w; 3014 $self->{w} = $w;
2985 $self->{h} = $h; 3015 $self->{h} = $h;
2986} 3016}
2987 3017
2988sub check_size { 3018sub reconfigure {
2989 my ($self) = @_; 3019 my ($self) = @_;
2990 3020
3021 $self->SUPER::reconfigure;
3022
2991 $self->size_allocate ($self->{w}, $self->{h}) 3023 $self->size_allocate ($self->{w}, $self->{h}, 1)
2992 if $self->{w}; 3024 if $self->{w};
2993} 3025}
2994 3026
2995sub size_request { 3027sub size_request {
2996 my ($self) = @_; 3028 my ($self) = @_;
2997 3029
2998 ($self->{w}, $self->{h}) 3030 ($self->{w}, $self->{h})
2999} 3031}
3000 3032
3001sub size_allocate { 3033sub size_allocate {
3002 my ($self, $w, $h) = @_; 3034 my ($self, $w, $h, $changed) = @_;
3003 3035
3004 for my $child ($self->children) { 3036 for my $child ($self->children) {
3005 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3006 3038
3007 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3008 if exists $child->{req_x}; 3040 if exists $child->{req_x};
3009 3041
3010 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3011 if exists $child->{req_y}; 3043 if exists $child->{req_y};
3012 3044
3013 delete @$child{qw(req_x req_y)}; 3045 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3014 3046
3015 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3047 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3016 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3048 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3017 3049
3018 $child->configure ($X, $Y, $W, $H); 3050 $child->configure ($X, $Y, $W, $H);
… …
3032} 3064}
3033 3065
3034sub update { 3066sub update {
3035 my ($self) = @_; 3067 my ($self) = @_;
3036 3068
3037 $self->check_size;
3038 $::WANT_REFRESH++; 3069 $::WANT_REFRESH++;
3039} 3070}
3040 3071
3041sub add { 3072sub add {
3042 my ($self, @children) = @_; 3073 my ($self, @children) = @_;
… …
3048 $child->{x} = int $child->{x}; 3079 $child->{x} = int $child->{x};
3049 $child->{y} = int $child->{y}; 3080 $child->{y} = int $child->{y};
3050 } 3081 }
3051 3082
3052 $self->SUPER::add (@children); 3083 $self->SUPER::add (@children);
3053
3054 for (my @widgets = @children; my $w = pop @widgets; ) {
3055 push @widgets, $w->children;
3056 $w->set_visible;
3057 }
3058
3059} 3084}
3060 3085
3061sub remove { 3086sub remove {
3062 my ($self, @children) = @_; 3087 my ($self, @children) = @_;
3063 3088
… …
3088 while ($self->{refresh_hook}) { 3113 while ($self->{refresh_hook}) {
3089 $_->() 3114 $_->()
3090 for values %{delete $self->{refresh_hook}}; 3115 for values %{delete $self->{refresh_hook}};
3091 } 3116 }
3092 3117
3093 if ($self->{check_size}) { 3118 if ($self->{realloc}) {
3094 my @queue; 3119 my @queue;
3095 3120
3096 for (;;) { 3121 while () {
3097 if ($self->{check_size}) { 3122 if ($self->{realloc}) {
3098 #TODO use array-of-depth approach 3123 #TODO use array-of-depth approach
3099 3124
3100 @queue = sort { $a->{visible} <=> $b->{visible} } 3125 @queue = sort { $a->{visible} <=> $b->{visible} }
3101 @queue, values %{delete $self->{check_size}}; 3126 @queue, values %{delete $self->{realloc}};
3102 } 3127 }
3103 3128
3104 my $widget = pop @queue || last; 3129 my $widget = pop @queue || last;
3105 3130
3106 defined $widget->{visible} or last; # do not resize invisible widgets 3131 $widget->{visible} or last; # do not resize invisible widgets
3107 3132
3108 my ($w, $h) = $widget->{def_w} && $widget->{def_h} 3133 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3109 ? @$widget{qw(def_w def_h)} 3134 ? @$widget{qw(def_w def_h)}
3110 : $widget->size_request; 3135 : $widget->size_request;
3111 3136
3112 if (delete $widget->{force_alloc}
3113 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3114 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3137 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3115 3138
3116 $widget->{req_w} = $w; 3139 $widget->{req_w} = $w;
3117 $widget->{req_h} = $h; 3140 $widget->{req_h} = $h;
3118 3141
3119 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3142 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3120 3143
3121 $widget->{parent}->check_size 3144 push @queue, $widget->{parent}
3122 if $widget->{parent}; 3145 if $widget->{parent};
3123 }
3124 } 3146 }
3125 } 3147 }
3126 3148
3127 while ($self->{size_alloc}) { 3149 while (my $size_alloc = delete $self->{size_alloc}) {
3128 for ( 3150 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3129 sort { $a->[0]{visible} <=> $b->[0]{visible} } 3151 values %$size_alloc;
3130 values %{delete $self->{size_alloc}} 3152
3131 ) { 3153 while () {
3132 my ($widget, $w, $h) = @$_; 3154 my ($widget, $w, $h) = @{ pop @queue or last };
3133 3155
3134 $w = 0 if $w < 0; 3156 $w = 0 if $w < 0;
3135 $h = 0 if $h < 0; 3157 $h = 0 if $h < 0;
3136 3158
3159 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3160
3137 $widget->{w} = $w; 3161 $widget->{w} = $w;
3138 $widget->{h} = $h; 3162 $widget->{h} = $h;
3163
3139 $widget->emit (size_allocate => $w, $h); 3164 $widget->emit (size_allocate => $w, $h, $changed);
3140 } 3165 }
3141 } 3166 }
3142 3167
3143 while ($self->{post_alloc_hook}) { 3168 while ($self->{post_alloc_hook}) {
3144 $_->() 3169 $_->()

Diff Legend

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