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.250 by root, Sun May 28 02:31:03 2006 UTC vs.
Revision 1.256 by root, Tue May 30 01:42:16 2006 UTC

… …
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
29 } 31 }
30 32
31 return $LAYOUT; 33 $layout
32} 34}
33 35
34sub set_layout { 36sub set_layout {
35 my ($layout) = @_; 37 my ($layout) = @_;
36 $LAYOUT = $layout; 38 $LAYOUT = $layout;
… …
40 if (!$GRAB) { 42 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 43 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 44 if (length $widget->{tooltip}) {
43 45
44 if ($TOOLTIP->{owner} != $widget) { 46 if ($TOOLTIP->{owner} != $widget) {
47 $TOOLTIP->hide;
48
45 $TOOLTIP->{owner} = $widget; 49 $TOOLTIP->{owner} = $widget;
46 50
47 my $tip = $widget->{tooltip}; 51 my $tip = $widget->{tooltip};
48 52
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 53 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 54
51 $TOOLTIP->set_tooltip_from ($widget); 55 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 56 $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 } 57 }
63 58
64 return; 59 return;
65 } 60 }
66 } 61 }
… …
172sub rescale_widgets { 167sub rescale_widgets {
173 my ($sx, $sy) = @_; 168 my ($sx, $sy) = @_;
174 169
175 for my $widget (values %WIDGET) { 170 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 171 if ($widget->{is_toplevel}) {
172 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
173 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
174
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 175 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 176 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 177 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 178 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 179 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 180 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
181
182 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
183 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
184
183 } 185 }
184 } 186 }
185 187
186 reconfigure_widgets; 188 reconfigure_widgets;
187} 189}
… …
196 198
197sub new { 199sub new {
198 my $class = shift; 200 my $class = shift;
199 201
200 my $self = bless { 202 my $self = bless {
201 x => 0, 203 x => "center",
202 y => 0, 204 y => "center",
203 z => 0, 205 z => 0,
206 w => undef,
207 h => undef,
204 can_events => 1, 208 can_events => 1,
205 @_ 209 @_
206 }, $class; 210 }, $class;
211
212 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220 }
221
222 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 223
208 for (keys %$self) { 224 for (keys %$self) {
209 if (/^on_(.*)$/) { 225 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 226 $self->connect ($1 => delete $self->{$_});
211 } 227 }
212 } 228 }
213 229
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH;
218 $self->{req_y} = $layout->{y} * $::HEIGHT;
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
221 }
222
223 $self 230 $self
224} 231}
225 232
226sub destroy { 233sub destroy {
227 my ($self) = @_; 234 my ($self) = @_;
… …
236 return if $self->{parent}; 243 return if $self->{parent};
237 244
238 $CFClient::UI::ROOT->add ($self); 245 $CFClient::UI::ROOT->add ($self);
239} 246}
240 247
241sub center {
242 my ($self) = @_;
243
244 $CFClient::UI::ROOT->on_post_alloc (
245 "center_$self" => sub {
246 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
247 },
248 );
249
250 $self->update;
251}
252
253sub set_visible { 248sub set_visible {
254 my ($self) = @_; 249 my ($self) = @_;
255 250
256 return if $self->{visible}; 251 return if $self->{visible};
257 252
258 $self->{root} = $self->{parent}{root}; 253 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1; 254 $self->{visible} = $self->{parent}{visible} + 1;
260 255
261 $self->emit (visibility_change => 1); 256 $self->emit (visibility_change => 1);
257
258 $self->realloc if !exists $self->{req_w};
259
260 $_->set_visible for $self->children;
262} 261}
263 262
264sub set_invisible { 263sub set_invisible {
265 my ($self) = @_; 264 my ($self) = @_;
266 265
267 return unless $self->{visible}; 266 return unless $self->{visible};
268 267
269 # broken show/hide model 268 $_->set_invisible for $self->children;
270 269
271 delete $self->{root}; 270 delete $self->{root};
272 delete $self->{visible}; 271 delete $self->{visible};
273 272
274 undef $GRAB if $GRAB == $self; 273 undef $GRAB if $GRAB == $self;
275 undef $HOVER if $HOVER == $self; 274 undef $HOVER if $HOVER == $self;
276 275
277 CFClient::UI::check_tooltip 276 CFClient::UI::check_tooltip
278 if $CFClient::UI::TOOLTIP->{owner} == $self; 277 if $TOOLTIP->{owner} == $self;
279 278
280 $self->focus_out; 279 $self->focus_out;
281 280
282 $self->emit (visibility_change => 0); 281 $self->emit (visibility_change => 0);
283} 282}
… …
306 305
307 $self->{parent}->remove ($self) 306 $self->{parent}->remove ($self)
308 if $self->{parent}; 307 if $self->{parent};
309} 308}
310 309
311sub move { 310sub move_abs {
312 my ($self, $x, $y, $z) = @_; 311 my ($self, $x, $y, $z) = @_;
313 312
314 $self->{x} = int $x; 313 $self->{x} = List::Util::max 0, int $x;
315 $self->{y} = int $y; 314 $self->{y} = List::Util::max 0, int $y;
316 $self->{z} = $z if defined $z; 315 $self->{z} = $z if defined $z;
317 316
318 $self->update; 317 $self->update;
319} 318}
320 319
321sub set_size { 320sub set_size {
322 my ($self, $w, $h) = @_; 321 my ($self, $w, $h) = @_;
323 322
324 $self->{def_w} = $w; 323 $self->{force_w} = $w;
325 $self->{def_h} = $h; 324 $self->{force_h} = $h;
326 325
327 $self->check_size; 326 $self->realloc;
328} 327}
329 328
330sub size_request { 329sub size_request {
331 require Carp; 330 require Carp;
332 Carp::confess "size_request is abstract"; 331 Carp::confess "size_request is abstract";
… …
334 333
335sub configure { 334sub configure {
336 my ($self, $x, $y, $w, $h) = @_; 335 my ($self, $x, $y, $w, $h) = @_;
337 336
338 if ($self->{aspect}) { 337 if ($self->{aspect}) {
338 my ($ow, $oh) = ($w, $h);
339
339 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 340 $w = List::Util::min $w, int $h * $self->{aspect};
340 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 341 $h = List::Util::min $h, int $w / $self->{aspect};
341 342
342 # use alignment to adjust x, y 343 # use alignment to adjust x, y
343 344
344 $x += int +($w - $w2) * 0.5; 345 $x += int 0.5 * ($ow - $w);
345 $y += int +($h - $h2) * 0.5; 346 $y += int 0.5 * ($oh - $h);
346
347 ($w, $h) = ($w2, $h2);
348 } 347 }
349 348
350 if ($self->{x} != $x || $self->{y} != $y) { 349 if ($self->{x} ne $x || $self->{y} ne $y) {
351 $self->{x} = $x; 350 $self->{x} = $x;
352 $self->{y} = $y; 351 $self->{y} = $y;
353 $self->update; 352 $self->update;
354 } 353 }
355 354
356 if ($self->{w} != $w || $self->{h} != $h) { 355 if ($self->{w} != $w || $self->{h} != $h) {
356 return unless $self->{visible};
357
357 $CFClient::UI::ROOT->{size_alloc}{$self+0} = [$self, $w, $h]; 358 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
358 } 359 }
359} 360}
360 361
361sub size_allocate { 362sub size_allocate {
362 # nothing to be done 363 # nothing to be done
363}
364
365sub reconfigure {
366 my ($self) = @_;
367
368 $self->check_size (1);
369 $self->update;
370} 364}
371 365
372sub children { 366sub children {
373} 367}
374 368
… …
452sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
453sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
454sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
455sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
456sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 450sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
451
452sub find_widget {
453 my ($self, $x, $y) = @_;
454
455 return () unless $self->{can_events};
456
457 return $self
458 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
459 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
460
461 ()
462}
463
464sub set_parent {
465 my ($self, $parent) = @_;
466
467 Scalar::Util::weaken ($self->{parent} = $parent);
468
469 $self->set_visible if $parent->{visible};
470}
471
472sub connect {
473 my ($self, $signal, $cb) = @_;
474
475 push @{ $self->{signal_cb}{$signal} }, $cb;
476}
477
478sub _emit {
479 my ($self, $signal, @args) = @_;
480
481 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
482}
483
484sub emit {
485 my ($self, $signal, @args) = @_;
486
487 $self->_emit ($signal, @args)
488 || $self->$signal (@args);
489}
490
491sub visibility_change {
492 #my ($self, $visible) = @_;
493}
494
495sub realloc {
496 my ($self) = @_;
497
498 if ($self->{visible}) {
499 return if $self->{root}{realloc}{$self};
500
501 $self->{root}{realloc}{$self} = $self;
502 $self->{root}->update;
503 } else {
504 delete $self->{req_w};
505 }
506}
507
508sub update {
509 my ($self) = @_;
510
511 $self->{parent}->update
512 if $self->{parent};
513}
514
515sub reconfigure {
516 my ($self) = @_;
517
518 $self->realloc;
519 $self->update;
520}
457 521
458sub draw { 522sub draw {
459 my ($self) = @_; 523 my ($self) = @_;
460 524
461 return unless $self->{h} && $self->{w}; 525 return unless $self->{h} && $self->{w};
… …
478 glVertex $x , $y + $self->{h}; 542 glVertex $x , $y + $self->{h};
479 glEnd; 543 glEnd;
480 glDisable GL_BLEND; 544 glDisable GL_BLEND;
481 } 545 }
482 546
483 if ($ENV{PCLIENT_DEBUG}) { 547 if ($ENV{CFPLUS_DEBUG}) {
484 glPushMatrix; 548 glPushMatrix;
485 glColor 1, 1, 0, 1; 549 glColor 1, 1, 0, 1;
486 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
487 glBegin GL_LINE_LOOP; 551 glBegin GL_LINE_LOOP;
488 glVertex 0 , 0; 552 glVertex 0 , 0;
… …
499 my ($self) = @_; 563 my ($self) = @_;
500 564
501 warn "no draw defined for $self\n"; 565 warn "no draw defined for $self\n";
502} 566}
503 567
504sub find_widget {
505 my ($self, $x, $y) = @_;
506
507 return () unless $self->{can_events};
508
509 return $self
510 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
511 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
512
513 ()
514}
515
516sub set_parent {
517 my ($self, $parent) = @_;
518
519 Scalar::Util::weaken ($self->{parent} = $parent);
520
521 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
522
523 $self->check_size;
524}
525
526sub check_size {
527 my ($self, $forced) = @_;
528
529 $self->{force_alloc} = 1 if $forced;
530 $CFClient::UI::ROOT->{check_size}{$self} = $self;
531}
532
533sub update {
534 my ($self) = @_;
535
536 $self->{parent}->update
537 if $self->{parent};
538}
539
540sub connect {
541 my ($self, $signal, $cb) = @_;
542
543 push @{ $self->{signal_cb}{$signal} }, $cb;
544}
545
546sub _emit {
547 my ($self, $signal, @args) = @_;
548
549 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
550}
551
552sub emit {
553 my ($self, $signal, @args) = @_;
554
555 $self->_emit ($signal, @args)
556 || $self->$signal (@args);
557}
558
559sub visibility_change {
560 #my ($self, $visible) = @_;
561}
562
563sub DESTROY { 568sub DESTROY {
564 my ($self) = @_; 569 my ($self) = @_;
565 570
566 delete $WIDGET{$self+0}; 571 delete $WIDGET{$self+0};
567 #$self->deactivate; 572 #$self->deactivate;
… …
623 my ($class, %arg) = @_; 628 my ($class, %arg) = @_;
624 $class->SUPER::new (can_events => 0, %arg); 629 $class->SUPER::new (can_events => 0, %arg);
625} 630}
626 631
627sub size_request { 632sub size_request {
628 (0, 0) 633 my ($self) = @_;
634
635 ($self->{w} + 0, $self->{h} + 0)
629} 636}
630 637
631sub draw { } 638sub draw { }
632 639
633############################################################################# 640#############################################################################
… …
662 $self->{children} = [ 669 $self->{children} = [
663 sort { $a->{z} <=> $b->{z} } 670 sort { $a->{z} <=> $b->{z} }
664 @{$self->{children}}, @widgets 671 @{$self->{children}}, @widgets
665 ]; 672 ];
666 673
667 $self->check_size (1); 674 $self->realloc;
668 $self->update;
669} 675}
670 676
671sub children { 677sub children {
672 @{ $_[0]{children} } 678 @{ $_[0]{children} }
673} 679}
… …
678 delete $child->{parent}; 684 delete $child->{parent};
679 $child->hide; 685 $child->hide;
680 686
681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 687 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
682 688
683 $self->check_size (1); 689 $self->realloc;
684 $self->update;
685} 690}
686 691
687sub clear { 692sub clear {
688 my ($self) = @_; 693 my ($self) = @_;
689 694
… …
693 for (@$children) { 698 for (@$children) {
694 delete $_->{parent}; 699 delete $_->{parent};
695 $_->hide; 700 $_->hide;
696 } 701 }
697 702
698 $self->check_size; 703 $self->realloc;
699 $self->update;
700} 704}
701 705
702sub find_widget { 706sub find_widget {
703 my ($self, $x, $y) = @_; 707 my ($self, $x, $y) = @_;
704 708
… …
757sub size_request { 761sub size_request {
758 $_[0]{children}[0]->size_request 762 $_[0]{children}[0]->size_request
759} 763}
760 764
761sub size_allocate { 765sub size_allocate {
762 my ($self, $w, $h) = @_; 766 my ($self, $w, $h, $changed) = @_;
763 767
764 $self->{children}[0]->configure (0, 0, $w, $h); 768 $self->{children}[0]->configure (0, 0, $w, $h);
765} 769}
766 770
767############################################################################# 771#############################################################################
… …
784 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 788 $ROOT->on_post_alloc ($self => sub { $self->render_child });
785 $self->SUPER::update; 789 $self->SUPER::update;
786} 790}
787 791
788sub size_allocate { 792sub size_allocate {
789 my ($self, $w, $h) = @_; 793 my ($self, $w, $h, $changed) = @_;
790 794
791 $self->SUPER::size_allocate ($w, $h); 795 $self->SUPER::size_allocate ($w, $h, $changed);
792 $self->update; 796 $self->update
797 if $changed;
793} 798}
794 799
795sub _render { 800sub _render {
796 $_[0]{children}[0]->draw; 801 $_[0]{children}[0]->draw;
797} 802}
… …
850 855
851 ($w, $h) 856 ($w, $h)
852} 857}
853 858
854sub size_allocate { 859sub size_allocate {
855 my ($self, $w, $h) = @_; 860 my ($self, $w, $h, $changed) = @_;
856 861
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 862 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 863 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
859 864
860 $self->child->configure (0, 0, $w, $h); 865 $self->child->configure (0, 0, $w, $h);
… …
947 my $child = $self->{vp}->child; 952 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 953 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949} 954}
950 955
951sub size_allocate { 956sub size_allocate {
952 my ($self, $w, $h) = @_; 957 my ($self, $w, $h, $changed) = @_;
953 958
954 $self->SUPER::size_allocate ($w, $h); 959 $self->SUPER::size_allocate ($w, $h, $changed);
955 960
956 my $child = $self->{vp}->child; 961 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958} 963}
959 964
… …
1006 1011
1007our @ISA = CFClient::UI::Bin::; 1012our @ISA = CFClient::UI::Bin::;
1008 1013
1009use CFClient::OpenGL; 1014use CFClient::OpenGL;
1010 1015
1011my @tex = 1016my $bg =
1017 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1018 mipmap => 1, wrap => 1;
1019
1020my @border =
1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1022 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014 1023
1015sub new { 1024sub new {
1016 my $class = shift; 1025 my $class = shift;
1017 1026
1018 my $self = $class->SUPER::new ( 1027 my $self = $class->SUPER::new (
… …
1047 $h + $self->border * 2, 1056 $h + $self->border * 2,
1048 ) 1057 )
1049} 1058}
1050 1059
1051sub size_allocate { 1060sub size_allocate {
1052 my ($self, $w, $h) = @_; 1061 my ($self, $w, $h, $changed) = @_;
1062
1063 return unless $changed;
1053 1064
1054 $h -= List::Util::max 0, $self->border * 2; 1065 $h -= List::Util::max 0, $self->border * 2;
1055 $w -= List::Util::max 0, $self->border * 2; 1066 $w -= List::Util::max 0, $self->border * 2;
1056 1067
1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1068 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1081 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
1082 1093
1083 my $dx = $ev->{x} - $ox; 1094 my $dx = $ev->{x} - $ox;
1084 my $dy = $ev->{y} - $oy; 1095 my $dy = $ev->{y} - $oy;
1085 1096
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1097 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1098 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090 $self->move ($self->{user_x}, $self->{user_y}); 1099
1091 $self->check_size; 1100 $self->realloc;
1101 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1092 }; 1102 };
1093 1103
1094 } elsif ($lr ^ $td) { 1104 } elsif ($lr ^ $td) {
1095 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1105 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1096 my ($bx, $by) = ($self->{x}, $self->{y}); 1106 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1098 $self->{motion} = sub { 1108 $self->{motion} = sub {
1099 my ($ev, $x, $y) = @_; 1109 my ($ev, $x, $y) = @_;
1100 1110
1101 ($x, $y) = ($ev->{x}, $ev->{y}); 1111 ($x, $y) = ($ev->{x}, $ev->{y});
1102 1112
1103 $self->{user_x} = $bx + $x - $ox; 1113 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1104 $self->{user_y} = $by + $y - $oy;
1105
1106 $self->move ($self->{user_x}, $self->{user_y});
1107 $self->update;
1108 }; 1114 };
1109 } 1115 }
1110} 1116}
1111 1117
1112sub button_up { 1118sub button_up {
… …
1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1132 1138
1133 my $border = $self->border; 1139 my $border = $self->border;
1134 1140
1135 glColor @{ $self->{border_bg} }; 1141 glColor @{ $self->{border_bg} };
1136 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1142 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1137 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1143 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1138 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1144 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1139 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1145 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1140 1146
1141 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1147 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1142 my $bg = $tex[0]; 1148 glColor @{ $self->{bg} };
1143 1149
1144 # TODO: repeat texture not scale 1150 # TODO: repeat texture not scale
1151 # solve this better(?)
1145 my $rep_x = $cw / $bg->{w}; 1152 $bg->{s} = $cw / $bg->{w};
1146 my $rep_y = $ch / $bg->{h}; 1153 $bg->{t} = $ch / $bg->{h};
1147
1148 glColor @{ $self->{bg} };
1149
1150 $bg->{s} = $rep_x;
1151 $bg->{t} = $rep_y;
1152 $bg->{wrap_mode} = 1;
1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154 } 1155 }
1155 1156
1156 glDisable GL_TEXTURE_2D; 1157 glDisable GL_TEXTURE_2D;
1157 1158
… …
1187 my ($self, $x, $y, $child) = @_; 1188 my ($self, $x, $y, $child) = @_;
1188 1189
1189 $child->set_parent ($self); 1190 $child->set_parent ($self);
1190 $self->{children}[$y][$x] = $child; 1191 $self->{children}[$y][$x] = $child;
1191 1192
1192 $self->check_size (1); 1193 $self->realloc;
1193} 1194}
1194 1195
1195# TODO: move to container class maybe? send children a signal on removal? 1196# TODO: move to container class maybe? send children a signal on removal?
1196sub clear { 1197sub clear {
1197 my ($self) = @_; 1198 my ($self) = @_;
… …
1202 for (@children) { 1203 for (@children) {
1203 delete $_->{parent}; 1204 delete $_->{parent};
1204 $_->hide; 1205 $_->hide;
1205 } 1206 }
1206 1207
1207 $self->check_size (1); 1208 $self->realloc;
1208 $self->update;
1209} 1209}
1210 1210
1211sub get_wh { 1211sub get_wh {
1212 my ($self) = @_; 1212 my ($self) = @_;
1213 1213
… …
1240 (sum @$hs), 1240 (sum @$hs),
1241 ) 1241 )
1242} 1242}
1243 1243
1244sub size_allocate { 1244sub size_allocate {
1245 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h, $changed) = @_;
1246 1246
1247 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
1248 1248
1249 my $req_w = (sum @$ws) || 1; 1249 my $req_w = (sum @$ws) || 1;
1250 my $req_h = (sum @$hs) || 1; 1250 my $req_h = (sum @$hs) || 1;
… …
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1328 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 ) 1329 )
1330} 1330}
1331 1331
1332sub size_allocate { 1332sub size_allocate {
1333 my ($self, $w, $h) = @_; 1333 my ($self, $w, $h, $changed) = @_;
1334 1334
1335 my $space = $self->{vertical} ? $h : $w; 1335 my $space = $self->{vertical} ? $h : $w;
1336 my $children = $self->{children}; 1336 my $children = $self->{children};
1337 1337
1338 my @req; 1338 my @req;
… …
1467 $self->{text} = "T$text"; 1467 $self->{text} = "T$text";
1468 1468
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470 $self->{layout}->set_text ($text); 1470 $self->{layout}->set_text ($text);
1471 1471
1472 $self->realloc;
1472 $self->update; 1473 $self->update;
1473 $self->check_size;
1474} 1474}
1475 1475
1476sub set_markup { 1476sub set_markup {
1477 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1478 1478
… …
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1483
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1486 1486
1487 $self->realloc;
1487 $self->update; 1488 $self->update;
1488 $self->check_size;
1489} 1489}
1490 1490
1491sub size_request { 1491sub size_request {
1492 my ($self) = @_; 1492 my ($self) = @_;
1493 1493
… …
1514 $h + $self->{padding} * 2, 1514 $h + $self->{padding} * 2,
1515 ) 1515 )
1516} 1516}
1517 1517
1518sub size_allocate { 1518sub size_allocate {
1519 my ($self, $w, $h) = @_; 1519 my ($self, $w, $h, $changed) = @_;
1520 1520
1521 delete $self->{texture}; 1521 delete $self->{texture}
1522 if $changed;
1522} 1523}
1523 1524
1524sub set_fontsize { 1525sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1526 my ($self, $fontsize) = @_;
1526 1527
1527 $self->{fontsize} = $fontsize; 1528 $self->{fontsize} = $fontsize;
1528 delete $self->{texture}; 1529 delete $self->{texture};
1529 1530
1530 $self->update; 1531 $self->realloc;
1531 $self->check_size;
1532} 1532}
1533 1533
1534sub _draw { 1534sub _draw {
1535 my ($self) = @_; 1535 my ($self) = @_;
1536 1536
… …
1616sub set_text { 1616sub set_text {
1617 my ($self, $text) = @_; 1617 my ($self, $text) = @_;
1618 1618
1619 $self->{cursor} = length $text; 1619 $self->{cursor} = length $text;
1620 $self->_set_text ($text); 1620 $self->_set_text ($text);
1621 $self->update; 1621
1622 $self->check_size; 1622 $self->realloc;
1623} 1623}
1624 1624
1625sub get_text { 1625sub get_text {
1626 $_[0]{text} 1626 $_[0]{text}
1627} 1627}
… …
1660 } elsif ($uni) { 1660 } elsif ($uni) {
1661 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1662 } 1662 }
1663 1663
1664 $self->_set_text ($text); 1664 $self->_set_text ($text);
1665 $self->update; 1665
1666 $self->check_size; 1666 $self->realloc;
1667} 1667}
1668 1668
1669sub focus_in { 1669sub focus_in {
1670 my ($self) = @_; 1670 my ($self) = @_;
1671 1671
… …
2178 $self->update; 2178 $self->update;
2179 2179
2180 $self 2180 $self
2181} 2181}
2182 2182
2183sub changed { }
2184
2183sub set_range { 2185sub set_range {
2184 my ($self, $range) = @_; 2186 my ($self, $range) = @_;
2185 2187
2186 ($range, $self->{range}) = ($self->{range}, $range); 2188 ($range, $self->{range}) = ($self->{range}, $range);
2187 2189
… …
2376 $self->{fontsize} = $fontsize; 2378 $self->{fontsize} = $fontsize;
2377 $self->reflow; 2379 $self->reflow;
2378} 2380}
2379 2381
2380sub size_allocate { 2382sub size_allocate {
2381 my ($self, $w, $h) = @_; 2383 my ($self, $w, $h, $changed) = @_;
2382 2384
2383 $self->SUPER::size_allocate ($w, $h); 2385 $self->SUPER::size_allocate ($w, $h, $changed);
2386
2387 return unless $changed;
2384 2388
2385 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2389 $self->{layout}->set_font ($self->{font}) if $self->{font};
2386 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2387 $self->{layout}->set_width ($self->{children}[0]{w}); 2391 $self->{layout}->set_width ($self->{children}[0]{w});
2388 2392
… …
2630 2634
2631 ($w + 4, $h + 4) 2635 ($w + 4, $h + 4)
2632} 2636}
2633 2637
2634sub size_allocate { 2638sub size_allocate {
2635 my ($self, $w, $h) = @_; 2639 my ($self, $w, $h, $changed) = @_;
2636 2640
2641 return unless $changed;
2642
2637 $self->SUPER::size_allocate ($w - 4, $h - 4); 2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2644}
2645
2646sub visibility_change {
2647 my ($self, $visible) = @_;
2648
2649 return unless $visible;
2650
2651 $self->{root}->on_post_alloc ("move_$self" => sub {
2652 my $widget = $self->{owner}
2653 or return;
2654
2655 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2656
2657 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2658 if $x + $self->{w} > $::WIDTH;
2659
2660 $self->move_abs ($x, $y);
2661 });
2638} 2662}
2639 2663
2640sub _draw { 2664sub _draw {
2641 my ($self) = @_; 2665 my ($self) = @_;
2642 2666
… …
2659 glVertex $w, $h; 2683 glVertex $w, $h;
2660 glVertex $w, 0; 2684 glVertex $w, 0;
2661 glEnd; 2685 glEnd;
2662 2686
2663 glTranslate 2 - 0.375, 2 - 0.375; 2687 glTranslate 2 - 0.375, 2 - 0.375;
2688
2664 $self->SUPER::_draw; 2689 $self->SUPER::_draw;
2665} 2690}
2666 2691
2667############################################################################# 2692#############################################################################
2668 2693
… …
2977use CFClient::OpenGL; 3002use CFClient::OpenGL;
2978 3003
2979sub new { 3004sub new {
2980 my $class = shift; 3005 my $class = shift;
2981 3006
2982 $class->SUPER::new ( 3007 my $self = $class->SUPER::new (
2983 visible => 1, 3008 visible => 1,
2984 @_, 3009 @_,
2985 ) 3010 );
3011
3012 Scalar::Util::weaken ($self->{root} = $self);
3013
3014 $self
2986} 3015}
2987 3016
2988sub configure { 3017sub configure {
2989 my ($self, $x, $y, $w, $h) = @_; 3018 my ($self, $x, $y, $w, $h) = @_;
2990 3019
2991 $self->{w} = $w; 3020 $self->{w} = $w;
2992 $self->{h} = $h; 3021 $self->{h} = $h;
2993} 3022}
2994 3023
2995sub check_size { 3024sub reconfigure {
2996 my ($self) = @_; 3025 my ($self) = @_;
2997 3026
3027 $self->SUPER::reconfigure;
3028
2998 $self->size_allocate ($self->{w}, $self->{h}) 3029 $self->size_allocate ($self->{w}, $self->{h}, 1)
2999 if $self->{w}; 3030 if $self->{w};
3000} 3031}
3001 3032
3002sub size_request { 3033sub size_request {
3003 my ($self) = @_; 3034 my ($self) = @_;
3004 3035
3005 ($self->{w}, $self->{h}) 3036 ($self->{w}, $self->{h})
3006} 3037}
3007 3038
3039sub _to_pixel {
3040 my ($coord, $size, $max) = @_;
3041
3042 $coord =
3043 $coord eq "center" ? ($max - $size) * 0.5
3044 : $coord eq "max" ? $max
3045 : $coord;
3046
3047 $coord = 0 if $coord < 0;
3048 $coord = $max - $size if $coord > $max - $size;
3049
3050 int $coord + 0.5
3051}
3052
3008sub size_allocate { 3053sub size_allocate {
3009 my ($self, $w, $h) = @_; 3054 my ($self, $w, $h, $changed) = @_;
3010 3055
3011 for my $child ($self->children) { 3056 for my $child ($self->children) {
3012 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3057 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3013 3058
3014 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3059 $X = $child->{force_x} if exists $child->{force_x};
3015 if exists $child->{req_x}; 3060 $Y = $child->{force_y} if exists $child->{force_y};
3016 3061
3017 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3062 $X = _to_pixel $X, $W, $self->{w};
3018 if exists $child->{req_y}; 3063 $Y = _to_pixel $Y, $H, $self->{h};
3019
3020 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3021
3022 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3023 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3024 3064
3025 $child->configure ($X, $Y, $W, $H); 3065 $child->configure ($X, $Y, $W, $H);
3026 } 3066 }
3027} 3067}
3028 3068
… …
3039} 3079}
3040 3080
3041sub update { 3081sub update {
3042 my ($self) = @_; 3082 my ($self) = @_;
3043 3083
3044 $self->check_size;
3045 $::WANT_REFRESH++; 3084 $::WANT_REFRESH++;
3046} 3085}
3047 3086
3048sub add { 3087sub add {
3049 my ($self, @children) = @_; 3088 my ($self, @children) = @_;
3050 3089
3051 for my $child (@children) {
3052 $child->{is_toplevel} = 1; 3090 $_->{is_toplevel} = 1
3053 3091 for @children;
3054 # integerise window positions
3055 $child->{x} = int $child->{x};
3056 $child->{y} = int $child->{y};
3057 }
3058 3092
3059 $self->SUPER::add (@children); 3093 $self->SUPER::add (@children);
3060
3061 for (my @widgets = @children; my $w = pop @widgets; ) {
3062 push @widgets, $w->children;
3063 $w->set_visible;
3064 }
3065
3066} 3094}
3067 3095
3068sub remove { 3096sub remove {
3069 my ($self, @children) = @_; 3097 my ($self, @children) = @_;
3070 3098
3071 $self->SUPER::remove (@children); 3099 $self->SUPER::remove (@children);
3100
3101 delete $self->{is_toplevel}
3102 for @children;
3072 3103
3073 while (@children) { 3104 while (@children) {
3074 my $w = pop @children; 3105 my $w = pop @children;
3075 push @children, $w->children; 3106 push @children, $w->children;
3076 $w->set_invisible; 3107 $w->set_invisible;
… …
3095 while ($self->{refresh_hook}) { 3126 while ($self->{refresh_hook}) {
3096 $_->() 3127 $_->()
3097 for values %{delete $self->{refresh_hook}}; 3128 for values %{delete $self->{refresh_hook}};
3098 } 3129 }
3099 3130
3100 if ($self->{check_size}) { 3131 if ($self->{realloc}) {
3101 my @queue; 3132 my @queue;
3102 3133
3103 while () { 3134 while () {
3104 if ($self->{check_size}) { 3135 if ($self->{realloc}) {
3105 #TODO use array-of-depth approach 3136 #TODO use array-of-depth approach
3106 3137
3107 @queue = sort { $a->{visible} <=> $b->{visible} } 3138 @queue = sort { $a->{visible} <=> $b->{visible} }
3108 @queue, values %{delete $self->{check_size}}; 3139 @queue, values %{delete $self->{realloc}};
3109 } 3140 }
3110 3141
3111 my $widget = pop @queue || last; 3142 my $widget = pop @queue || last;
3112 3143
3113 defined $widget->{visible} or last; # do not resize invisible widgets 3144 $widget->{visible} or last; # do not resize invisible widgets
3114 3145
3115 my ($w, $h) = $widget->{def_w} && $widget->{def_h} 3146 my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
3116 ? @$widget{qw(def_w def_h)} 3147 ? @$widget{qw(force_w force_h)}
3117 : $widget->size_request; 3148 : $widget->size_request;
3118 3149
3119 if (delete $widget->{force_alloc} 3150 my $min_size = $widget->{is_toplevel} ? 16 : 0;
3120 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3151
3121 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3152 $w = $min_size if $w < $min_size;
3122 3153 $h = $min_size if $h < $min_size;
3154
3123 $widget->{req_w} = $w; 3155 $widget->{req_w} = $w;
3124 $widget->{req_h} = $h; 3156 $widget->{req_h} = $h;
3125 3157
3126 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3158 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3127 3159
3128 $widget->{parent}->check_size 3160 push @queue, $widget->{parent}
3129 if $widget->{parent}; 3161 if $widget->{parent};
3130 }
3131 } 3162 }
3132 } 3163 }
3133 3164
3134 while (my $size_alloc = delete $self->{size_alloc}) { 3165 while (my $size_alloc = delete $self->{size_alloc}) {
3135 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3166 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3136 values %$size_alloc; 3167 values %$size_alloc;
3137 3168
3138 while () { 3169 while () {
3139 my ($widget, $w, $h) = @{ pop @queue or last }; 3170 my ($widget, $w, $h) = @{ pop @queue or last };
3140 3171
3172 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3173 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3174
3141 $w = 0 if $w < 0; 3175 $w = 0 if $w < 0;
3142 $h = 0 if $h < 0; 3176 $h = 0 if $h < 0;
3143 3177
3178 $w = int $w + 0.5;
3179 $h = int $h + 0.5;
3180
3181 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3182
3144 $widget->{w} = $w; 3183 $widget->{w} = $w;
3145 $widget->{h} = $h; 3184 $widget->{h} = $h;
3185
3146 $widget->emit (size_allocate => $w, $h); 3186 $widget->emit (size_allocate => $w, $h, $changed);
3147 } 3187 }
3148 } 3188 }
3149 3189
3150 while ($self->{post_alloc_hook}) { 3190 while ($self->{post_alloc_hook}) {
3151 $_->() 3191 $_->()

Diff Legend

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