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.248 by root, Sun May 28 01:37:45 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}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234} 231}
235 232
236sub destroy { 233sub destroy {
237 my ($self) = @_; 234 my ($self) = @_;
238 235
… …
246 return if $self->{parent}; 243 return if $self->{parent};
247 244
248 $CFClient::UI::ROOT->add ($self); 245 $CFClient::UI::ROOT->add ($self);
249} 246}
250 247
251sub center {
252 my ($self) = @_;
253
254 $CFClient::UI::ROOT->on_post_alloc (
255 "center_$self" => sub {
256 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
257 },
258 );
259
260 $self->update;
261}
262
263sub set_visible { 248sub set_visible {
264 my ($self) = @_; 249 my ($self) = @_;
265 250
266 return if $self->{visible}; 251 return if $self->{visible};
267 252
268 $self->{root} = $self->{parent}{root}; 253 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1; 254 $self->{visible} = $self->{parent}{visible} + 1;
270 255
271 $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;
272} 261}
273 262
274sub set_invisible { 263sub set_invisible {
275 my ($self) = @_; 264 my ($self) = @_;
276 265
277 return unless $self->{visible}; 266 return unless $self->{visible};
278 267
279 # broken show/hide model 268 $_->set_invisible for $self->children;
280 269
281 delete $self->{root}; 270 delete $self->{root};
282 delete $self->{visible}; 271 delete $self->{visible};
283 272
284 undef $GRAB if $GRAB == $self; 273 undef $GRAB if $GRAB == $self;
285 undef $HOVER if $HOVER == $self; 274 undef $HOVER if $HOVER == $self;
286 275
287 CFClient::UI::check_tooltip 276 CFClient::UI::check_tooltip
288 if $CFClient::UI::TOOLTIP->{owner} == $self; 277 if $TOOLTIP->{owner} == $self;
289 278
290 $self->focus_out; 279 $self->focus_out;
291 280
292 $self->emit (visibility_change => 0); 281 $self->emit (visibility_change => 0);
282}
283
284sub set_visibility {
285 my ($self, $visible) = @_;
286
287 return if $self->{visible} == $visible;
288
289 $visible ? $self->hide
290 : $self->show;
291}
292
293sub toggle_visibility {
294 my ($self) = @_;
295
296 $self->{visible}
297 ? $self->hide
298 : $self->show;
293} 299}
294 300
295sub hide { 301sub hide {
296 my ($self) = @_; 302 my ($self) = @_;
297 303
… …
299 305
300 $self->{parent}->remove ($self) 306 $self->{parent}->remove ($self)
301 if $self->{parent}; 307 if $self->{parent};
302} 308}
303 309
304sub move { 310sub move_abs {
305 my ($self, $x, $y, $z) = @_; 311 my ($self, $x, $y, $z) = @_;
306 312
307 $self->{x} = int $x; 313 $self->{x} = List::Util::max 0, int $x;
308 $self->{y} = int $y; 314 $self->{y} = List::Util::max 0, int $y;
309 $self->{z} = $z if defined $z; 315 $self->{z} = $z if defined $z;
310 316
311 $self->update; 317 $self->update;
312} 318}
313 319
314sub set_size { 320sub set_size {
315 my ($self, $w, $h) = @_; 321 my ($self, $w, $h) = @_;
316 322
317 $self->{def_w} = $w; 323 $self->{force_w} = $w;
318 $self->{def_h} = $h; 324 $self->{force_h} = $h;
319 325
320 $self->check_size; 326 $self->realloc;
321} 327}
322 328
323sub size_request { 329sub size_request {
324 require Carp; 330 require Carp;
325 Carp::confess "size_request is abstract"; 331 Carp::confess "size_request is abstract";
… …
327 333
328sub configure { 334sub configure {
329 my ($self, $x, $y, $w, $h) = @_; 335 my ($self, $x, $y, $w, $h) = @_;
330 336
331 if ($self->{aspect}) { 337 if ($self->{aspect}) {
338 my ($ow, $oh) = ($w, $h);
339
332 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 340 $w = List::Util::min $w, int $h * $self->{aspect};
333 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 341 $h = List::Util::min $h, int $w / $self->{aspect};
334 342
335 # use alignment to adjust x, y 343 # use alignment to adjust x, y
336 344
337 $x += int +($w - $w2) * 0.5; 345 $x += int 0.5 * ($ow - $w);
338 $y += int +($h - $h2) * 0.5; 346 $y += int 0.5 * ($oh - $h);
339
340 ($w, $h) = ($w2, $h2);
341 } 347 }
342 348
343 if ($self->{x} != $x || $self->{y} != $y) { 349 if ($self->{x} ne $x || $self->{y} ne $y) {
344 $self->{x} = $x; 350 $self->{x} = $x;
345 $self->{y} = $y; 351 $self->{y} = $y;
346 $self->update; 352 $self->update;
347 } 353 }
348 354
349 if ($self->{w} != $w || $self->{h} != $h) { 355 if ($self->{w} != $w || $self->{h} != $h) {
356 return unless $self->{visible};
357
350 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 358 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
351 } 359 }
352} 360}
353 361
354sub size_allocate { 362sub size_allocate {
355 # nothing to be done 363 # nothing to be done
356}
357
358sub reconfigure {
359 my ($self) = @_;
360
361 $self->check_size (1);
362 $self->update;
363} 364}
364 365
365sub children { 366sub children {
366} 367}
367 368
… …
445sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
446sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
447sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
448sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
449sub 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}
450 521
451sub draw { 522sub draw {
452 my ($self) = @_; 523 my ($self) = @_;
453 524
454 return unless $self->{h} && $self->{w}; 525 return unless $self->{h} && $self->{w};
… …
471 glVertex $x , $y + $self->{h}; 542 glVertex $x , $y + $self->{h};
472 glEnd; 543 glEnd;
473 glDisable GL_BLEND; 544 glDisable GL_BLEND;
474 } 545 }
475 546
476 if ($ENV{PCLIENT_DEBUG}) { 547 if ($ENV{CFPLUS_DEBUG}) {
477 glPushMatrix; 548 glPushMatrix;
478 glColor 1, 1, 0, 1; 549 glColor 1, 1, 0, 1;
479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
480 glBegin GL_LINE_LOOP; 551 glBegin GL_LINE_LOOP;
481 glVertex 0 , 0; 552 glVertex 0 , 0;
… …
492 my ($self) = @_; 563 my ($self) = @_;
493 564
494 warn "no draw defined for $self\n"; 565 warn "no draw defined for $self\n";
495} 566}
496 567
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 { 568sub DESTROY {
557 my ($self) = @_; 569 my ($self) = @_;
558 570
559 delete $WIDGET{$self+0}; 571 delete $WIDGET{$self+0};
560 #$self->deactivate; 572 #$self->deactivate;
… …
616 my ($class, %arg) = @_; 628 my ($class, %arg) = @_;
617 $class->SUPER::new (can_events => 0, %arg); 629 $class->SUPER::new (can_events => 0, %arg);
618} 630}
619 631
620sub size_request { 632sub size_request {
621 (0, 0) 633 my ($self) = @_;
634
635 ($self->{w} + 0, $self->{h} + 0)
622} 636}
623 637
624sub draw { } 638sub draw { }
625 639
626############################################################################# 640#############################################################################
… …
655 $self->{children} = [ 669 $self->{children} = [
656 sort { $a->{z} <=> $b->{z} } 670 sort { $a->{z} <=> $b->{z} }
657 @{$self->{children}}, @widgets 671 @{$self->{children}}, @widgets
658 ]; 672 ];
659 673
660 $self->check_size (1); 674 $self->realloc;
661 $self->update;
662} 675}
663 676
664sub children { 677sub children {
665 @{ $_[0]{children} } 678 @{ $_[0]{children} }
666} 679}
… …
671 delete $child->{parent}; 684 delete $child->{parent};
672 $child->hide; 685 $child->hide;
673 686
674 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 687 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
675 688
676 $self->check_size (1); 689 $self->realloc;
677 $self->update;
678} 690}
679 691
680sub clear { 692sub clear {
681 my ($self) = @_; 693 my ($self) = @_;
682 694
… …
686 for (@$children) { 698 for (@$children) {
687 delete $_->{parent}; 699 delete $_->{parent};
688 $_->hide; 700 $_->hide;
689 } 701 }
690 702
691 $self->check_size; 703 $self->realloc;
692 $self->update;
693} 704}
694 705
695sub find_widget { 706sub find_widget {
696 my ($self, $x, $y) = @_; 707 my ($self, $x, $y) = @_;
697 708
… …
750sub size_request { 761sub size_request {
751 $_[0]{children}[0]->size_request 762 $_[0]{children}[0]->size_request
752} 763}
753 764
754sub size_allocate { 765sub size_allocate {
755 my ($self, $w, $h) = @_; 766 my ($self, $w, $h, $changed) = @_;
756 767
757 $self->{children}[0]->configure (0, 0, $w, $h); 768 $self->{children}[0]->configure (0, 0, $w, $h);
758} 769}
759 770
760############################################################################# 771#############################################################################
… …
777 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 788 $ROOT->on_post_alloc ($self => sub { $self->render_child });
778 $self->SUPER::update; 789 $self->SUPER::update;
779} 790}
780 791
781sub size_allocate { 792sub size_allocate {
782 my ($self, $w, $h) = @_; 793 my ($self, $w, $h, $changed) = @_;
783 794
784 $self->SUPER::size_allocate ($w, $h); 795 $self->SUPER::size_allocate ($w, $h, $changed);
785 $self->update; 796 $self->update
797 if $changed;
786} 798}
787 799
788sub _render { 800sub _render {
789 $_[0]{children}[0]->draw; 801 $_[0]{children}[0]->draw;
790} 802}
… …
843 855
844 ($w, $h) 856 ($w, $h)
845} 857}
846 858
847sub size_allocate { 859sub size_allocate {
848 my ($self, $w, $h) = @_; 860 my ($self, $w, $h, $changed) = @_;
849 861
850 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 862 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
851 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 863 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
852 864
853 $self->child->configure (0, 0, $w, $h); 865 $self->child->configure (0, 0, $w, $h);
… …
940 my $child = $self->{vp}->child; 952 my $child = $self->{vp}->child;
941 $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]);
942} 954}
943 955
944sub size_allocate { 956sub size_allocate {
945 my ($self, $w, $h) = @_; 957 my ($self, $w, $h, $changed) = @_;
946 958
947 $self->SUPER::size_allocate ($w, $h); 959 $self->SUPER::size_allocate ($w, $h, $changed);
948 960
949 my $child = $self->{vp}->child; 961 my $child = $self->{vp}->child;
950 $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]);
951} 963}
952 964
… …
999 1011
1000our @ISA = CFClient::UI::Bin::; 1012our @ISA = CFClient::UI::Bin::;
1001 1013
1002use CFClient::OpenGL; 1014use CFClient::OpenGL;
1003 1015
1004my @tex = 1016my $bg =
1017 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1018 mipmap => 1, wrap => 1;
1019
1020my @border =
1005 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1021 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); 1022 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1007 1023
1008sub new { 1024sub new {
1009 my $class = shift; 1025 my $class = shift;
1010 1026
1011 my $self = $class->SUPER::new ( 1027 my $self = $class->SUPER::new (
… …
1040 $h + $self->border * 2, 1056 $h + $self->border * 2,
1041 ) 1057 )
1042} 1058}
1043 1059
1044sub size_allocate { 1060sub size_allocate {
1045 my ($self, $w, $h) = @_; 1061 my ($self, $w, $h, $changed) = @_;
1062
1063 return unless $changed;
1046 1064
1047 $h -= List::Util::max 0, $self->border * 2; 1065 $h -= List::Util::max 0, $self->border * 2;
1048 $w -= List::Util::max 0, $self->border * 2; 1066 $w -= List::Util::max 0, $self->border * 2;
1049 1067
1050 $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)
… …
1074 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
1075 1093
1076 my $dx = $ev->{x} - $ox; 1094 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy; 1095 my $dy = $ev->{y} - $oy;
1078 1096
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
1081 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1097 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1098 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1099
1084 $self->check_size; 1100 $self->realloc;
1101 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1085 }; 1102 };
1086 1103
1087 } elsif ($lr ^ $td) { 1104 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1105 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1106 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1091 $self->{motion} = sub { 1108 $self->{motion} = sub {
1092 my ($ev, $x, $y) = @_; 1109 my ($ev, $x, $y) = @_;
1093 1110
1094 ($x, $y) = ($ev->{x}, $ev->{y}); 1111 ($x, $y) = ($ev->{x}, $ev->{y});
1095 1112
1096 $self->{user_x} = $bx + $x - $ox; 1113 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097 $self->{user_y} = $by + $y - $oy;
1098
1099 $self->move ($self->{user_x}, $self->{user_y});
1100 $self->update;
1101 }; 1114 };
1102 } 1115 }
1103} 1116}
1104 1117
1105sub button_up { 1118sub button_up {
… …
1124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1125 1138
1126 my $border = $self->border; 1139 my $border = $self->border;
1127 1140
1128 glColor @{ $self->{border_bg} }; 1141 glColor @{ $self->{border_bg} };
1129 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1142 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1130 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1143 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1131 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1144 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1132 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1145 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1133 1146
1134 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1147 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1135 my $bg = $tex[0]; 1148 glColor @{ $self->{bg} };
1136 1149
1137 # TODO: repeat texture not scale 1150 # TODO: repeat texture not scale
1151 # solve this better(?)
1138 my $rep_x = $cw / $bg->{w}; 1152 $bg->{s} = $cw / $bg->{w};
1139 my $rep_y = $ch / $bg->{h}; 1153 $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); 1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1147 } 1155 }
1148 1156
1149 glDisable GL_TEXTURE_2D; 1157 glDisable GL_TEXTURE_2D;
1150 1158
… …
1180 my ($self, $x, $y, $child) = @_; 1188 my ($self, $x, $y, $child) = @_;
1181 1189
1182 $child->set_parent ($self); 1190 $child->set_parent ($self);
1183 $self->{children}[$y][$x] = $child; 1191 $self->{children}[$y][$x] = $child;
1184 1192
1185 $self->check_size (1); 1193 $self->realloc;
1186} 1194}
1187 1195
1188# 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?
1189sub clear { 1197sub clear {
1190 my ($self) = @_; 1198 my ($self) = @_;
… …
1195 for (@children) { 1203 for (@children) {
1196 delete $_->{parent}; 1204 delete $_->{parent};
1197 $_->hide; 1205 $_->hide;
1198 } 1206 }
1199 1207
1200 $self->check_size (1); 1208 $self->realloc;
1201 $self->update;
1202} 1209}
1203 1210
1204sub get_wh { 1211sub get_wh {
1205 my ($self) = @_; 1212 my ($self) = @_;
1206 1213
… …
1233 (sum @$hs), 1240 (sum @$hs),
1234 ) 1241 )
1235} 1242}
1236 1243
1237sub size_allocate { 1244sub size_allocate {
1238 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h, $changed) = @_;
1239 1246
1240 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
1241 1248
1242 my $req_w = (sum @$ws) || 1; 1249 my $req_w = (sum @$ws) || 1;
1243 my $req_h = (sum @$hs) || 1; 1250 my $req_h = (sum @$hs) || 1;
… …
1321 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1328 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1322 ) 1329 )
1323} 1330}
1324 1331
1325sub size_allocate { 1332sub size_allocate {
1326 my ($self, $w, $h) = @_; 1333 my ($self, $w, $h, $changed) = @_;
1327 1334
1328 my $space = $self->{vertical} ? $h : $w; 1335 my $space = $self->{vertical} ? $h : $w;
1329 my $children = $self->{children}; 1336 my $children = $self->{children};
1330 1337
1331 my @req; 1338 my @req;
… …
1460 $self->{text} = "T$text"; 1467 $self->{text} = "T$text";
1461 1468
1462 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463 $self->{layout}->set_text ($text); 1470 $self->{layout}->set_text ($text);
1464 1471
1472 $self->realloc;
1465 $self->update; 1473 $self->update;
1466 $self->check_size;
1467} 1474}
1468 1475
1469sub set_markup { 1476sub set_markup {
1470 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1471 1478
… …
1475 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476 1483
1477 $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;
1478 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1479 1486
1487 $self->realloc;
1480 $self->update; 1488 $self->update;
1481 $self->check_size;
1482} 1489}
1483 1490
1484sub size_request { 1491sub size_request {
1485 my ($self) = @_; 1492 my ($self) = @_;
1486 1493
… …
1507 $h + $self->{padding} * 2, 1514 $h + $self->{padding} * 2,
1508 ) 1515 )
1509} 1516}
1510 1517
1511sub size_allocate { 1518sub size_allocate {
1512 my ($self, $w, $h) = @_; 1519 my ($self, $w, $h, $changed) = @_;
1513 1520
1514 delete $self->{texture}; 1521 delete $self->{texture}
1522 if $changed;
1515} 1523}
1516 1524
1517sub set_fontsize { 1525sub set_fontsize {
1518 my ($self, $fontsize) = @_; 1526 my ($self, $fontsize) = @_;
1519 1527
1520 $self->{fontsize} = $fontsize; 1528 $self->{fontsize} = $fontsize;
1521 delete $self->{texture}; 1529 delete $self->{texture};
1522 1530
1523 $self->update; 1531 $self->realloc;
1524 $self->check_size;
1525} 1532}
1526 1533
1527sub _draw { 1534sub _draw {
1528 my ($self) = @_; 1535 my ($self) = @_;
1529 1536
… …
1609sub set_text { 1616sub set_text {
1610 my ($self, $text) = @_; 1617 my ($self, $text) = @_;
1611 1618
1612 $self->{cursor} = length $text; 1619 $self->{cursor} = length $text;
1613 $self->_set_text ($text); 1620 $self->_set_text ($text);
1614 $self->update; 1621
1615 $self->check_size; 1622 $self->realloc;
1616} 1623}
1617 1624
1618sub get_text { 1625sub get_text {
1619 $_[0]{text} 1626 $_[0]{text}
1620} 1627}
… …
1653 } elsif ($uni) { 1660 } elsif ($uni) {
1654 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1655 } 1662 }
1656 1663
1657 $self->_set_text ($text); 1664 $self->_set_text ($text);
1658 $self->update; 1665
1659 $self->check_size; 1666 $self->realloc;
1660} 1667}
1661 1668
1662sub focus_in { 1669sub focus_in {
1663 my ($self) = @_; 1670 my ($self) = @_;
1664 1671
… …
2171 $self->update; 2178 $self->update;
2172 2179
2173 $self 2180 $self
2174} 2181}
2175 2182
2183sub changed { }
2184
2176sub set_range { 2185sub set_range {
2177 my ($self, $range) = @_; 2186 my ($self, $range) = @_;
2178 2187
2179 ($range, $self->{range}) = ($self->{range}, $range); 2188 ($range, $self->{range}) = ($self->{range}, $range);
2180 2189
… …
2369 $self->{fontsize} = $fontsize; 2378 $self->{fontsize} = $fontsize;
2370 $self->reflow; 2379 $self->reflow;
2371} 2380}
2372 2381
2373sub size_allocate { 2382sub size_allocate {
2374 my ($self, $w, $h) = @_; 2383 my ($self, $w, $h, $changed) = @_;
2375 2384
2376 $self->SUPER::size_allocate ($w, $h); 2385 $self->SUPER::size_allocate ($w, $h, $changed);
2386
2387 return unless $changed;
2377 2388
2378 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2389 $self->{layout}->set_font ($self->{font}) if $self->{font};
2379 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2380 $self->{layout}->set_width ($self->{children}[0]{w}); 2391 $self->{layout}->set_width ($self->{children}[0]{w});
2381 2392
… …
2623 2634
2624 ($w + 4, $h + 4) 2635 ($w + 4, $h + 4)
2625} 2636}
2626 2637
2627sub size_allocate { 2638sub size_allocate {
2628 my ($self, $w, $h) = @_; 2639 my ($self, $w, $h, $changed) = @_;
2629 2640
2641 return unless $changed;
2642
2630 $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 });
2631} 2662}
2632 2663
2633sub _draw { 2664sub _draw {
2634 my ($self) = @_; 2665 my ($self) = @_;
2635 2666
… …
2652 glVertex $w, $h; 2683 glVertex $w, $h;
2653 glVertex $w, 0; 2684 glVertex $w, 0;
2654 glEnd; 2685 glEnd;
2655 2686
2656 glTranslate 2 - 0.375, 2 - 0.375; 2687 glTranslate 2 - 0.375, 2 - 0.375;
2688
2657 $self->SUPER::_draw; 2689 $self->SUPER::_draw;
2658} 2690}
2659 2691
2660############################################################################# 2692#############################################################################
2661 2693
… …
2970use CFClient::OpenGL; 3002use CFClient::OpenGL;
2971 3003
2972sub new { 3004sub new {
2973 my $class = shift; 3005 my $class = shift;
2974 3006
2975 $class->SUPER::new ( 3007 my $self = $class->SUPER::new (
2976 visible => 1, 3008 visible => 1,
2977 @_, 3009 @_,
2978 ) 3010 );
3011
3012 Scalar::Util::weaken ($self->{root} = $self);
3013
3014 $self
2979} 3015}
2980 3016
2981sub configure { 3017sub configure {
2982 my ($self, $x, $y, $w, $h) = @_; 3018 my ($self, $x, $y, $w, $h) = @_;
2983 3019
2984 $self->{w} = $w; 3020 $self->{w} = $w;
2985 $self->{h} = $h; 3021 $self->{h} = $h;
2986} 3022}
2987 3023
2988sub check_size { 3024sub reconfigure {
2989 my ($self) = @_; 3025 my ($self) = @_;
2990 3026
3027 $self->SUPER::reconfigure;
3028
2991 $self->size_allocate ($self->{w}, $self->{h}) 3029 $self->size_allocate ($self->{w}, $self->{h}, 1)
2992 if $self->{w}; 3030 if $self->{w};
2993} 3031}
2994 3032
2995sub size_request { 3033sub size_request {
2996 my ($self) = @_; 3034 my ($self) = @_;
2997 3035
2998 ($self->{w}, $self->{h}) 3036 ($self->{w}, $self->{h})
2999} 3037}
3000 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
3001sub size_allocate { 3053sub size_allocate {
3002 my ($self, $w, $h) = @_; 3054 my ($self, $w, $h, $changed) = @_;
3003 3055
3004 for my $child ($self->children) { 3056 for my $child ($self->children) {
3005 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)};
3006 3058
3007 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3059 $X = $child->{force_x} if exists $child->{force_x};
3008 if exists $child->{req_x}; 3060 $Y = $child->{force_y} if exists $child->{force_y};
3009 3061
3010 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3062 $X = _to_pixel $X, $W, $self->{w};
3011 if exists $child->{req_y}; 3063 $Y = _to_pixel $Y, $H, $self->{h};
3012
3013 delete @$child{qw(req_x req_y)};
3014
3015 $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;
3017 3064
3018 $child->configure ($X, $Y, $W, $H); 3065 $child->configure ($X, $Y, $W, $H);
3019 } 3066 }
3020} 3067}
3021 3068
… …
3032} 3079}
3033 3080
3034sub update { 3081sub update {
3035 my ($self) = @_; 3082 my ($self) = @_;
3036 3083
3037 $self->check_size;
3038 $::WANT_REFRESH++; 3084 $::WANT_REFRESH++;
3039} 3085}
3040 3086
3041sub add { 3087sub add {
3042 my ($self, @children) = @_; 3088 my ($self, @children) = @_;
3043 3089
3044 for my $child (@children) {
3045 $child->{is_toplevel} = 1; 3090 $_->{is_toplevel} = 1
3046 3091 for @children;
3047 # integerise window positions
3048 $child->{x} = int $child->{x};
3049 $child->{y} = int $child->{y};
3050 }
3051 3092
3052 $self->SUPER::add (@children); 3093 $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} 3094}
3060 3095
3061sub remove { 3096sub remove {
3062 my ($self, @children) = @_; 3097 my ($self, @children) = @_;
3063 3098
3064 $self->SUPER::remove (@children); 3099 $self->SUPER::remove (@children);
3100
3101 delete $self->{is_toplevel}
3102 for @children;
3065 3103
3066 while (@children) { 3104 while (@children) {
3067 my $w = pop @children; 3105 my $w = pop @children;
3068 push @children, $w->children; 3106 push @children, $w->children;
3069 $w->set_invisible; 3107 $w->set_invisible;
… …
3088 while ($self->{refresh_hook}) { 3126 while ($self->{refresh_hook}) {
3089 $_->() 3127 $_->()
3090 for values %{delete $self->{refresh_hook}}; 3128 for values %{delete $self->{refresh_hook}};
3091 } 3129 }
3092 3130
3093 if ($self->{check_size}) { 3131 if ($self->{realloc}) {
3094 my @queue; 3132 my @queue;
3095 3133
3096 for (;;) { 3134 while () {
3097 if ($self->{check_size}) { 3135 if ($self->{realloc}) {
3098 #TODO use array-of-depth approach 3136 #TODO use array-of-depth approach
3099 3137
3100 @queue = sort { $a->{visible} <=> $b->{visible} } 3138 @queue = sort { $a->{visible} <=> $b->{visible} }
3101 @queue, values %{delete $self->{check_size}}; 3139 @queue, values %{delete $self->{realloc}};
3102 } 3140 }
3103 3141
3104 my $widget = pop @queue || last; 3142 my $widget = pop @queue || last;
3105 3143
3106 defined $widget->{visible} or last; # do not resize invisible widgets 3144 $widget->{visible} or last; # do not resize invisible widgets
3107 3145
3108 my ($w, $h) = $widget->{def_w} && $widget->{def_h} 3146 my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
3109 ? @$widget{qw(def_w def_h)} 3147 ? @$widget{qw(force_w force_h)}
3110 : $widget->size_request; 3148 : $widget->size_request;
3111 3149
3112 if (delete $widget->{force_alloc} 3150 my $min_size = $widget->{is_toplevel} ? 16 : 0;
3113 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3151
3114 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3152 $w = $min_size if $w < $min_size;
3115 3153 $h = $min_size if $h < $min_size;
3154
3116 $widget->{req_w} = $w; 3155 $widget->{req_w} = $w;
3117 $widget->{req_h} = $h; 3156 $widget->{req_h} = $h;
3118 3157
3119 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3158 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3120 3159
3121 $widget->{parent}->check_size 3160 push @queue, $widget->{parent}
3122 if $widget->{parent}; 3161 if $widget->{parent};
3123 }
3124 } 3162 }
3125 } 3163 }
3126 3164
3127 while ($self->{size_alloc}) { 3165 while (my $size_alloc = delete $self->{size_alloc}) {
3128 for (values %{delete $self->{size_alloc}}) { 3166 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3129 my ($widget, $w, $h) = @$_; 3167 values %$size_alloc;
3168
3169 while () {
3170 my ($widget, $w, $h) = @{ pop @queue or last };
3171
3172 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3173 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3130 3174
3131 $w = 0 if $w < 0; 3175 $w = 0 if $w < 0;
3132 $h = 0 if $h < 0; 3176 $h = 0 if $h < 0;
3133 3177
3178 $w = int $w + 0.5;
3179 $h = int $h + 0.5;
3180
3181 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3182
3134 $widget->{w} = $w; 3183 $widget->{w} = $w;
3135 $widget->{h} = $h; 3184 $widget->{h} = $h;
3185
3136 $widget->emit (size_allocate => $w, $h); 3186 $widget->emit (size_allocate => $w, $h, $changed);
3137 } 3187 }
3138 } 3188 }
3139 3189
3140 while ($self->{post_alloc_hook}) { 3190 while ($self->{post_alloc_hook}) {
3141 $_->() 3191 $_->()

Diff Legend

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