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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.331 by root, Sun Jul 23 04:46:02 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
78sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 81 if $FOCUS;
81} 82}
82 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
83sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
84 my ($ev) = @_; 98 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
86 100
87 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
88 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
89 103
90 $GRAB = $widget; 104 $GRAB = $widget;
91 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
92 106
93 check_tooltip; 107 $TOOLTIP_WATCHER->cb->();
94 } 108 }
95 109
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 111
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
99 if $GRAB; 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
100} 122}
101 123
102sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
103 my ($ev) = @_; 125 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 126
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 128
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 130
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
111 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 133
113 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 136 $grab->update if $grab;
116 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
117 138
118 check_tooltip; 139 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->();
119 } 141 }
120} 142}
121 143
122sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
123 my ($ev) = @_; 145 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
125 147
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 149
128 if ($widget != $HOVER) { 150 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 151
131 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 153 if $HOVER;
139} 154}
140 155
141# convert position array to integers 156# convert position array to integers
142sub harmonize { 157sub harmonize {
… …
188 203
189 } 204 }
190 } 205 }
191 206
192 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
193} 216}
194 217
195############################################################################# 218#############################################################################
196 219
197package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
271 294
272 return unless $self->{visible}; 295 return unless $self->{visible};
273 296
274 $_->set_invisible for $self->children; 297 $_->set_invisible for $self->children;
275 298
299 delete $self->{visible};
276 delete $self->{root}; 300 delete $self->{root};
277 delete $self->{visible};
278 301
279 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
281 304
282 CFClient::UI::check_tooltip 305 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 306 if $TOOLTIP->{owner} == $self;
284 307
285 $self->focus_out; 308 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 309 $self->emit (visibility_change => 0);
288} 310}
289 311
290sub set_visibility { 312sub set_visibility {
291 my ($self, $visible) = @_; 313 my ($self, $visible) = @_;
… …
314} 336}
315 337
316sub move_abs { 338sub move_abs {
317 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
318 340
319 $self->{x} = List::Util::max 0, int $x; 341 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 342 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
322 344
323 $self->update; 345 $self->update;
324} 346}
325 347
… …
333} 355}
334 356
335sub size_request { 357sub size_request {
336 require Carp; 358 require Carp;
337 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
360}
361
362sub baseline_shift {
363 0
338} 364}
339 365
340sub configure { 366sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
342 368
… …
366 392
367 $self->{root}{size_alloc}{$self+0} = $self; 393 $self->{root}{size_alloc}{$self+0} = $self;
368 } 394 }
369} 395}
370 396
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 397sub children {
376 # nop 398 # nop
377} 399}
378 400
379sub visible_children { 401sub visible_children {
… …
381} 403}
382 404
383sub set_max_size { 405sub set_max_size {
384 my ($self, $w, $h) = @_; 406 my ($self, $w, $h) = @_;
385 407
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 408 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 409 $self->{max_h} = int $h if defined $h;
410
411 $self->realloc;
388} 412}
389 413
390sub set_tooltip { 414sub set_tooltip {
391 my ($self, $tooltip) = @_; 415 my ($self, $tooltip) = @_;
392 416
… …
397 421
398 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
399 423
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 426 $CFClient::UI::TOOLTIP_WATCHER->cb->();
403 } 427 }
404} 428}
405 429
406# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
407sub coord2local { 431sub coord2local {
408 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
409 433
434 Carp::confess unless $self->{parent};#d#
435
410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
411} 437}
412 438
413# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
414sub coord2global { 440sub coord2global {
415 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
416 442
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 443 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 444}
419 445
420sub focus_in { 446sub invoke_focus_in {
421 my ($self) = @_; 447 my ($self) = @_;
422 448
423 return if $FOCUS == $self; 449 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 450 return unless $self->{can_focus};
425 451
426 my $focus = $FOCUS; $FOCUS = $self; 452 $FOCUS = $self;
427 453
428 $self->_emit (focus_in => $focus); 454 $self->update;
429 455
430 $focus->update if $focus; 456 0
431 $FOCUS->update;
432} 457}
433 458
434sub focus_out { 459sub invoke_focus_out {
435 my ($self) = @_; 460 my ($self) = @_;
436 461
437 return unless $FOCUS == $self; 462 return unless $FOCUS == $self;
438 463
439 my $focus = $FOCUS; undef $FOCUS; 464 undef $FOCUS;
440 465
441 $self->_emit (focus_out => $focus); 466 $self->update;
442 467
443 $focus->update if $focus; #?
444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 468 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 469 unless $FOCUS;
447}
448 470
471 0
472}
473
474sub grab_focus {
475 my ($self) = @_;
476
477 $FOCUS->emit ("focus_out") if $FOCUS;
478 $self->emit ("focus_in");
479}
480
449sub mouse_motion { 0 } 481sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 482sub invoke_button_up { 0 }
451sub key_down { 0 } 483sub invoke_key_down { 0 }
452sub key_up { 0 } 484sub invoke_key_up { 0 }
485sub invoke_mouse_wheel { 0 }
453 486
454sub button_down { 487sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 488 my ($self, $ev, $x, $y) = @_;
456 489
457 $self->focus_in; 490 $self->grab_focus;
458 491
459 0 492 0
493}
494
495sub connect {
496 my ($self, $signal, $cb) = @_;
497
498 push @{ $self->{signal_cb}{$signal} }, $cb;
499}
500
501my %has_coords = (
502 button_down => 1,
503 button_up => 1,
504 mouse_motion => 1,
505 mouse_wheel => 1,
506);
507
508sub emit {
509 my ($self, $signal, @args) = @_;
510
511 my @append
512 = $has_coords{$signal}
513 ? $args[0]->xy ($self)
514 : ();
515
516 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
517
518 #d##TODO# stop propagating at first true, do not use sum
519 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
520 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
521 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460} 522}
461 523
462sub find_widget { 524sub find_widget {
463 my ($self, $x, $y) = @_; 525 my ($self, $x, $y) = @_;
464 526
… …
474sub set_parent { 536sub set_parent {
475 my ($self, $parent) = @_; 537 my ($self, $parent) = @_;
476 538
477 Scalar::Util::weaken ($self->{parent} = $parent); 539 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 540 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502} 541}
503 542
504sub realloc { 543sub realloc {
505 my ($self) = @_; 544 my ($self) = @_;
506 545
… …
539 return unless $self->{h} && $self->{w}; 578 return unless $self->{h} && $self->{w};
540 579
541 # update screen rectangle 580 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 581 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 582 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 583
547 # skip widgets that are entirely outside the drawing area 584 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 585 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 586 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 587
551 glPushMatrix; 588 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 589 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 590
556 if ($self == $HOVER && $self->{can_hover}) { 591 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 592 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 593 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 594 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 595 glBegin GL_QUADS;
563 glVertex $x , $y; 596 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 597 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 598 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 599 glVertex 0 , $self->{h};
567 glEnd; 600 glEnd;
568 glDisable GL_BLEND; 601 glDisable GL_BLEND;
569 } 602 }
570 603
571 if ($ENV{CFPLUS_DEBUG} & 1) { 604 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 605 glPushMatrix;
573 glColor 1, 1, 0, 1; 606 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 607 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 608 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 609 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 610 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 611 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 612 glVertex 0 , $self->{h} - 1;
580 glEnd; 613 glEnd;
581 glPopMatrix; 614 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 615 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 616 }
617
618 $self->_draw;
619 glPopMatrix;
584} 620}
585 621
586sub _draw { 622sub _draw {
587 my ($self) = @_; 623 my ($self) = @_;
588 624
… …
590} 626}
591 627
592sub DESTROY { 628sub DESTROY {
593 my ($self) = @_; 629 my ($self) = @_;
594 630
631 return if CFClient::in_destruct;
632
595 delete $WIDGET{$self+0}; 633 delete $WIDGET{$self+0};
596 #$self->deactivate; 634
635 eval { $self->destroy };
636 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
597} 637}
598 638
599############################################################################# 639#############################################################################
600 640
601package CFClient::UI::DrawBG; 641package CFClient::UI::DrawBG;
… …
626 666
627 if ($color && (@$color < 4 || $color->[3])) { 667 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 668 my ($w, $h) = @$self{qw(w h)};
629 669
630 glEnable GL_BLEND; 670 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 671 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 672 glColor_premultiply @$color;
633 673
634 glBegin GL_QUADS; 674 glBegin GL_QUADS;
635 glVertex 0 , 0; 675 glVertex 0 , 0;
636 glVertex 0 , $h; 676 glVertex 0 , $h;
637 glVertex $w, $h; 677 glVertex $w, $h;
… …
766} 806}
767 807
768sub add { 808sub add {
769 my ($self, $child) = @_; 809 my ($self, $child) = @_;
770 810
771 $self->{children} = []; 811 $self->SUPER::remove ($_) for @{ $self->{children} };
772
773 $self->SUPER::add ($child); 812 $self->SUPER::add ($child);
774} 813}
775 814
776sub remove { 815sub remove {
777 my ($self, $widget) = @_; 816 my ($self, $widget) = @_;
… …
786 825
787sub size_request { 826sub size_request {
788 $_[0]{children}[0]->size_request 827 $_[0]{children}[0]->size_request
789} 828}
790 829
791sub size_allocate { 830sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 831 my ($self, $w, $h) = @_;
793 832
794 $self->{children}[0]->configure (0, 0, $w, $h); 833 $self->{children}[0]->configure (0, 0, $w, $h);
834
835 1
795} 836}
796 837
797############################################################################# 838#############################################################################
839
840# back-buffered drawing area
798 841
799package CFClient::UI::Window; 842package CFClient::UI::Window;
800 843
801our @ISA = CFClient::UI::Bin::; 844our @ISA = CFClient::UI::Bin::;
802 845
… …
813 856
814 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 857 $ROOT->on_post_alloc ($self => sub { $self->render_child });
815 $self->SUPER::update; 858 $self->SUPER::update;
816} 859}
817 860
818sub size_allocate { 861sub invoke_size_allocate {
819 my ($self, $w, $h) = @_; 862 my ($self, $w, $h) = @_;
820 863
821 $self->SUPER::size_allocate ($w, $h);
822 $self->update; 864 $self->update;
865
866 $self->SUPER::invoke_size_allocate ($w, $h)
823} 867}
824 868
825sub _render { 869sub _render {
826 my ($self) = @_; 870 my ($self) = @_;
827 871
… …
854 my $tex = $self->{texture} 898 my $tex = $self->{texture}
855 or return; 899 or return;
856 900
857 glEnable GL_TEXTURE_2D; 901 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 902 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 903 glColor 0, 0, 0, 1;
860 904
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 905 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862 906
863 glDisable GL_TEXTURE_2D; 907 glDisable GL_TEXTURE_2D;
864} 908}
… …
888 $h = 10 if $self->{scroll_y}; 932 $h = 10 if $self->{scroll_y};
889 933
890 ($w, $h) 934 ($w, $h)
891} 935}
892 936
893sub size_allocate { 937sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 938 my ($self, $w, $h) = @_;
895 939
896 my $child = $self->child; 940 my $child = $self->child;
897 941
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 942 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 943 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900 944
901 $self->child->configure (0, 0, $w, $h); 945 $self->child->configure (0, 0, $w, $h);
902 $self->update; 946 $self->update;
947
948 1
903} 949}
904 950
905sub set_offset { 951sub set_offset {
906 my ($self, $x, $y) = @_; 952 my ($self, $x, $y) = @_;
907 953
… …
955package CFClient::UI::ScrolledWindow; 1001package CFClient::UI::ScrolledWindow;
956 1002
957our @ISA = CFClient::UI::HBox::; 1003our @ISA = CFClient::UI::HBox::;
958 1004
959sub new { 1005sub new {
960 my $class = shift; 1006 my ($class, %arg) = @_;
1007
1008 my $child = delete $arg{child};
961 1009
962 my $self; 1010 my $self;
963 1011
964 my $slider = new CFClient::UI::Slider 1012 my $slider = new CFClient::UI::Slider
965 vertical => 1, 1013 vertical => 1,
… …
968 $self->{vp}->set_offset (0, $_[1]); 1016 $self->{vp}->set_offset (0, $_[1]);
969 }, 1017 },
970 ; 1018 ;
971 1019
972 $self = $class->SUPER::new ( 1020 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1), 1021 vp => (new CFClient::UI::ViewPort expand => 1),
1022 can_events => 1,
974 slider => $slider, 1023 slider => $slider,
975 @_, 1024 %arg,
976 ); 1025 );
977 1026
978 $self->{vp}->add ($self->{scrolled});
979 $self->add ($self->{vp});
980 $self->add ($self->{slider}); 1027 $self->SUPER::add ($self->{vp}, $self->{slider});
1028 $self->add ($child) if $child;
981 1029
982 $self 1030 $self
983} 1031}
984 1032
1033#TODO# update range on size_allocate depending on child
1034
1035sub add {
1036 my ($self, $widget) = @_;
1037
1038 $self->{vp}->add ($self->{child} = $widget);
1039}
1040
1041sub invoke_mouse_wheel {
1042 my ($self, $ev) = @_;
1043
1044 return 0 unless $ev->{dy}; # only vertical movements
1045
1046 $self->{slider}->emit (mouse_wheel => $ev);
1047
1048 1
1049}
1050
1051sub update_slider {
1052 my ($self) = @_;
1053
1054 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1055}
1056
985sub update { 1057sub update {
986 my ($self) = @_; 1058 my ($self) = @_;
987 1059
988 $self->SUPER::update; 1060 $self->SUPER::update;
989 1061
990 # todo: overwrite size_allocate of child 1062 $self->update_slider;
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993} 1063}
994 1064
995sub size_allocate { 1065sub invoke_size_allocate {
996 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h) = @_;
997 1067
1068 $self->update_slider;
1069
998 $self->SUPER::size_allocate ($w, $h); 1070 $self->SUPER::invoke_size_allocate ($w, $h)
999
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002} 1071}
1003
1004#TODO# update range on size_allocate depending on child
1005# update viewport offset on scroll
1006 1072
1007############################################################################# 1073#############################################################################
1008 1074
1009package CFClient::UI::Frame; 1075package CFClient::UI::Frame;
1010 1076
… …
1026 1092
1027 if ($self->{bg}) { 1093 if ($self->{bg}) {
1028 my ($w, $h) = @$self{qw(w h)}; 1094 my ($w, $h) = @$self{qw(w h)};
1029 1095
1030 glEnable GL_BLEND; 1096 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1097 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1032 glColor @{ $self->{bg} }; 1098 glColor_premultiply @{ $self->{bg} };
1033 1099
1034 glBegin GL_QUADS; 1100 glBegin GL_QUADS;
1035 glVertex 0 , 0; 1101 glVertex 0 , 0;
1036 glVertex 0 , $h; 1102 glVertex 0 , $h;
1037 glVertex $w, $h; 1103 glVertex $w, $h;
… …
1061 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1127 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1062 1128
1063sub new { 1129sub new {
1064 my ($class, %arg) = @_; 1130 my ($class, %arg) = @_;
1065 1131
1066 my $title = delete $arg{title};
1067
1068 my $self = $class->SUPER::new ( 1132 my $self = $class->SUPER::new (
1069 bg => [1, 1, 1, 1], 1133 bg => [1, 1, 1, 1],
1070 border_bg => [1, 1, 1, 1], 1134 border_bg => [1, 1, 1, 1],
1071 border => 0.6, 1135 border => 0.6,
1072 can_events => 1, 1136 can_events => 1,
1073 min_w => 16, 1137 min_w => 64,
1074 min_h => 16, 1138 min_h => 32,
1075 %arg, 1139 %arg,
1076 ); 1140 );
1077 1141
1078 $self->{title} = new CFClient::UI::Label 1142 $self->{title_widget} = new CFClient::UI::Label
1079 align => 0, 1143 align => 0,
1080 valign => 1, 1144 valign => 1,
1081 text => $title, 1145 text => $self->{title},
1082 fontsize => $self->{border} 1146 fontsize => $self->{border},
1083 if defined $title; 1147 if exists $self->{title};
1148
1149 if ($self->{has_close_button}) {
1150 $self->{close_button} =
1151 new CFClient::UI::ImageButton
1152 path => 'x1_close.png',
1153 on_activate => sub { $self->emit ("delete") };
1154
1155 $self->CFClient::UI::Container::add ($self->{close_button});
1156 }
1084 1157
1085 $self 1158 $self
1086} 1159}
1087 1160
1088sub add { 1161sub add {
1089 my ($self, @widgets) = @_; 1162 my ($self, @widgets) = @_;
1090 1163
1091 $self->SUPER::add (@widgets); 1164 $self->SUPER::add (@widgets);
1165 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1166 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1093} 1167}
1094 1168
1095sub border { 1169sub border {
1096 int $_[0]{border} * $::FONTSIZE 1170 int $_[0]{border} * $::FONTSIZE
1097} 1171}
1098 1172
1099sub size_request { 1173sub size_request {
1100 my ($self) = @_; 1174 my ($self) = @_;
1101 1175
1102 $self->{title}->size_request 1176 $self->{title_widget}->size_request
1103 if $self->{title}; 1177 if $self->{title_widget};
1178
1179 $self->{close_button}->size_request
1180 if $self->{close_button};
1104 1181
1105 my ($w, $h) = $self->SUPER::size_request; 1182 my ($w, $h) = $self->SUPER::size_request;
1106 1183
1107 ( 1184 (
1108 $w + $self->border * 2, 1185 $w + $self->border * 2,
1109 $h + $self->border * 2, 1186 $h + $self->border * 2,
1110 ) 1187 )
1111} 1188}
1112 1189
1113sub size_allocate { 1190sub invoke_size_allocate {
1114 my ($self, $w, $h) = @_; 1191 my ($self, $w, $h) = @_;
1115 1192
1116 if ($self->{title}) { 1193 if ($self->{title_widget}) {
1117 $self->{title}{w} = $w; 1194 $self->{title_widget}{w} = $w;
1118 $self->{title}{h} = $h; 1195 $self->{title_widget}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h); 1196 $self->{title_widget}->invoke_size_allocate ($w, $h);
1120 } 1197 }
1121 1198
1122 my $border = $self->border; 1199 my $border = $self->border;
1123 1200
1124 $h -= List::Util::max 0, $border * 2; 1201 $h -= List::Util::max 0, $border * 2;
1125 $w -= List::Util::max 0, $border * 2; 1202 $w -= List::Util::max 0, $border * 2;
1203
1204 $self->child->configure ($border, $border, $w, $h);
1205
1206 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1207 if $self->{close_button};
1208
1209 1
1210}
1211
1212sub invoke_delete {
1213 my ($self) = @_;
1214
1215 $self->hide;
1126 1216
1127 $self->child->configure ($border, $border, $w, $h); 1217 1
1128} 1218}
1129 1219
1130sub button_down { 1220sub invoke_button_down {
1131 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
1132 1222
1133 my ($w, $h) = @$self{qw(w h)}; 1223 my ($w, $h) = @$self{qw(w h)};
1134 my $border = $self->border; 1224 my $border = $self->border;
1135 1225
… …
1151 my $dy = $ev->{y} - $oy; 1241 my $dy = $ev->{y} - $oy;
1152 1242
1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1243 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1244 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155 1245
1246 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1156 $self->realloc; 1247 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1158 }; 1248 };
1159 1249
1160 } elsif ($lr ^ $td) { 1250 } elsif ($lr ^ $td) {
1161 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1251 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1162 my ($bx, $by) = ($self->{x}, $self->{y}); 1252 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1165 my ($ev, $x, $y) = @_; 1255 my ($ev, $x, $y) = @_;
1166 1256
1167 ($x, $y) = ($ev->{x}, $ev->{y}); 1257 ($x, $y) = ($ev->{x}, $ev->{y});
1168 1258
1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1259 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1260 # HACK: the next line is required to enforce placement
1261 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1170 }; 1262 };
1171 } else { 1263 } else {
1172 return 0; 1264 return 0;
1173 } 1265 }
1174 1266
1175 1 1267 1
1176} 1268}
1177 1269
1178sub button_up { 1270sub invoke_button_up {
1179 my ($self, $ev, $x, $y) = @_; 1271 my ($self, $ev, $x, $y) = @_;
1180 1272
1181 !!delete $self->{motion} 1273 ! ! delete $self->{motion}
1182} 1274}
1183 1275
1184sub mouse_motion { 1276sub invoke_mouse_motion {
1185 my ($self, $ev, $x, $y) = @_; 1277 my ($self, $ev, $x, $y) = @_;
1186 1278
1187 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1279 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188 1280
1189 !!$self->{motion} 1281 ! ! $self->{motion}
1190} 1282}
1191 1283
1192sub _draw { 1284sub _draw {
1193 my ($self) = @_; 1285 my ($self) = @_;
1194 1286
… …
1220 1312
1221 glDisable GL_TEXTURE_2D; 1313 glDisable GL_TEXTURE_2D;
1222 1314
1223 $child->draw; 1315 $child->draw;
1224 1316
1225 if ($self->{title}) { 1317 if ($self->{title_widget}) {
1226 glTranslate 0, $border - $self->{h}; 1318 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw; 1319 $self->{title_widget}->_draw;
1320
1321 glTranslate 0, - ($border - $self->{h});
1228 } 1322 }
1323
1324 $self->{close_button}->draw
1325 if $self->{close_button};
1229} 1326}
1230 1327
1231############################################################################# 1328#############################################################################
1232 1329
1233package CFClient::UI::Table; 1330package CFClient::UI::Table;
… …
1256 1353
1257 $child->set_parent ($self); 1354 $child->set_parent ($self);
1258 $self->{children}[$y][$x] = $child; 1355 $self->{children}[$y][$x] = $child;
1259 1356
1260 $self->realloc; 1357 $self->realloc;
1358}
1359
1360sub remove {
1361 my ($self, $child) = @_;
1362
1363 # TODO: not yet implemented
1261} 1364}
1262 1365
1263# TODO: move to container class maybe? send children a signal on removal? 1366# TODO: move to container class maybe? send children a signal on removal?
1264sub clear { 1367sub clear {
1265 my ($self) = @_; 1368 my ($self) = @_;
… …
1306 (sum @$ws), 1409 (sum @$ws),
1307 (sum @$hs), 1410 (sum @$hs),
1308 ) 1411 )
1309} 1412}
1310 1413
1311sub size_allocate { 1414sub invoke_size_allocate {
1312 my ($self, $w, $h) = @_; 1415 my ($self, $w, $h) = @_;
1313 1416
1314 my ($ws, $hs) = $self->get_wh; 1417 my ($ws, $hs) = $self->get_wh;
1315 1418
1316 my $req_w = (sum @$ws) || 1; 1419 my $req_w = (sum @$ws) || 1;
… …
1348 } 1451 }
1349 1452
1350 $y += $row_h; 1453 $y += $row_h;
1351 } 1454 }
1352 1455
1456 1
1353} 1457}
1354 1458
1355sub find_widget { 1459sub find_widget {
1356 my ($self, $x, $y) = @_; 1460 my ($self, $x, $y) = @_;
1357 1461
… …
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1498 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1499 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1396 ) 1500 )
1397} 1501}
1398 1502
1399sub size_allocate { 1503sub invoke_size_allocate {
1400 my ($self, $w, $h) = @_; 1504 my ($self, $w, $h) = @_;
1401 1505
1402 my $space = $self->{vertical} ? $h : $w; 1506 my $space = $self->{vertical} ? $h : $w;
1403 my $children = $self->{children}; 1507 my @children = $self->visible_children;
1404 1508
1405 my @req; 1509 my @req;
1406 1510
1407 if ($self->{homogeneous}) { 1511 if ($self->{homogeneous}) {
1408 @req = ($space / (@$children || 1)) x @$children; 1512 @req = ($space / (@children || 1)) x @children;
1409 } else { 1513 } else {
1410 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1514 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1411 my $req = List::Util::sum @req; 1515 my $req = List::Util::sum @req;
1412 1516
1413 if ($req > $space) { 1517 if ($req > $space) {
1414 # ah well, not enough space 1518 # ah well, not enough space
1415 $_ *= $space / $req for @req; 1519 $_ *= $space / $req for @req;
1416 } else { 1520 } else {
1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1521 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1418 1522
1419 $space = ($space - $req) / $expand; # remaining space to give away 1523 $space = ($space - $req) / $expand; # remaining space to give away
1420 1524
1421 $req[$_] += $space * $children->[$_]{expand} 1525 $req[$_] += $space * $children[$_]{expand}
1422 for 0 .. $#$children; 1526 for 0 .. $#children;
1423 } 1527 }
1424 } 1528 }
1425 1529
1426 CFClient::UI::harmonize \@req; 1530 CFClient::UI::harmonize \@req;
1427 1531
1428 my $pos = 0; 1532 my $pos = 0;
1429 for (0 .. $#$children) { 1533 for (0 .. $#children) {
1430 my $alloc = $req[$_]; 1534 my $alloc = $req[$_];
1431 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1535 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1432 1536
1433 $pos += $alloc; 1537 $pos += $alloc;
1434 } 1538 }
1435 1539
1436 1 1540 1
… …
1526 1630
1527 delete $self->{texture}; 1631 delete $self->{texture};
1528 $self->SUPER::update; 1632 $self->SUPER::update;
1529} 1633}
1530 1634
1635sub realloc {
1636 my ($self) = @_;
1637
1638 delete $self->{ox};
1639 $self->SUPER::realloc;
1640}
1641
1531sub set_text { 1642sub set_text {
1532 my ($self, $text) = @_; 1643 my ($self, $text) = @_;
1533 1644
1534 return if $self->{text} eq "T$text"; 1645 return if $self->{text} eq "T$text";
1535 $self->{text} = "T$text"; 1646 $self->{text} = "T$text";
1536 1647
1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1538 $self->{layout}->set_text ($text); 1648 $self->{layout}->set_text ($text);
1539 1649
1650 delete $self->{size_req};
1540 $self->realloc; 1651 $self->realloc;
1541 $self->update; 1652 $self->update;
1542} 1653}
1543 1654
1544sub set_markup { 1655sub set_markup {
… …
1547 return if $self->{text} eq "M$markup"; 1658 return if $self->{text} eq "M$markup";
1548 $self->{text} = "M$markup"; 1659 $self->{text} = "M$markup";
1549 1660
1550 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1661 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1551 1662
1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1553 $self->{layout}->set_markup ($markup); 1663 $self->{layout}->set_markup ($markup);
1554 1664
1665 delete $self->{size_req};
1555 $self->realloc; 1666 $self->realloc;
1556 $self->update; 1667 $self->update;
1557} 1668}
1558 1669
1559sub size_request { 1670sub size_request {
1560 my ($self) = @_; 1671 my ($self) = @_;
1561 1672
1673 $self->{size_req} ||= do {
1562 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1674 $self->{layout}->set_font ($self->{font}) if $self->{font};
1563 $self->{layout}->set_width ($self->{max_w} || -1); 1675 $self->{layout}->set_width ($self->{max_w} || -1);
1564 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1676 $self->{layout}->set_ellipsise ($self->{ellipsise});
1565 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1677 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1678 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1567 1679
1568 my ($w, $h) = $self->{layout}->size; 1680 my ($w, $h) = $self->{layout}->size;
1569 1681
1570 if (exists $self->{template}) { 1682 if (exists $self->{template}) {
1571 $self->{template}->set_font ($self->{font}) if $self->{font}; 1683 $self->{template}->set_font ($self->{font}) if $self->{font};
1684 $self->{template}->set_width ($self->{max_w} || -1);
1572 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1685 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1686
1574 my ($w2, $h2) = $self->{template}->size; 1687 my ($w2, $h2) = $self->{template}->size;
1575 1688
1576 $w = List::Util::max $w, $w2; 1689 $w = List::Util::max $w, $w2;
1577 $h = List::Util::max $h, $h2; 1690 $h = List::Util::max $h, $h2;
1691 }
1692
1693 [$w, $h]
1578 } 1694 };
1579 1695
1580 ($w, $h) 1696 @{ $self->{size_req} }
1581} 1697}
1582 1698
1699sub baseline_shift {
1700 $_[0]{layout}->descent
1701}
1702
1583sub size_allocate { 1703sub invoke_size_allocate {
1584 my ($self, $w, $h) = @_; 1704 my ($self, $w, $h) = @_;
1585 1705
1586 delete $self->{ox}; 1706 delete $self->{ox};
1587 1707
1588 delete $self->{texture} 1708 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1709 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1710
1711 1
1590} 1712}
1591 1713
1592sub set_fontsize { 1714sub set_fontsize {
1593 my ($self, $fontsize) = @_; 1715 my ($self, $fontsize) = @_;
1594 1716
1595 $self->{fontsize} = $fontsize; 1717 $self->{fontsize} = $fontsize;
1718 delete $self->{size_req};
1596 delete $self->{texture}; 1719 delete $self->{texture};
1597 1720
1598 $self->realloc; 1721 $self->realloc;
1599} 1722}
1600 1723
1724sub reconfigure {
1725 my ($self) = @_;
1726
1727 delete $self->{size_req};
1728 delete $self->{texture};
1729
1730 $self->SUPER::reconfigure;
1731}
1732
1601sub _draw { 1733sub _draw {
1602 my ($self) = @_; 1734 my ($self) = @_;
1603 1735
1604 $self->SUPER::_draw; # draw background, if applicable 1736 $self->SUPER::_draw; # draw background, if applicable
1605 1737
1606 my $tex = $self->{texture} ||= do { 1738 my $size = $self->{texture} ||= do {
1607 $self->{layout}->set_foreground (@{$self->{fg}}); 1739 $self->{layout}->set_foreground (@{$self->{fg}});
1608 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1740 $self->{layout}->set_font ($self->{font}) if $self->{font};
1609 $self->{layout}->set_width ($self->{w}); 1741 $self->{layout}->set_width ($self->{w});
1610 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1742 $self->{layout}->set_ellipsise ($self->{ellipsise});
1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1743 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1744 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1613 1745
1614 new_from_layout CFClient::Texture $self->{layout} 1746 [$self->{layout}->size]
1615 }; 1747 };
1616 1748
1617 unless (exists $self->{ox}) { 1749 unless (exists $self->{ox}) {
1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1750 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1751 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1620 : ($self->{w} - $tex->{w}) * 0.5); 1752 : ($self->{w} - $size->[0]) * 0.5);
1621 1753
1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1754 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1755 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1624 : ($self->{h} - $tex->{h}) * 0.5); 1756 : ($self->{h} - $size->[1]) * 0.5);
1625 }; 1757 };
1626 1758
1627 glEnable GL_TEXTURE_2D; 1759 my $w = List::Util::min $self->{w} + 4, $size->[0];
1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1760 my $h = List::Util::min $self->{h} + 2, $size->[1];
1629 1761
1630 if ($tex->{format} == GL_ALPHA) { 1762 $self->{layout}->render ($self->{ox}, $self->{oy});
1631 glColor @{$self->{fg}};
1632 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1633 } else {
1634 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1635 }
1636
1637 glDisable GL_TEXTURE_2D;
1638} 1763}
1639 1764
1640############################################################################# 1765#############################################################################
1641 1766
1642package CFClient::UI::EntryBase; 1767package CFClient::UI::EntryBase;
… …
1656 can_hover => 1, 1781 can_hover => 1,
1657 can_focus => 1, 1782 can_focus => 1,
1658 valign => 0, 1783 valign => 0,
1659 can_events => 1, 1784 can_events => 1,
1660 #text => ... 1785 #text => ...
1786 #hidden => "*",
1661 @_ 1787 @_
1662 ) 1788 )
1663} 1789}
1664 1790
1665sub _set_text { 1791sub _set_text {
… …
1667 1793
1668 delete $self->{cur_h}; 1794 delete $self->{cur_h};
1669 1795
1670 return if $self->{text} eq $text; 1796 return if $self->{text} eq $text;
1671 1797
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 1798 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 1799 $self->{text} = $text;
1676 1800
1677 $text =~ s/./*/g if $self->{hidden}; 1801 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 1802 $self->{layout}->set_text ("$text ");
1803 delete $self->{size_req};
1679 1804
1680 $self->_emit (changed => $self->{text}); 1805 $self->emit (changed => $self->{text});
1806
1807 $self->realloc;
1808 $self->update;
1681} 1809}
1682 1810
1683sub set_text { 1811sub set_text {
1684 my ($self, $text) = @_; 1812 my ($self, $text) = @_;
1685 1813
1686 $self->{cursor} = length $text; 1814 $self->{cursor} = length $text;
1687 $self->_set_text ($text); 1815 $self->_set_text ($text);
1688
1689 $self->realloc;
1690} 1816}
1691 1817
1692sub get_text { 1818sub get_text {
1693 $_[0]{text} 1819 $_[0]{text}
1694} 1820}
… …
1699 my ($w, $h) = $self->SUPER::size_request; 1825 my ($w, $h) = $self->SUPER::size_request;
1700 1826
1701 ($w + 1, $h) # add 1 for cursor 1827 ($w + 1, $h) # add 1 for cursor
1702} 1828}
1703 1829
1704sub key_down { 1830sub invoke_key_down {
1705 my ($self, $ev) = @_; 1831 my ($self, $ev) = @_;
1706 1832
1707 my $mod = $ev->{mod}; 1833 my $mod = $ev->{mod};
1708 my $sym = $ev->{sym}; 1834 my $sym = $ev->{sym};
1709 my $uni = $ev->{unicode}; 1835 my $uni = $ev->{unicode};
… …
1721 } elsif ($sym == CFClient::SDLK_HOME) { 1847 } elsif ($sym == CFClient::SDLK_HOME) {
1722 $self->{cursor} = 0; 1848 $self->{cursor} = 0;
1723 } elsif ($sym == CFClient::SDLK_END) { 1849 } elsif ($sym == CFClient::SDLK_END) {
1724 $self->{cursor} = length $text; 1850 $self->{cursor} = length $text;
1725 } elsif ($uni == 27) { 1851 } elsif ($uni == 27) {
1726 $self->_emit ('escape'); 1852 $self->emit ('escape');
1727 } elsif ($uni) { 1853 } elsif ($uni) {
1728 substr $text, $self->{cursor}++, 0, chr $uni; 1854 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else { 1855 } else {
1730 return 0; 1856 return 0;
1731 } 1857 }
… …
1735 $self->realloc; 1861 $self->realloc;
1736 1862
1737 1 1863 1
1738} 1864}
1739 1865
1740sub focus_in { 1866sub invoke_focus_in {
1741 my ($self) = @_; 1867 my ($self) = @_;
1742 1868
1743 $self->{last_activity} = $::NOW; 1869 $self->{last_activity} = $::NOW;
1744 1870
1745 $self->SUPER::focus_in; 1871 $self->SUPER::invoke_focus_in
1746} 1872}
1747 1873
1748sub button_down { 1874sub invoke_button_down {
1749 my ($self, $ev, $x, $y) = @_; 1875 my ($self, $ev, $x, $y) = @_;
1750 1876
1751 $self->SUPER::button_down ($ev, $x, $y); 1877 $self->SUPER::invoke_button_down ($ev, $x, $y);
1752 1878
1753 my $idx = $self->{layout}->xy_to_index ($x, $y); 1879 my $idx = $self->{layout}->xy_to_index ($x, $y);
1754 1880
1755 # byte-index to char-index 1881 # byte-index to char-index
1756 my $text = $self->{text}; 1882 my $text = $self->{text};
1757 utf8::encode $text; 1883 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1758 $self->{cursor} = length substr $text, 0, $idx; 1884 $self->{cursor} = length $text;
1759 1885
1760 $self->_set_text ($self->{text}); 1886 $self->_set_text ($self->{text});
1761 $self->update; 1887 $self->update;
1762 1888
1763 1 1889 1
1764} 1890}
1765 1891
1766sub mouse_motion { 1892sub invoke_mouse_motion {
1767 my ($self, $ev, $x, $y) = @_; 1893 my ($self, $ev, $x, $y) = @_;
1768# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1894# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769 1895
1770 0 1896 1
1771} 1897}
1772 1898
1773sub _draw { 1899sub _draw {
1774 my ($self) = @_; 1900 my ($self) = @_;
1775 1901
1776 local $self->{fg} = $self->{fg}; 1902 local $self->{fg} = $self->{fg};
1777 1903
1778 if ($FOCUS == $self) { 1904 if ($FOCUS == $self) {
1779 glColor @{$self->{active_bg}}; 1905 glColor_premultiply @{$self->{active_bg}};
1780 $self->{fg} = $self->{active_fg}; 1906 $self->{fg} = $self->{active_fg};
1781 } else { 1907 } else {
1782 glColor @{$self->{bg}}; 1908 glColor_premultiply @{$self->{bg}};
1783 } 1909 }
1784 1910
1785 glEnable GL_BLEND; 1911 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1912 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787 glBegin GL_QUADS; 1913 glBegin GL_QUADS;
1788 glVertex 0 , 0; 1914 glVertex 0 , 0;
1789 glVertex 0 , $self->{h}; 1915 glVertex 0 , $self->{h};
1790 glVertex $self->{w}, $self->{h}; 1916 glVertex $self->{w}, $self->{h};
1791 glVertex $self->{w}, 0; 1917 glVertex $self->{w}, 0;
… …
1816 1942
1817our @ISA = CFClient::UI::EntryBase::; 1943our @ISA = CFClient::UI::EntryBase::;
1818 1944
1819use CFClient::OpenGL; 1945use CFClient::OpenGL;
1820 1946
1821sub key_down { 1947sub invoke_key_down {
1822 my ($self, $ev) = @_; 1948 my ($self, $ev) = @_;
1823 1949
1824 my $sym = $ev->{sym}; 1950 my $sym = $ev->{sym};
1825 1951
1826 if ($sym == 13) { 1952 if ($sym == 13) {
1827 unshift @{$self->{history}}, 1953 unshift @{$self->{history}},
1828 my $txt = $self->get_text; 1954 my $txt = $self->get_text;
1955
1829 $self->{history_pointer} = -1; 1956 $self->{history_pointer} = -1;
1830 $self->{history_saveback} = ''; 1957 $self->{history_saveback} = '';
1831 $self->_emit (activate => $txt); 1958 $self->emit (activate => $txt);
1832 $self->update; 1959 $self->update;
1833 1960
1834 } elsif ($sym == CFClient::SDLK_UP) { 1961 } elsif ($sym == CFClient::SDLK_UP) {
1835 if ($self->{history_pointer} < 0) { 1962 if ($self->{history_pointer} < 0) {
1836 $self->{history_saveback} = $self->get_text; 1963 $self->{history_saveback} = $self->get_text;
… …
1852 } else { 1979 } else {
1853 $self->set_text ($self->{history_saveback}); 1980 $self->set_text ($self->{history_saveback});
1854 } 1981 }
1855 1982
1856 } else { 1983 } else {
1857 return $self->SUPER::key_down ($ev) 1984 return $self->SUPER::invoke_key_down ($ev)
1858 } 1985 }
1859 1986
1860 1 1987 1
1861} 1988}
1862 1989
… …
1886 can_events => 1, 2013 can_events => 1,
1887 @_ 2014 @_
1888 ) 2015 )
1889} 2016}
1890 2017
1891sub activate { }
1892
1893sub button_up { 2018sub invoke_button_up {
1894 my ($self, $ev, $x, $y) = @_; 2019 my ($self, $ev, $x, $y) = @_;
1895 2020
1896 $self->emit ("activate") 2021 $self->emit ("activate")
1897 if $x >= 0 && $x < $self->{w} 2022 if $x >= 0 && $x < $self->{w}
1898 && $y >= 0 && $y < $self->{h}; 2023 && $y >= 0 && $y < $self->{h};
… …
1901} 2026}
1902 2027
1903sub _draw { 2028sub _draw {
1904 my ($self) = @_; 2029 my ($self) = @_;
1905 2030
1906 local $self->{fg} = $self->{fg}; 2031 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1907
1908 if ($GRAB == $self) {
1909 $self->{fg} = $self->{active_fg};
1910 }
1911 2032
1912 glEnable GL_TEXTURE_2D; 2033 glEnable GL_TEXTURE_2D;
1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2034 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914 glColor 0, 0, 0, 1; 2035 glColor 0, 0, 0, 1;
1915 2036
1916 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2037 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1917 2038
1918 glDisable GL_TEXTURE_2D; 2039 glDisable GL_TEXTURE_2D;
1919 2040
1920 $self->SUPER::_draw; 2041 $self->SUPER::_draw;
2042}
2043
2044#############################################################################
2045
2046package CFClient::UI::ImageButton;
2047
2048our @ISA = CFClient::UI::Image::;
2049
2050use CFClient::OpenGL;
2051
2052my %textures;
2053
2054sub new {
2055 my $class = shift;
2056
2057 my $self = $class->SUPER::new (
2058 padding_x => 4,
2059 padding_y => 4,
2060 fg => [1, 1, 1],
2061 active_fg => [0, 0, 1],
2062 can_hover => 1,
2063 align => 0,
2064 valign => 0,
2065 can_events => 1,
2066 @_
2067 );
2068}
2069
2070sub invoke_button_up {
2071 my ($self, $ev, $x, $y) = @_;
2072
2073 $self->emit ("activate")
2074 if $x >= 0 && $x < $self->{w}
2075 && $y >= 0 && $y < $self->{h};
2076
2077 1
1921} 2078}
1922 2079
1923############################################################################# 2080#############################################################################
1924 2081
1925package CFClient::UI::CheckBox; 2082package CFClient::UI::CheckBox;
… …
1952 my ($self) = @_; 2109 my ($self) = @_;
1953 2110
1954 (6) x 2 2111 (6) x 2
1955} 2112}
1956 2113
2114sub toggle {
2115 my ($self) = @_;
2116
2117 $self->{state} = !$self->{state};
2118 $self->emit (changed => $self->{state});
2119 $self->update;
2120}
2121
1957sub button_down { 2122sub invoke_button_down {
1958 my ($self, $ev, $x, $y) = @_; 2123 my ($self, $ev, $x, $y) = @_;
1959 2124
1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2125 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2126 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1962 $self->{state} = !$self->{state}; 2127 $self->toggle;
1963 $self->_emit (changed => $self->{state});
1964 } else { 2128 } else {
1965 return 0 2129 return 0
1966 } 2130 }
1967 2131
1968 1 2132 1
… …
1993package CFClient::UI::Image; 2157package CFClient::UI::Image;
1994 2158
1995our @ISA = CFClient::UI::Base::; 2159our @ISA = CFClient::UI::Base::;
1996 2160
1997use CFClient::OpenGL; 2161use CFClient::OpenGL;
1998use Carp qw/confess/;
1999 2162
2000our %loaded_images; 2163our %texture_cache;
2001 2164
2002sub new { 2165sub new {
2003 my $class = shift; 2166 my $class = shift;
2004 2167
2005 my $self = $class->SUPER::new (can_events => 0, @_); 2168 my $self = $class->SUPER::new (
2169 can_events => 0,
2170 @_,
2171 );
2006 2172
2007 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2173 $self->{path} || $self->{tex}
2174 or Carp::croak "'path' or 'tex' attributes required";
2008 2175
2009 $loaded_images{$self->{image}} ||= 2176 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2010 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2177 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2011 2178
2012 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2179 Scalar::Util::weaken $texture_cache{$self->{path}};
2013 2180
2014 Scalar::Util::weaken $loaded_images{$self->{image}}; 2181 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2015
2016 $self->{aspect} = $tex->{w} / $tex->{h};
2017 2182
2018 $self 2183 $self
2019} 2184}
2020 2185
2021sub size_request { 2186sub size_request {
2022 my ($self) = @_; 2187 my ($self) = @_;
2023 2188
2024 ($self->{tex}->{w}, $self->{tex}->{h}) 2189 ($self->{tex}{w}, $self->{tex}{h})
2025} 2190}
2026 2191
2027sub _draw { 2192sub _draw {
2028 my ($self) = @_; 2193 my ($self) = @_;
2029 2194
… …
2138 my $ycut1 = max 0, min 1, $ycut; 2303 my $ycut1 = max 0, min 1, $ycut;
2139 my $ycut2 = max 0, min 1, $ycut - 1; 2304 my $ycut2 = max 0, min 1, $ycut - 1;
2140 2305
2141 my $h1 = $self->{h} * (1 - $ycut1); 2306 my $h1 = $self->{h} * (1 - $ycut1);
2142 my $h2 = $self->{h} * (1 - $ycut2); 2307 my $h2 = $self->{h} * (1 - $ycut2);
2308 my $h3 = $self->{h};
2309
2310 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2143 2311
2144 glEnable GL_BLEND; 2312 glEnable GL_BLEND;
2145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2313 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2314 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2146 glEnable GL_TEXTURE_2D; 2315 glEnable GL_TEXTURE_2D;
2147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2316 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2148 2317
2149 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2318 glBindTexture GL_TEXTURE_2D, $t1->{name};
2150 glBegin GL_QUADS; 2319 glBegin GL_QUADS;
… …
2165 2334
2166 if ($t3) { 2335 if ($t3) {
2167 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2336 glBindTexture GL_TEXTURE_2D, $t3->{name};
2168 glBegin GL_QUADS; 2337 glBegin GL_QUADS;
2169 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2338 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2170 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2339 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2171 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2340 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2172 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2341 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2173 glEnd; 2342 glEnd;
2174 } 2343 }
2175 2344
2176 glDisable GL_BLEND; 2345 glDisable GL_BLEND;
… …
2264 $self->update; 2433 $self->update;
2265 2434
2266 $self 2435 $self
2267} 2436}
2268 2437
2269sub changed { }
2270
2271sub set_range { 2438sub set_range {
2272 my ($self, $range) = @_; 2439 my ($self, $range) = @_;
2273 2440
2274 ($range, $self->{range}) = ($self->{range}, $range); 2441 ($range, $self->{range}) = ($self->{range}, $range);
2275 2442
2276 $self->update
2277 if "@$range" ne "@{$self->{range}}"; 2443 if ("@$range" ne "@{$self->{range}}") {
2444 $self->update;
2445 $self->set_value ($self->{range}[0]);
2446 }
2278} 2447}
2279 2448
2280sub set_value { 2449sub set_value {
2281 my ($self, $value) = @_; 2450 my ($self, $value) = @_;
2282 2451
… …
2293 if $unit; 2462 if $unit;
2294 2463
2295 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2464 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2296 2465
2297 if ($value != $old_value) { 2466 if ($value != $old_value) {
2298 $self->_emit (changed => $value); 2467 $self->emit (changed => $value);
2299 $self->update; 2468 $self->update;
2300 } 2469 }
2301} 2470}
2302 2471
2303sub size_request { 2472sub size_request {
2304 my ($self) = @_; 2473 my ($self) = @_;
2305 2474
2306 ($self->{req_w}, $self->{req_h}) 2475 ($self->{req_w}, $self->{req_h})
2307} 2476}
2308 2477
2309sub button_down { 2478sub invoke_button_down {
2310 my ($self, $ev, $x, $y) = @_; 2479 my ($self, $ev, $x, $y) = @_;
2311 2480
2312 $self->SUPER::button_down ($ev, $x, $y); 2481 $self->SUPER::invoke_button_down ($ev, $x, $y);
2313 2482
2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2483 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2315 2484
2316 $self->mouse_motion ($ev, $x, $y) 2485 $self->invoke_mouse_motion ($ev, $x, $y)
2317} 2486}
2318 2487
2319sub mouse_motion { 2488sub invoke_mouse_motion {
2320 my ($self, $ev, $x, $y) = @_; 2489 my ($self, $ev, $x, $y) = @_;
2321 2490
2322 if ($GRAB == $self) { 2491 if ($GRAB == $self) {
2323 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2492 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2324 2493
… …
2332 } 2501 }
2333 2502
2334 1 2503 1
2335} 2504}
2336 2505
2506sub invoke_mouse_wheel {
2507 my ($self, $ev) = @_;
2508
2509 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510
2511 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2512
2513 ! ! $delta
2514}
2515
2337sub update { 2516sub update {
2338 my ($self) = @_; 2517 my ($self) = @_;
2339 2518
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2519 delete $self->{knob_w};
2520 $self->SUPER::update;
2521}
2522
2523sub _draw {
2524 my ($self) = @_;
2525
2526 unless ($self->{knob_w}) {
2341 $self->set_value ($self->{range}[0]); 2527 $self->set_value ($self->{range}[0]);
2342 2528
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2529 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2530 my $range = ($hi - $page - $lo) || 1e-100;
2345 2531
… …
2351 $value = ($value - $lo) / $range; 2537 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2538 $value = $value * $self->{scale} + $self->{offset};
2353 2539
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2540 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2541 $self->{knob_w} = $knob_w;
2356 }); 2542 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2543
2364 $self->SUPER::_draw (); 2544 $self->SUPER::_draw ();
2365 2545
2366 glScale $self->{w}, $self->{h}; 2546 glScale $self->{w}, $self->{h};
2367 2547
… …
2428sub set_range { shift->{slider}->set_range (@_) } 2608sub set_range { shift->{slider}->set_range (@_) }
2429sub set_value { shift->{slider}->set_value (@_) } 2609sub set_value { shift->{slider}->set_value (@_) }
2430 2610
2431############################################################################# 2611#############################################################################
2432 2612
2433package CFClient::UI::TextView; 2613package CFClient::UI::TextScroller;
2434 2614
2435our @ISA = CFClient::UI::HBox::; 2615our @ISA = CFClient::UI::HBox::;
2436 2616
2437use CFClient::OpenGL; 2617use CFClient::OpenGL;
2438 2618
2439sub new { 2619sub new {
2440 my $class = shift; 2620 my $class = shift;
2441 2621
2442 my $self = $class->SUPER::new ( 2622 my $self = $class->SUPER::new (
2443 fontsize => 1, 2623 fontsize => 1,
2444 can_events => 0, 2624 can_events => 1,
2625 indent => 0,
2445 #font => default_font 2626 #font => default_font
2446 @_, 2627 @_,
2447 2628
2448 layout => (new CFClient::Layout 1), 2629 layout => (new CFClient::Layout),
2449 par => [], 2630 par => [],
2450 height => 0, 2631 height => 0,
2451 children => [ 2632 children => [
2452 (new CFClient::UI::Empty expand => 1), 2633 (new CFClient::UI::Empty expand => 1),
2453 (new CFClient::UI::Slider vertical => 1), 2634 (new CFClient::UI::Slider vertical => 1),
… …
2464 2645
2465 $self->{fontsize} = $fontsize; 2646 $self->{fontsize} = $fontsize;
2466 $self->reflow; 2647 $self->reflow;
2467} 2648}
2468 2649
2650sub size_request {
2651 my ($self) = @_;
2652
2653 my ($empty, $slider) = @{ $self->{children} };
2654
2655 local $self->{children} = [$empty, $slider];
2656 $self->SUPER::size_request
2657}
2658
2469sub size_allocate { 2659sub invoke_size_allocate {
2470 my ($self, $w, $h) = @_; 2660 my ($self, $w, $h) = @_;
2471 2661
2472 $self->SUPER::size_allocate ($w, $h); 2662 my ($empty, $slider, @other) = @{ $self->{children} };
2663 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2473 2664
2474 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2665 $self->{layout}->set_font ($self->{font}) if $self->{font};
2475 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2666 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2476 $self->{layout}->set_width ($self->{children}[0]{w}); 2667 $self->{layout}->set_width ($empty->{w});
2668 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2477 2669
2478 $self->reflow; 2670 $self->reflow;
2479}
2480 2671
2481sub text_size { 2672 local $self->{children} = [$empty, $slider];
2673 $self->SUPER::invoke_size_allocate ($w, $h)
2674}
2675
2676sub invoke_mouse_wheel {
2482 my ($self, $text, $indent) = @_; 2677 my ($self, $ev) = @_;
2678
2679 return 0 unless $ev->{dy}; # only vertical movements
2680
2681 $self->{children}[1]->emit (mouse_wheel => $ev);
2682
2683 1
2684}
2685
2686sub get_layout {
2687 my ($self, $para) = @_;
2483 2688
2484 my $layout = $self->{layout}; 2689 my $layout = $self->{layout};
2485 2690
2691 $layout->set_font ($self->{font}) if $self->{font};
2692 $layout->set_foreground (@{$para->{fg}});
2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $layout->set_width ($self->{children}[0]{w} - $indent); 2694 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488 $layout->set_markup ($text); 2696 $layout->set_markup ($para->{markup});
2697
2698 $layout->set_shapes (
2699 map
2700 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2701 @{$para->{widget}}
2489 2702 );
2703
2490 $layout->size 2704 $layout
2491} 2705}
2492 2706
2493sub reflow { 2707sub reflow {
2494 my ($self) = @_; 2708 my ($self) = @_;
2495 2709
… …
2504 $self->{children}[1]->set_value ($offset); 2718 $self->{children}[1]->set_value ($offset);
2505} 2719}
2506 2720
2507sub clear { 2721sub clear {
2508 my ($self) = @_; 2722 my ($self) = @_;
2723
2724 my (undef, undef, @other) = @{ $self->{children} };
2725 $self->remove ($_) for @other;
2509 2726
2510 $self->{par} = []; 2727 $self->{par} = [];
2511 $self->{height} = 0; 2728 $self->{height} = 0;
2512 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2729 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2513} 2730}
2514 2731
2515sub add_paragraph { 2732sub add_paragraph {
2516 my ($self, $color, $text, $indent) = @_; 2733 my ($self, $color, $para, $indent) = @_;
2517 2734
2518 for my $line (split /\n/, $text) { 2735 my ($text, @w) = ref $para ? @$para : $para;
2519 my ($w, $h) = $self->text_size ($line); 2736
2520 $self->{height} += $h; 2737 $para = {
2521 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2738 w => 1e10,
2739 wrapped => 1,
2740 fg => $color,
2741 indent => $indent,
2742 markup => $text,
2743 widget => \@w,
2522 } 2744 };
2523 2745
2524 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2746 $self->add (@w) if @w;
2747 push @{$self->{par}}, $para;
2748
2749 $self->{need_reflow}++;
2750 $self->update;
2751}
2752
2753sub scroll_to_bottom {
2754 my ($self) = @_;
2755
2756 $self->{scroll_to_bottom} = 1;
2757 $self->update;
2525} 2758}
2526 2759
2527sub update { 2760sub update {
2528 my ($self) = @_; 2761 my ($self) = @_;
2529 2762
… …
2531 2764
2532 return unless $self->{h} > 0; 2765 return unless $self->{h} > 0;
2533 2766
2534 delete $self->{texture}; 2767 delete $self->{texture};
2535 2768
2536 $ROOT->on_post_alloc ($self, sub { 2769 $ROOT->on_post_alloc ($self => sub {
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2770 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538 2771
2539 if (delete $self->{need_reflow}) { 2772 if (delete $self->{need_reflow}) {
2540 my $height = 0; 2773 my $height = 0;
2541 2774
2542 my $layout = $self->{layout};
2543
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545
2546 for (@{$self->{par}}) { 2775 for my $para (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2776 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2548 $layout->set_width ($W - $_->[3]); 2777 my $layout = $self->get_layout ($para);
2549 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size; 2778 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3]; 2779
2552 $_->[1] = $h; 2780 $para->{w} = $w + $para->{indent};
2781 $para->{h} = $h;
2782 $para->{wrapped} = $layout->has_wrapped;
2553 } 2783 }
2554 2784
2555 $height += $_->[1]; 2785 $height += $para->{h};
2556 } 2786 }
2557 2787
2558 $self->{height} = $height; 2788 $self->{height} = $height;
2559 2789
2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2790 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2561 2791
2562 delete $self->{texture}; 2792 delete $self->{texture};
2563 } 2793 }
2564 2794
2795 if (delete $self->{scroll_to_bottom}) {
2796 $self->{children}[1]->set_value (1e10);
2797 }
2798
2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2799 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2566 glClearColor 0.5, 0.5, 0.5, 0; 2800 glClearColor 0, 0, 0, 0;
2567 glClear GL_COLOR_BUFFER_BIT; 2801 glClear GL_COLOR_BUFFER_BIT;
2568 2802
2569 my $top = int $self->{children}[1]{range}[0]; 2803 my $top = int $self->{children}[1]{range}[0];
2570 2804
2571 my $y0 = $top; 2805 my $y0 = $top;
2572 my $y1 = $top + $H; 2806 my $y1 = $top + $H;
2573 2807
2574 my $y = 0; 2808 my $y = 0;
2575 2809
2576 my $layout = $self->{layout};
2577
2578 $layout->set_font ($self->{font}) if $self->{font};
2579
2580 glEnable GL_BLEND;
2581 #TODO# not correct in windows where rgba is forced off
2582 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2583
2584 for my $par (@{$self->{par}}) { 2810 for my $para (@{$self->{par}}) {
2585 my $h = $par->[1]; 2811 my $h = $para->{h};
2586 2812
2587 if ($y0 < $y + $h && $y < $y1) { 2813 if ($y0 < $y + $h && $y < $y1) {
2588 $layout->set_foreground (@{ $par->[2] });
2589 $layout->set_width ($W - $par->[3]);
2590 $layout->set_markup ($par->[4]);
2591 2814
2592 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2815 my $layout = $self->get_layout ($para);
2593 2816
2594 glRasterPos $par->[3], $y - $y0; 2817 $layout->render ($para->{indent}, $y - $y0);
2595 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2818
2819 if (my @w = @{ $para->{widget} }) {
2820 my @s = $layout->get_shapes;
2821
2822 for (@w) {
2823 my ($dx, $dy) = splice @s, 0, 2, ();
2824
2825 $_->{x} = $dx + $para->{indent};
2826 $_->{y} = $dy + $y - $y0;
2827
2828 $_->draw;
2829 }
2830 }
2596 } 2831 }
2597 2832
2598 $y += $h; 2833 $y += $h;
2599 } 2834 }
2600
2601 glDisable GL_BLEND;
2602 }; 2835 };
2603 }); 2836 });
2604} 2837}
2605 2838
2839sub reconfigure {
2840 my ($self) = @_;
2841
2842 $self->SUPER::reconfigure;
2843
2844 $_->{w} = 1e10 for @{ $self->{par} };
2845 $self->reflow;
2846}
2847
2606sub _draw { 2848sub _draw {
2607 my ($self) = @_; 2849 my ($self) = @_;
2608 2850
2609 glEnable GL_TEXTURE_2D; 2851 glEnable GL_TEXTURE_2D;
2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2852 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611 glColor 1, 1, 1, 1; 2853 glColor 0, 0, 0, 1;
2612 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2854 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2613 glDisable GL_TEXTURE_2D; 2855 glDisable GL_TEXTURE_2D;
2614 2856
2615 $self->{children}[1]->draw; 2857 $self->{children}[1]->draw;
2616
2617} 2858}
2618 2859
2619############################################################################# 2860#############################################################################
2620 2861
2621package CFClient::UI::Animator; 2862package CFClient::UI::Animator;
… …
2708 $tooltip .= "\n\n" . (ref $widget) . "\n" 2949 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2950 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n" 2951 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}"; 2952 . "visible $widget->{visible}";
2712 } 2953 }
2954
2955 $tooltip =~ s/^\n+//;
2956 $tooltip =~ s/\n+$//;
2713 2957
2714 $self->add (new CFClient::UI::Label 2958 $self->add (new CFClient::UI::Label
2715 markup => $tooltip, 2959 markup => $tooltip,
2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2960 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2717 fontsize => 0.8, 2961 fontsize => 0.8,
… …
2727 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2971 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2728 2972
2729 ($w + 4, $h + 4) 2973 ($w + 4, $h + 4)
2730} 2974}
2731 2975
2732sub size_allocate { 2976sub invoke_size_allocate {
2733 my ($self, $w, $h) = @_; 2977 my ($self, $w, $h) = @_;
2734 2978
2735 $self->SUPER::size_allocate ($w - 4, $h - 4); 2979 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2736} 2980}
2737 2981
2738sub visibility_change { 2982sub invoke_visibility_change {
2739 my ($self, $visible) = @_; 2983 my ($self, $visible) = @_;
2740 2984
2741 return unless $visible; 2985 return unless $visible;
2742 2986
2743 $self->{root}->on_post_alloc ("move_$self" => sub { 2987 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2745 or return; 2989 or return;
2746 2990
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2991 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748 2992
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2993 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH; 2994 if $x + $self->{w} > $self->{root}{w};
2751 2995
2752 $self->move_abs ($x, $y); 2996 $self->move_abs ($x, $y);
2753 }); 2997 });
2754} 2998}
2755 2999
… …
2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3088 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2845 3089
2846 if ($tex) { 3090 if ($tex) {
2847 glEnable GL_TEXTURE_2D; 3091 glEnable GL_TEXTURE_2D;
2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3092 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849 glColor 1, 1, 1, 1; 3093 glColor 0, 0, 0, 1;
2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3094 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851 glDisable GL_TEXTURE_2D; 3095 glDisable GL_TEXTURE_2D;
2852 } 3096 }
2853} 3097}
2854 3098
2855sub DESTROY { 3099sub destroy {
2856 my ($self) = @_; 3100 my ($self) = @_;
2857 3101
2858 $self->{timer}->cancel 3102 $self->{timer}->cancel
2859 if $self->{timer}; 3103 if $self->{timer};
2860 3104
2861 $self->SUPER::DESTROY; 3105 $self->SUPER::destroy;
2862} 3106}
2863 3107
2864############################################################################# 3108#############################################################################
2865 3109
2866package CFClient::UI::Buttonbar; 3110package CFClient::UI::Buttonbar;
… …
2887 ); 3131 );
2888 3132
2889 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3133 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2890 3134
2891 for my $item (@{ $self->{items} }) { 3135 for my $item (@{ $self->{items} }) {
2892 my ($widget, $cb) = @$item; 3136 my ($widget, $cb, $tooltip) = @$item;
2893 3137
2894 # handle various types of items, only text for now 3138 # handle various types of items, only text for now
2895 if (!ref $widget) { 3139 if (!ref $widget) {
3140 if ($widget =~ /\t/) {
3141 my ($left, $right) = split /\t/, $widget, 2;
3142
3143 $widget = new CFClient::UI::HBox
3144 can_hover => 1,
3145 can_events => 1,
3146 tooltip => $tooltip,
3147 children => [
3148 (new CFClient::UI::Label markup => $left, expand => 1),
3149 (new CFClient::UI::Label markup => $right, align => +1),
3150 ],
3151 ;
3152
3153 } else {
2896 $widget = new CFClient::UI::Label 3154 $widget = new CFClient::UI::Label
2897 can_hover => 1, 3155 can_hover => 1,
2898 can_events => 1, 3156 can_events => 1,
2899 text => $widget; 3157 markup => $widget,
3158 tooltip => $tooltip;
3159 }
2900 } 3160 }
2901 3161
2902 $self->{item}{$widget} = $item; 3162 $self->{item}{$widget} = $item;
2903 3163
2904 $self->{vbox}->add ($widget); 3164 $self->{vbox}->add ($widget);
… …
2909 3169
2910# popup given the event (must be a mouse button down event currently) 3170# popup given the event (must be a mouse button down event currently)
2911sub popup { 3171sub popup {
2912 my ($self, $ev) = @_; 3172 my ($self, $ev) = @_;
2913 3173
2914 $self->_emit ("popdown"); 3174 $self->emit ("popdown");
2915 3175
2916 # maybe save $GRAB? must be careful about events... 3176 # maybe save $GRAB? must be careful about events...
2917 $GRAB = $self; 3177 $GRAB = $self;
2918 $self->{button} = $ev->{button}; 3178 $self->{button} = $ev->{button};
2919 3179
2920 $self->show; 3180 $self->show;
2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3181 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2922} 3182}
2923 3183
2924sub mouse_motion { 3184sub invoke_mouse_motion {
2925 my ($self, $ev, $x, $y) = @_; 3185 my ($self, $ev, $x, $y) = @_;
2926 3186
2927 # TODO: should use vbox->find_widget or so 3187 # TODO: should use vbox->find_widget or so
2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3188 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2929 $self->{hover} = $self->{item}{$HOVER}; 3189 $self->{hover} = $self->{item}{$HOVER};
2930 3190
2931 0 3191 0
2932} 3192}
2933 3193
2934sub button_up { 3194sub invoke_button_up {
2935 my ($self, $ev, $x, $y) = @_; 3195 my ($self, $ev, $x, $y) = @_;
2936 3196
2937 if ($ev->{button} == $self->{button}) { 3197 if ($ev->{button} == $self->{button}) {
2938 undef $GRAB; 3198 undef $GRAB;
2939 $self->hide; 3199 $self->hide;
2940 3200
2941 $self->_emit ("popdown"); 3201 $self->emit ("popdown");
2942 $self->{hover}[1]->() if $self->{hover}; 3202 $self->{hover}[1]->() if $self->{hover};
2943 } else { 3203 } else {
2944 return 0 3204 return 0
2945 } 3205 }
2946 3206
… …
2973 3233
2974 $self->{current} = $self->{children}[0] 3234 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} }; 3235 if @{ $self->{children} };
2976} 3236}
2977 3237
3238sub get_current_page {
3239 my ($self) = @_;
3240
3241 $self->{current}
3242}
3243
2978sub set_current_page { 3244sub set_current_page {
2979 my ($self, $page_or_widget) = @_; 3245 my ($self, $page_or_widget) = @_;
2980 3246
2981 my $widget = ref $page_or_widget 3247 my $widget = ref $page_or_widget
2982 ? $page_or_widget 3248 ? $page_or_widget
2983 : $self->{children}[$page_or_widget]; 3249 : $self->{children}[$page_or_widget];
2984 3250
2985 $self->{current} = $widget; 3251 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3252 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987 3253
2988 $self->_emit (page_changed => $self->{current}); 3254 $self->emit (page_changed => $self->{current});
2989 3255
2990 $self->realloc; 3256 $self->realloc;
2991} 3257}
2992 3258
2993sub visible_children { 3259sub visible_children {
… …
2998 my ($self) = @_; 3264 my ($self) = @_;
2999 3265
3000 $self->{current}->size_request 3266 $self->{current}->size_request
3001} 3267}
3002 3268
3003sub size_allocate { 3269sub invoke_size_allocate {
3004 my ($self, $w, $h) = @_; 3270 my ($self, $w, $h) = @_;
3005 3271
3006 $self->{current}->configure (0, 0, $w, $h); 3272 $self->{current}->configure (0, 0, $w, $h);
3273
3274 1
3007} 3275}
3008 3276
3009sub _draw { 3277sub _draw {
3010 my ($self) = @_; 3278 my ($self) = @_;
3011 3279
… …
3022 my $class = shift; 3290 my $class = shift;
3023 3291
3024 my $self = $class->SUPER::new ( 3292 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3293 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3294 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3295 # filter => # will be put between multiplexer and $self
3027 @_, 3296 @_,
3028 ); 3297 );
3029 3298
3299 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3300 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3301
3032 $self 3302 $self
3033} 3303}
3034 3304
3035sub add { 3305sub add {
… …
3044 ); 3314 );
3045 3315
3046 $self->{multiplexer}->add ($widget); 3316 $self->{multiplexer}->add ($widget);
3047} 3317}
3048 3318
3319sub get_current_page {
3320 my ($self) = @_;
3321
3322 $self->{multiplexer}->get_current_page
3323}
3324
3049sub set_current_page { 3325sub set_current_page {
3050 my ($self, $page) = @_; 3326 my ($self, $page) = @_;
3051 3327
3052 $self->{multiplexer}->set_current_page ($page); 3328 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current}); 3329 $self->emit (page_changed => $self->{multiplexer}{current});
3054} 3330}
3055 3331
3056############################################################################# 3332#############################################################################
3057 3333
3058package CFClient::UI::Statusbox; 3334package CFClient::UI::Combobox;
3059 3335
3336use utf8;
3337
3060our @ISA = CFClient::UI::VBox::; 3338our @ISA = CFClient::UI::Button::;
3061 3339
3062sub new { 3340sub new {
3063 my $class = shift; 3341 my $class = shift;
3064 3342
3065 $class->SUPER::new ( 3343 my $self = $class->SUPER::new (
3344 options => [], # [value, title, longdesc], ...
3345 value => undef,
3346 @_,
3347 );
3348
3349 $self->_set_value ($self->{value});
3350
3351 $self
3352}
3353
3354sub invoke_button_down {
3355 my ($self, $ev) = @_;
3356
3357 my @menu_items;
3358
3359 for (@{ $self->{options} }) {
3360 my ($value, $title, $tooltip) = @$_;
3361
3362 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3363 }
3364
3365 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3366}
3367
3368sub _set_value {
3369 my ($self, $value) = @_;
3370
3371 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3372 or return;
3373
3374 $self->{value} = $item->[0];
3375 $self->set_markup ("$item->[1] ⇓");
3376 $self->set_tooltip ($item->[2]);
3377}
3378
3379sub set_value {
3380 my ($self, $value) = @_;
3381
3382 return unless $self->{value} ne $value;
3383
3384 $self->_set_value ($value);
3385 $self->emit (changed => $value);
3386}
3387
3388#############################################################################
3389
3390package CFClient::UI::Statusbox;
3391
3392our @ISA = CFClient::UI::VBox::;
3393
3394sub new {
3395 my $class = shift;
3396
3397 my $self = $class->SUPER::new (
3066 fontsize => 0.8, 3398 fontsize => 0.8,
3067 @_, 3399 @_,
3068 ) 3400 );
3401
3402 Scalar::Util::weaken (my $this = $self);
3403
3404 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3405
3406 $self
3069} 3407}
3070 3408
3071sub reorder { 3409sub reorder {
3072 my ($self) = @_; 3410 my ($self) = @_;
3073 my $NOW = time; 3411 my $NOW = Time::HiRes::time;
3412
3413 # freeze display when hovering over any label
3414 return if $CFClient::UI::TOOLTIP->{owner}
3415 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3416 values %{ $self->{item} };
3074 3417
3075 while (my ($k, $v) = each %{ $self->{item} }) { 3418 while (my ($k, $v) = each %{ $self->{item} }) {
3076 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3419 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077 } 3420 }
3078 3421
… …
3081 my @items = sort { 3424 my @items = sort {
3082 $a->{pri} <=> $b->{pri} 3425 $a->{pri} <=> $b->{pri}
3083 or $b->{id} <=> $a->{id} 3426 or $b->{id} <=> $a->{id}
3084 } values %{ $self->{item} }; 3427 } values %{ $self->{item} };
3085 3428
3429 $self->{timer}->interval (1);
3430
3086 my $count = 10 + 1; 3431 my $count = 10 + 1;
3087 for my $item (@items) { 3432 for my $item (@items) {
3088 last unless --$count; 3433 last unless --$count;
3089 3434
3090 push @widgets, $item->{label} ||= do { 3435 my $label = $item->{label} ||= do {
3091 # TODO: doesn't handle markup well (read as: at all) 3436 # TODO: doesn't handle markup well (read as: at all)
3092 my $short = $item->{count} > 1 3437 my $short = $item->{count} > 1
3093 ? "<b>$item->{count} ×</b> $item->{text}" 3438 ? "<b>$item->{count} ×</b> $item->{text}"
3094 : $item->{text}; 3439 : $item->{text};
3095 3440
… …
3103 tooltip => $item->{tooltip}, 3448 tooltip => $item->{tooltip},
3104 tooltip_font => $::FONT_PROP, 3449 tooltip_font => $::FONT_PROP,
3105 tooltip_width => 0.67, 3450 tooltip_width => 0.67,
3106 fontsize => $item->{fontsize} || $self->{fontsize}, 3451 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44, 3452 max_w => $::WIDTH * 0.44,
3108 fg => $item->{fg}, 3453 fg => [@{ $item->{fg} }],
3109 can_events => 1, 3454 can_events => 1,
3110 can_hover => 1 3455 can_hover => 1
3111 }; 3456 };
3457
3458 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3459 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3460 $label->update;
3461 $label->set_max_size (undef, $label->{req_h} * $diff)
3462 if $diff < 1;
3463 $self->{timer}->interval (1/30);
3464 } else {
3465 $label->{fg}[3] = $item->{fg}[3] || 1;
3466 }
3467
3468 push @widgets, $label;
3112 } 3469 }
3113 3470
3114 $self->clear; 3471 $self->clear;
3115 $self->SUPER::add (reverse @widgets); 3472 $self->SUPER::add (reverse @widgets);
3116} 3473}
… …
3121 $text =~ s/^\s+//; 3478 $text =~ s/^\s+//;
3122 $text =~ s/\s+$//; 3479 $text =~ s/\s+$//;
3123 3480
3124 return unless $text; 3481 return unless $text;
3125 3482
3126 my $timeout = time + ((delete $arg{timeout}) || 60); 3483 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3127 3484
3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3485 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129 3486
3130 if (my $item = $self->{item}{$group}) { 3487 if (my $item = $self->{item}{$group}) {
3131 if ($item->{text} eq $text) { 3488 if ($item->{text} eq $text) {
3132 $item->{count}++; 3489 $item->{count}++;
3133 } else { 3490 } else {
3134 $item->{count} = 1; 3491 $item->{count} = 1;
3135 $item->{text} = $item->{tooltip} = $text; 3492 $item->{text} = $item->{tooltip} = $text;
3136 } 3493 }
3137 $item->{id} = ++$self->{id}; 3494 $item->{id} += 0.2;#d#
3138 $item->{timeout} = $timeout; 3495 $item->{timeout} = $timeout;
3139 delete $item->{label}; 3496 delete $item->{label};
3140 } else { 3497 } else {
3141 $self->{item}{$group} = { 3498 $self->{item}{$group} = {
3142 id => ++$self->{id}, 3499 id => ++$self->{id},
… …
3148 count => 1, 3505 count => 1,
3149 %arg, 3506 %arg,
3150 }; 3507 };
3151 } 3508 }
3152 3509
3510 $ROOT->on_refresh (reorder => sub {
3153 $self->reorder; 3511 $self->reorder;
3512 });
3154} 3513}
3155 3514
3156sub reconfigure { 3515sub reconfigure {
3157 my ($self) = @_; 3516 my ($self) = @_;
3158 3517
… …
3161 3520
3162 $self->reorder; 3521 $self->reorder;
3163 $self->SUPER::reconfigure; 3522 $self->SUPER::reconfigure;
3164} 3523}
3165 3524
3525sub destroy {
3526 my ($self) = @_;
3527
3528 $self->{timer}->cancel;
3529
3530 $self->SUPER::destroy;
3531}
3532
3166############################################################################# 3533#############################################################################
3167 3534
3168package CFClient::UI::Inventory; 3535package CFClient::UI::Inventory;
3169 3536
3170our @ISA = CFClient::UI::ScrolledWindow::; 3537our @ISA = CFClient::UI::Table::;
3171 3538
3172sub new { 3539sub new {
3173 my $class = shift; 3540 my $class = shift;
3174 3541
3175 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3543 col_expand => [0, 1, 0],
3177 @_, 3544 @_,
3178 ); 3545 );
3179 3546
3180 $self 3547 $self
3181} 3548}
3182 3549
3183sub set_items { 3550sub set_items {
3184 my ($self, $items) = @_; 3551 my ($self, $items) = @_;
3185 3552
3186 $self->{scrolled}->clear; 3553 $self->clear;
3187 return unless $items; 3554 return unless $items;
3188 3555
3189 my @items = sort { 3556 my @items = sort {
3190 ($a->{type} <=> $b->{type}) 3557 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name}) 3558 or ($a->{name} cmp $b->{name})
3192 } @$items; 3559 } values %$items;
3193 3560
3194 $self->{real_items} = \@items; 3561 $self->{real_items} = \@items;
3195 3562
3196 my $row = 0; 3563 my $row = 0;
3197 for my $item (@items) { 3564 for my $item (@items) {
3198 CFClient::Item::update_widgets $item; 3565 CFClient::Item::update_widgets $item;
3199 3566
3200 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3567 $self->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3568 $self->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3569 $self->add (2, $row, $item->{weight_widget});
3203 3570
3204 $row++; 3571 $row++;
3205 } 3572 }
3206} 3573}
3207 3574
3208############################################################################# 3575#############################################################################
3209 3576
3210package CFClient::UI::BindEditor;
3211
3212our @ISA = CFClient::UI::FancyFrame::;
3213
3214sub new {
3215 my $class = shift;
3216
3217 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3218
3219 $self->add (my $vb = new CFClient::UI::VBox);
3220
3221
3222 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3223 text => "start recording",
3224 tooltip => "Start/Stops recording of actions."
3225 ."All subsequent actions after the recording started will be captured."
3226 ."The actions are displayed after the record was stopped."
3227 ."To bind the action you have to click on the 'Bind' button",
3228 on_activate => sub {
3229 unless ($self->{recording}) {
3230 $self->start;
3231 } else {
3232 $self->stop;
3233 }
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3238
3239 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3240 $vb->add (my $hb = new CFClient::UI::HBox);
3241 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3242 $hb->add (new CFClient::UI::Button
3243 text => "bind",
3244 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3245 on_activate => sub {
3246 $self->ask_for_bind;
3247 });
3248
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add (new CFClient::UI::Button
3251 text => "ok",
3252 expand => 1,
3253 tooltip => "This closes the binding editor and saves the binding",
3254 on_activate => sub {
3255 $self->hide;
3256 $self->commit;
3257 });
3258
3259 $hb->add (new CFClient::UI::Button
3260 text => "cancel",
3261 expand => 1,
3262 tooltip => "This closes the binding editor without saving",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->{binding_cancel}->()
3266 if $self->{binding_cancel};
3267 });
3268
3269 $self->update_binding_widgets;
3270
3271 $self
3272}
3273
3274sub commit {
3275 my ($self) = @_;
3276 my ($mod, $sym, $cmds) = $self->get_binding;
3277 if ($sym != 0 && @$cmds > 0) {
3278 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3279 ."'. Don't forget 'Save Config'!");
3280 $self->{binding_change}->($mod, $sym, $cmds)
3281 if $self->{binding_change};
3282 } else {
3283 $::STATUSBOX->add ("No action bound, no key or action specified!");
3284 $self->{binding_cancel}->()
3285 if $self->{binding_cancel};
3286 }
3287}
3288
3289sub start {
3290 my ($self) = @_;
3291
3292 $self->{rec_btn}->set_text ("stop recording");
3293 $self->{recording} = 1;
3294 $self->clear_command_list;
3295 $::CONN->start_record if $::CONN;
3296}
3297
3298sub stop {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("start recording");
3302 $self->{recording} = 0;
3303
3304 my $rec;
3305 $rec = $::CONN->stop_record if $::CONN;
3306 return unless ref $rec eq 'ARRAY';
3307 $self->set_command_list ($rec);
3308}
3309
3310
3311sub ask_for_bind_and_commit {
3312 my ($self) = @_;
3313 $self->ask_for_bind (1);
3314}
3315
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405#############################################################################
3406
3407package CFClient::UI::SpellList; 3577package CFClient::UI::SpellList;
3408 3578
3409our @ISA = CFClient::UI::ScrolledWindow::; 3579our @ISA = CFClient::UI::Table::;
3410 3580
3411sub new { 3581sub new {
3412 my $class = shift; 3582 my $class = shift;
3413 3583
3414 my $self = $class->SUPER::new ( 3584 my $self = $class->SUPER::new (
3415 binding => [], 3585 binding => [],
3416 commands => [], 3586 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_, 3587 @_,
3419 ) 3588 )
3420} 3589}
3421 3590
3422# XXX: Do sorting? Argl... 3591my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3592
3593my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3594 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3595my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3596 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3597my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3598 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3599my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3600 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3601my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3602 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3603
3604sub rebuild_spell_list {
3605 my ($self) = @_;
3606
3607 $CFClient::UI::ROOT->on_refresh ($self => sub {
3608 $self->clear;
3609
3610 return unless $::CONN;
3611
3612 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3613 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3614 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3615 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3616 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3617
3618 my $row = 0;
3619
3620 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3621 my $spell = $self->{spell}{$_};
3622
3623 $row++;
3624
3625 my $spell_cb = sub {
3626 my ($widget, $ev) = @_;
3627
3628 if ($ev->{button} == 1) {
3629 $::CONN->user_send ("cast $spell->{name}");
3630 } elsif ($ev->{button} == 2) {
3631 $::CONN->user_send ("invoke $spell->{name}");
3632 } elsif ($ev->{button} == 3) {
3633 (new CFClient::UI::Menu
3634 items => [
3635 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3636 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3637 ],
3638 )->popup ($ev);
3639 } else {
3640 return 0;
3641 }
3642
3643 1
3644 };
3645
3646 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3647
3648 #TODO: add path info to tooltip
3649 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3650
3651 $self->add (0, $row, new CFClient::UI::Face
3652 face => $spell->{face},
3653 can_hover => 1,
3654 can_events => 1,
3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3657 );
3658
3659 $self->add (1, $row, new CFClient::UI::Label
3660 expand => 1,
3661 text => $spell->{name},
3662 can_hover => 1,
3663 can_events => 1,
3664 tooltip => $tooltip,
3665 on_button_down => $spell_cb,
3666 );
3667
3668 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3669 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3670 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3671 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3672 }
3673 });
3674}
3675
3423sub add_spell { 3676sub add_spell {
3424 my ($self, $spell) = @_; 3677 my ($self, $spell) = @_;
3678
3425 $self->{spells}->{$spell->{name}} = $spell; 3679 $self->{spell}->{$spell->{name}} = $spell;
3426 3680 $self->rebuild_spell_list;
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454} 3681}
3455 3682
3456sub remove_spell { 3683sub remove_spell {
3457 my ($self, $spell) = @_; 3684 my ($self, $spell) = @_;
3685
3458 delete $self->{spells}->{$spell->{name}}; 3686 delete $self->{spell}->{$spell->{name}};
3459 $self->rebuild_spell_list; 3687 $self->rebuild_spell_list;
3460} 3688}
3461 3689
3690sub clear_spells {
3691 my ($self) = @_;
3692
3693 $self->{spell} = {};
3694 $self->rebuild_spell_list;
3695}
3696
3462############################################################################# 3697#############################################################################
3463 3698
3464package CFClient::UI::Root; 3699package CFClient::UI::Root;
3465 3700
3466our @ISA = CFClient::UI::Container::; 3701our @ISA = CFClient::UI::Container::;
3702
3703use List::Util qw(min max);
3467 3704
3468use CFClient::OpenGL; 3705use CFClient::OpenGL;
3469 3706
3470sub new { 3707sub new {
3471 my $class = shift; 3708 my $class = shift;
… …
3498 $coord = $max - $size if $coord > $max - $size; 3735 $coord = $max - $size if $coord > $max - $size;
3499 3736
3500 int $coord + 0.5 3737 int $coord + 0.5
3501} 3738}
3502 3739
3503sub size_allocate { 3740sub invoke_size_allocate {
3504 my ($self, $w, $h) = @_; 3741 my ($self, $w, $h) = @_;
3505 3742
3506 for my $child ($self->children) { 3743 for my $child ($self->children) {
3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3744 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3508 3745
… …
3512 $X = _to_pixel $X, $W, $self->{w}; 3749 $X = _to_pixel $X, $W, $self->{w};
3513 $Y = _to_pixel $Y, $H, $self->{h}; 3750 $Y = _to_pixel $Y, $H, $self->{h};
3514 3751
3515 $child->configure ($X, $Y, $W, $H); 3752 $child->configure ($X, $Y, $W, $H);
3516 } 3753 }
3754
3755 1
3517} 3756}
3518 3757
3519sub coord2local { 3758sub coord2local {
3520 my ($self, $x, $y) = @_; 3759 my ($self, $x, $y) = @_;
3521 3760
… …
3606 3845
3607 delete $queue{$widget+0}; 3846 delete $queue{$widget+0};
3608 3847
3609 my ($w, $h) = $widget->size_request; 3848 my ($w, $h) = $widget->size_request;
3610 3849
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3850 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3851 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3852
3853 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3854 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3613 3855
3614 $w = $widget->{force_w} if exists $widget->{force_w}; 3856 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h}; 3857 $h = $widget->{force_h} if exists $widget->{force_h};
3616 3858
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3859 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3643 3885
3644 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3886 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3645 3887
3646 $w = 0 if $w < 0; 3888 $w = 0 if $w < 0;
3647 $h = 0 if $h < 0; 3889 $h = 0 if $h < 0;
3890
3891 $w = max $widget->{min_w}, $w;
3892 $h = max $widget->{min_h}, $h;
3893
3894 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3648 3896
3649 $w = int $w + 0.5; 3897 $w = int $w + 0.5;
3650 $h = int $h + 0.5; 3898 $h = int $h + 0.5;
3651 3899
3652 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3900 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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