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.330 by root, Sun Jul 23 04:37:51 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 {
… …
415 my ($self, $x, $y) = @_; 439 my ($self, $x, $y) = @_;
416 440
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 441 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 442}
419 443
420sub focus_in { 444sub invoke_focus_in {
421 my ($self) = @_; 445 my ($self) = @_;
422 446
423 return if $FOCUS == $self; 447 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 448 return unless $self->{can_focus};
425 449
426 my $focus = $FOCUS; $FOCUS = $self; 450 $FOCUS = $self;
427 451
428 $self->_emit (focus_in => $focus); 452 $self->update;
429 453
430 $focus->update if $focus; 454 0
431 $FOCUS->update;
432} 455}
433 456
434sub focus_out { 457sub invoke_focus_out {
435 my ($self) = @_; 458 my ($self) = @_;
436 459
437 return unless $FOCUS == $self; 460 return unless $FOCUS == $self;
438 461
439 my $focus = $FOCUS; undef $FOCUS; 462 undef $FOCUS;
440 463
441 $self->_emit (focus_out => $focus); 464 $self->update;
442 465
443 $focus->update if $focus; #?
444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 466 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 467 unless $FOCUS;
447}
448 468
469 0
470}
471
472sub grab_focus {
473 my ($self) = @_;
474
475 $FOCUS->emit ("focus_out") if $FOCUS;
476 $self->emit ("focus_in");
477}
478
449sub mouse_motion { 0 } 479sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 480sub invoke_button_up { 0 }
451sub key_down { 0 } 481sub invoke_key_down { 0 }
452sub key_up { 0 } 482sub invoke_key_up { 0 }
483sub invoke_mouse_wheel { 0 }
453 484
454sub button_down { 485sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 486 my ($self, $ev, $x, $y) = @_;
456 487
457 $self->focus_in; 488 $self->grab_focus;
458 489
459 0 490 0
491}
492
493sub connect {
494 my ($self, $signal, $cb) = @_;
495
496 push @{ $self->{signal_cb}{$signal} }, $cb;
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 my @append
503 = ref $args[0] && $args[0]->isa ("CFClient::UI::Event")
504 ? $args[0]->xy ($self)
505 : ();
506
507 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
508
509 #d##TODO# stop propagating at first true, do not use sum
510 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
511 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
512 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460} 513}
461 514
462sub find_widget { 515sub find_widget {
463 my ($self, $x, $y) = @_; 516 my ($self, $x, $y) = @_;
464 517
… …
474sub set_parent { 527sub set_parent {
475 my ($self, $parent) = @_; 528 my ($self, $parent) = @_;
476 529
477 Scalar::Util::weaken ($self->{parent} = $parent); 530 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 531 $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} 532}
503 533
504sub realloc { 534sub realloc {
505 my ($self) = @_; 535 my ($self) = @_;
506 536
… …
539 return unless $self->{h} && $self->{w}; 569 return unless $self->{h} && $self->{w};
540 570
541 # update screen rectangle 571 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 572 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 573 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 574
547 # skip widgets that are entirely outside the drawing area 575 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 576 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 577 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 578
551 glPushMatrix; 579 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 580 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 581
556 if ($self == $HOVER && $self->{can_hover}) { 582 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 583 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 584 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 585 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 586 glBegin GL_QUADS;
563 glVertex $x , $y; 587 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 588 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 589 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 590 glVertex 0 , $self->{h};
567 glEnd; 591 glEnd;
568 glDisable GL_BLEND; 592 glDisable GL_BLEND;
569 } 593 }
570 594
571 if ($ENV{CFPLUS_DEBUG} & 1) { 595 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 596 glPushMatrix;
573 glColor 1, 1, 0, 1; 597 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 598 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 599 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 600 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 601 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 602 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 603 glVertex 0 , $self->{h} - 1;
580 glEnd; 604 glEnd;
581 glPopMatrix; 605 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 606 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 607 }
608
609 $self->_draw;
610 glPopMatrix;
584} 611}
585 612
586sub _draw { 613sub _draw {
587 my ($self) = @_; 614 my ($self) = @_;
588 615
… …
590} 617}
591 618
592sub DESTROY { 619sub DESTROY {
593 my ($self) = @_; 620 my ($self) = @_;
594 621
622 return if CFClient::in_destruct;
623
595 delete $WIDGET{$self+0}; 624 delete $WIDGET{$self+0};
596 #$self->deactivate; 625
626 eval { $self->destroy };
627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
597} 628}
598 629
599############################################################################# 630#############################################################################
600 631
601package CFClient::UI::DrawBG; 632package CFClient::UI::DrawBG;
… …
626 657
627 if ($color && (@$color < 4 || $color->[3])) { 658 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 659 my ($w, $h) = @$self{qw(w h)};
629 660
630 glEnable GL_BLEND; 661 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 662 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 663 glColor_premultiply @$color;
633 664
634 glBegin GL_QUADS; 665 glBegin GL_QUADS;
635 glVertex 0 , 0; 666 glVertex 0 , 0;
636 glVertex 0 , $h; 667 glVertex 0 , $h;
637 glVertex $w, $h; 668 glVertex $w, $h;
… …
766} 797}
767 798
768sub add { 799sub add {
769 my ($self, $child) = @_; 800 my ($self, $child) = @_;
770 801
771 $self->{children} = []; 802 $self->SUPER::remove ($_) for @{ $self->{children} };
772
773 $self->SUPER::add ($child); 803 $self->SUPER::add ($child);
774} 804}
775 805
776sub remove { 806sub remove {
777 my ($self, $widget) = @_; 807 my ($self, $widget) = @_;
… …
786 816
787sub size_request { 817sub size_request {
788 $_[0]{children}[0]->size_request 818 $_[0]{children}[0]->size_request
789} 819}
790 820
791sub size_allocate { 821sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 822 my ($self, $w, $h) = @_;
793 823
794 $self->{children}[0]->configure (0, 0, $w, $h); 824 $self->{children}[0]->configure (0, 0, $w, $h);
825
826 1
795} 827}
796 828
797############################################################################# 829#############################################################################
830
831# back-buffered drawing area
798 832
799package CFClient::UI::Window; 833package CFClient::UI::Window;
800 834
801our @ISA = CFClient::UI::Bin::; 835our @ISA = CFClient::UI::Bin::;
802 836
… …
813 847
814 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 848 $ROOT->on_post_alloc ($self => sub { $self->render_child });
815 $self->SUPER::update; 849 $self->SUPER::update;
816} 850}
817 851
818sub size_allocate { 852sub invoke_size_allocate {
819 my ($self, $w, $h) = @_; 853 my ($self, $w, $h) = @_;
820 854
821 $self->SUPER::size_allocate ($w, $h);
822 $self->update; 855 $self->update;
856
857 $self->SUPER::invoke_size_allocate ($w, $h)
823} 858}
824 859
825sub _render { 860sub _render {
826 my ($self) = @_; 861 my ($self) = @_;
827 862
… …
854 my $tex = $self->{texture} 889 my $tex = $self->{texture}
855 or return; 890 or return;
856 891
857 glEnable GL_TEXTURE_2D; 892 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 894 glColor 0, 0, 0, 1;
860 895
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 896 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862 897
863 glDisable GL_TEXTURE_2D; 898 glDisable GL_TEXTURE_2D;
864} 899}
… …
888 $h = 10 if $self->{scroll_y}; 923 $h = 10 if $self->{scroll_y};
889 924
890 ($w, $h) 925 ($w, $h)
891} 926}
892 927
893sub size_allocate { 928sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 929 my ($self, $w, $h) = @_;
895 930
896 my $child = $self->child; 931 my $child = $self->child;
897 932
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 933 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 934 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900 935
901 $self->child->configure (0, 0, $w, $h); 936 $self->child->configure (0, 0, $w, $h);
902 $self->update; 937 $self->update;
938
939 1
903} 940}
904 941
905sub set_offset { 942sub set_offset {
906 my ($self, $x, $y) = @_; 943 my ($self, $x, $y) = @_;
907 944
… …
955package CFClient::UI::ScrolledWindow; 992package CFClient::UI::ScrolledWindow;
956 993
957our @ISA = CFClient::UI::HBox::; 994our @ISA = CFClient::UI::HBox::;
958 995
959sub new { 996sub new {
960 my $class = shift; 997 my ($class, %arg) = @_;
998
999 my $child = delete $arg{child};
961 1000
962 my $self; 1001 my $self;
963 1002
964 my $slider = new CFClient::UI::Slider 1003 my $slider = new CFClient::UI::Slider
965 vertical => 1, 1004 vertical => 1,
… …
968 $self->{vp}->set_offset (0, $_[1]); 1007 $self->{vp}->set_offset (0, $_[1]);
969 }, 1008 },
970 ; 1009 ;
971 1010
972 $self = $class->SUPER::new ( 1011 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1), 1012 vp => (new CFClient::UI::ViewPort expand => 1),
1013 can_events => 1,
974 slider => $slider, 1014 slider => $slider,
975 @_, 1015 %arg,
976 ); 1016 );
977 1017
978 $self->{vp}->add ($self->{scrolled});
979 $self->add ($self->{vp});
980 $self->add ($self->{slider}); 1018 $self->SUPER::add ($self->{vp}, $self->{slider});
1019 $self->add ($child) if $child;
981 1020
982 $self 1021 $self
983} 1022}
984 1023
1024#TODO# update range on size_allocate depending on child
1025
1026sub add {
1027 my ($self, $widget) = @_;
1028
1029 $self->{vp}->add ($self->{child} = $widget);
1030}
1031
1032sub invoke_mouse_wheel {
1033 my ($self, $ev) = @_;
1034
1035 return 0 unless $ev->{dy}; # only vertical movements
1036
1037 $self->{slider}->emit (mouse_wheel => $ev);
1038
1039 1
1040}
1041
1042sub update_slider {
1043 my ($self) = @_;
1044
1045 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1046}
1047
985sub update { 1048sub update {
986 my ($self) = @_; 1049 my ($self) = @_;
987 1050
988 $self->SUPER::update; 1051 $self->SUPER::update;
989 1052
990 # todo: overwrite size_allocate of child 1053 $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} 1054}
994 1055
995sub size_allocate { 1056sub invoke_size_allocate {
996 my ($self, $w, $h) = @_; 1057 my ($self, $w, $h) = @_;
997 1058
1059 $self->update_slider;
1060
998 $self->SUPER::size_allocate ($w, $h); 1061 $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} 1062}
1003
1004#TODO# update range on size_allocate depending on child
1005# update viewport offset on scroll
1006 1063
1007############################################################################# 1064#############################################################################
1008 1065
1009package CFClient::UI::Frame; 1066package CFClient::UI::Frame;
1010 1067
… …
1026 1083
1027 if ($self->{bg}) { 1084 if ($self->{bg}) {
1028 my ($w, $h) = @$self{qw(w h)}; 1085 my ($w, $h) = @$self{qw(w h)};
1029 1086
1030 glEnable GL_BLEND; 1087 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1088 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1032 glColor @{ $self->{bg} }; 1089 glColor_premultiply @{ $self->{bg} };
1033 1090
1034 glBegin GL_QUADS; 1091 glBegin GL_QUADS;
1035 glVertex 0 , 0; 1092 glVertex 0 , 0;
1036 glVertex 0 , $h; 1093 glVertex 0 , $h;
1037 glVertex $w, $h; 1094 glVertex $w, $h;
… …
1061 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1118 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1062 1119
1063sub new { 1120sub new {
1064 my ($class, %arg) = @_; 1121 my ($class, %arg) = @_;
1065 1122
1066 my $title = delete $arg{title};
1067
1068 my $self = $class->SUPER::new ( 1123 my $self = $class->SUPER::new (
1069 bg => [1, 1, 1, 1], 1124 bg => [1, 1, 1, 1],
1070 border_bg => [1, 1, 1, 1], 1125 border_bg => [1, 1, 1, 1],
1071 border => 0.6, 1126 border => 0.6,
1072 can_events => 1, 1127 can_events => 1,
1073 min_w => 16, 1128 min_w => 64,
1074 min_h => 16, 1129 min_h => 32,
1075 %arg, 1130 %arg,
1076 ); 1131 );
1077 1132
1078 $self->{title} = new CFClient::UI::Label 1133 $self->{title_widget} = new CFClient::UI::Label
1079 align => 0, 1134 align => 0,
1080 valign => 1, 1135 valign => 1,
1081 text => $title, 1136 text => $self->{title},
1082 fontsize => $self->{border} 1137 fontsize => $self->{border},
1083 if defined $title; 1138 if exists $self->{title};
1139
1140 if ($self->{has_close_button}) {
1141 $self->{close_button} =
1142 new CFClient::UI::ImageButton
1143 path => 'x1_close.png',
1144 on_activate => sub { $self->emit ("delete") };
1145
1146 $self->CFClient::UI::Container::add ($self->{close_button});
1147 }
1084 1148
1085 $self 1149 $self
1086} 1150}
1087 1151
1088sub add { 1152sub add {
1089 my ($self, @widgets) = @_; 1153 my ($self, @widgets) = @_;
1090 1154
1091 $self->SUPER::add (@widgets); 1155 $self->SUPER::add (@widgets);
1156 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1157 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1093} 1158}
1094 1159
1095sub border { 1160sub border {
1096 int $_[0]{border} * $::FONTSIZE 1161 int $_[0]{border} * $::FONTSIZE
1097} 1162}
1098 1163
1099sub size_request { 1164sub size_request {
1100 my ($self) = @_; 1165 my ($self) = @_;
1101 1166
1102 $self->{title}->size_request 1167 $self->{title_widget}->size_request
1103 if $self->{title}; 1168 if $self->{title_widget};
1169
1170 $self->{close_button}->size_request
1171 if $self->{close_button};
1104 1172
1105 my ($w, $h) = $self->SUPER::size_request; 1173 my ($w, $h) = $self->SUPER::size_request;
1106 1174
1107 ( 1175 (
1108 $w + $self->border * 2, 1176 $w + $self->border * 2,
1109 $h + $self->border * 2, 1177 $h + $self->border * 2,
1110 ) 1178 )
1111} 1179}
1112 1180
1113sub size_allocate { 1181sub invoke_size_allocate {
1114 my ($self, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
1115 1183
1116 if ($self->{title}) { 1184 if ($self->{title_widget}) {
1117 $self->{title}{w} = $w; 1185 $self->{title_widget}{w} = $w;
1118 $self->{title}{h} = $h; 1186 $self->{title_widget}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h); 1187 $self->{title_widget}->invoke_size_allocate ($w, $h);
1120 } 1188 }
1121 1189
1122 my $border = $self->border; 1190 my $border = $self->border;
1123 1191
1124 $h -= List::Util::max 0, $border * 2; 1192 $h -= List::Util::max 0, $border * 2;
1125 $w -= List::Util::max 0, $border * 2; 1193 $w -= List::Util::max 0, $border * 2;
1194
1195 $self->child->configure ($border, $border, $w, $h);
1196
1197 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1198 if $self->{close_button};
1199
1200 1
1201}
1202
1203sub invoke_delete {
1204 my ($self) = @_;
1205
1206 $self->hide;
1126 1207
1127 $self->child->configure ($border, $border, $w, $h); 1208 1
1128} 1209}
1129 1210
1130sub button_down { 1211sub invoke_button_down {
1131 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1132 1213
1133 my ($w, $h) = @$self{qw(w h)}; 1214 my ($w, $h) = @$self{qw(w h)};
1134 my $border = $self->border; 1215 my $border = $self->border;
1135 1216
… …
1151 my $dy = $ev->{y} - $oy; 1232 my $dy = $ev->{y} - $oy;
1152 1233
1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1234 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1235 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155 1236
1237 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1156 $self->realloc; 1238 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1158 }; 1239 };
1159 1240
1160 } elsif ($lr ^ $td) { 1241 } elsif ($lr ^ $td) {
1161 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1242 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1162 my ($bx, $by) = ($self->{x}, $self->{y}); 1243 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1165 my ($ev, $x, $y) = @_; 1246 my ($ev, $x, $y) = @_;
1166 1247
1167 ($x, $y) = ($ev->{x}, $ev->{y}); 1248 ($x, $y) = ($ev->{x}, $ev->{y});
1168 1249
1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1250 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1251 # HACK: the next line is required to enforce placement
1252 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1170 }; 1253 };
1171 } else { 1254 } else {
1172 return 0; 1255 return 0;
1173 } 1256 }
1174 1257
1175 1 1258 1
1176} 1259}
1177 1260
1178sub button_up { 1261sub invoke_button_up {
1179 my ($self, $ev, $x, $y) = @_; 1262 my ($self, $ev, $x, $y) = @_;
1180 1263
1181 !!delete $self->{motion} 1264 ! ! delete $self->{motion}
1182} 1265}
1183 1266
1184sub mouse_motion { 1267sub invoke_mouse_motion {
1185 my ($self, $ev, $x, $y) = @_; 1268 my ($self, $ev, $x, $y) = @_;
1186 1269
1187 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1270 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188 1271
1189 !!$self->{motion} 1272 ! ! $self->{motion}
1190} 1273}
1191 1274
1192sub _draw { 1275sub _draw {
1193 my ($self) = @_; 1276 my ($self) = @_;
1194 1277
… …
1220 1303
1221 glDisable GL_TEXTURE_2D; 1304 glDisable GL_TEXTURE_2D;
1222 1305
1223 $child->draw; 1306 $child->draw;
1224 1307
1225 if ($self->{title}) { 1308 if ($self->{title_widget}) {
1226 glTranslate 0, $border - $self->{h}; 1309 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw; 1310 $self->{title_widget}->_draw;
1311
1312 glTranslate 0, - ($border - $self->{h});
1228 } 1313 }
1314
1315 $self->{close_button}->draw
1316 if $self->{close_button};
1229} 1317}
1230 1318
1231############################################################################# 1319#############################################################################
1232 1320
1233package CFClient::UI::Table; 1321package CFClient::UI::Table;
… …
1256 1344
1257 $child->set_parent ($self); 1345 $child->set_parent ($self);
1258 $self->{children}[$y][$x] = $child; 1346 $self->{children}[$y][$x] = $child;
1259 1347
1260 $self->realloc; 1348 $self->realloc;
1349}
1350
1351sub remove {
1352 my ($self, $child) = @_;
1353
1354 # TODO: not yet implemented
1261} 1355}
1262 1356
1263# TODO: move to container class maybe? send children a signal on removal? 1357# TODO: move to container class maybe? send children a signal on removal?
1264sub clear { 1358sub clear {
1265 my ($self) = @_; 1359 my ($self) = @_;
… …
1306 (sum @$ws), 1400 (sum @$ws),
1307 (sum @$hs), 1401 (sum @$hs),
1308 ) 1402 )
1309} 1403}
1310 1404
1311sub size_allocate { 1405sub invoke_size_allocate {
1312 my ($self, $w, $h) = @_; 1406 my ($self, $w, $h) = @_;
1313 1407
1314 my ($ws, $hs) = $self->get_wh; 1408 my ($ws, $hs) = $self->get_wh;
1315 1409
1316 my $req_w = (sum @$ws) || 1; 1410 my $req_w = (sum @$ws) || 1;
… …
1348 } 1442 }
1349 1443
1350 $y += $row_h; 1444 $y += $row_h;
1351 } 1445 }
1352 1446
1447 1
1353} 1448}
1354 1449
1355sub find_widget { 1450sub find_widget {
1356 my ($self, $x, $y) = @_; 1451 my ($self, $x, $y) = @_;
1357 1452
… …
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1489 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1490 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1396 ) 1491 )
1397} 1492}
1398 1493
1399sub size_allocate { 1494sub invoke_size_allocate {
1400 my ($self, $w, $h) = @_; 1495 my ($self, $w, $h) = @_;
1401 1496
1402 my $space = $self->{vertical} ? $h : $w; 1497 my $space = $self->{vertical} ? $h : $w;
1403 my $children = $self->{children}; 1498 my @children = $self->visible_children;
1404 1499
1405 my @req; 1500 my @req;
1406 1501
1407 if ($self->{homogeneous}) { 1502 if ($self->{homogeneous}) {
1408 @req = ($space / (@$children || 1)) x @$children; 1503 @req = ($space / (@children || 1)) x @children;
1409 } else { 1504 } else {
1410 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1505 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1411 my $req = List::Util::sum @req; 1506 my $req = List::Util::sum @req;
1412 1507
1413 if ($req > $space) { 1508 if ($req > $space) {
1414 # ah well, not enough space 1509 # ah well, not enough space
1415 $_ *= $space / $req for @req; 1510 $_ *= $space / $req for @req;
1416 } else { 1511 } else {
1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1512 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1418 1513
1419 $space = ($space - $req) / $expand; # remaining space to give away 1514 $space = ($space - $req) / $expand; # remaining space to give away
1420 1515
1421 $req[$_] += $space * $children->[$_]{expand} 1516 $req[$_] += $space * $children[$_]{expand}
1422 for 0 .. $#$children; 1517 for 0 .. $#children;
1423 } 1518 }
1424 } 1519 }
1425 1520
1426 CFClient::UI::harmonize \@req; 1521 CFClient::UI::harmonize \@req;
1427 1522
1428 my $pos = 0; 1523 my $pos = 0;
1429 for (0 .. $#$children) { 1524 for (0 .. $#children) {
1430 my $alloc = $req[$_]; 1525 my $alloc = $req[$_];
1431 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1526 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1432 1527
1433 $pos += $alloc; 1528 $pos += $alloc;
1434 } 1529 }
1435 1530
1436 1 1531 1
… …
1526 1621
1527 delete $self->{texture}; 1622 delete $self->{texture};
1528 $self->SUPER::update; 1623 $self->SUPER::update;
1529} 1624}
1530 1625
1626sub realloc {
1627 my ($self) = @_;
1628
1629 delete $self->{ox};
1630 $self->SUPER::realloc;
1631}
1632
1531sub set_text { 1633sub set_text {
1532 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1533 1635
1534 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1535 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1536 1638
1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1538 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1539 1640
1641 delete $self->{size_req};
1540 $self->realloc; 1642 $self->realloc;
1541 $self->update; 1643 $self->update;
1542} 1644}
1543 1645
1544sub set_markup { 1646sub set_markup {
… …
1547 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1548 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1549 1651
1550 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1551 1653
1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1553 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1554 1655
1656 delete $self->{size_req};
1555 $self->realloc; 1657 $self->realloc;
1556 $self->update; 1658 $self->update;
1557} 1659}
1558 1660
1559sub size_request { 1661sub size_request {
1560 my ($self) = @_; 1662 my ($self) = @_;
1561 1663
1664 $self->{size_req} ||= do {
1562 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1665 $self->{layout}->set_font ($self->{font}) if $self->{font};
1563 $self->{layout}->set_width ($self->{max_w} || -1); 1666 $self->{layout}->set_width ($self->{max_w} || -1);
1564 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1667 $self->{layout}->set_ellipsise ($self->{ellipsise});
1565 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1668 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1669 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1567 1670
1568 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1569 1672
1570 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1571 $self->{template}->set_font ($self->{font}) if $self->{font}; 1674 $self->{template}->set_font ($self->{font}) if $self->{font};
1675 $self->{template}->set_width ($self->{max_w} || -1);
1572 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1677
1574 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1575 1679
1576 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
1577 $h = List::Util::max $h, $h2; 1681 $h = List::Util::max $h, $h2;
1682 }
1683
1684 [$w, $h]
1578 } 1685 };
1579 1686
1580 ($w, $h) 1687 @{ $self->{size_req} }
1581} 1688}
1582 1689
1690sub baseline_shift {
1691 $_[0]{layout}->descent
1692}
1693
1583sub size_allocate { 1694sub invoke_size_allocate {
1584 my ($self, $w, $h) = @_; 1695 my ($self, $w, $h) = @_;
1585 1696
1586 delete $self->{ox}; 1697 delete $self->{ox};
1587 1698
1588 delete $self->{texture} 1699 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1700 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1701
1702 1
1590} 1703}
1591 1704
1592sub set_fontsize { 1705sub set_fontsize {
1593 my ($self, $fontsize) = @_; 1706 my ($self, $fontsize) = @_;
1594 1707
1595 $self->{fontsize} = $fontsize; 1708 $self->{fontsize} = $fontsize;
1709 delete $self->{size_req};
1596 delete $self->{texture}; 1710 delete $self->{texture};
1597 1711
1598 $self->realloc; 1712 $self->realloc;
1599} 1713}
1600 1714
1715sub reconfigure {
1716 my ($self) = @_;
1717
1718 delete $self->{size_req};
1719 delete $self->{texture};
1720
1721 $self->SUPER::reconfigure;
1722}
1723
1601sub _draw { 1724sub _draw {
1602 my ($self) = @_; 1725 my ($self) = @_;
1603 1726
1604 $self->SUPER::_draw; # draw background, if applicable 1727 $self->SUPER::_draw; # draw background, if applicable
1605 1728
1606 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1607 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1608 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1609 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1610 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1613 1736
1614 new_from_layout CFClient::Texture $self->{layout} 1737 [$self->{layout}->size]
1615 }; 1738 };
1616 1739
1617 unless (exists $self->{ox}) { 1740 unless (exists $self->{ox}) {
1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1741 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1742 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1620 : ($self->{w} - $tex->{w}) * 0.5); 1743 : ($self->{w} - $size->[0]) * 0.5);
1621 1744
1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1624 : ($self->{h} - $tex->{h}) * 0.5); 1747 : ($self->{h} - $size->[1]) * 0.5);
1625 }; 1748 };
1626 1749
1627 glEnable GL_TEXTURE_2D; 1750 my $w = List::Util::min $self->{w} + 4, $size->[0];
1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1751 my $h = List::Util::min $self->{h} + 2, $size->[1];
1629 1752
1630 if ($tex->{format} == GL_ALPHA) { 1753 $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} 1754}
1639 1755
1640############################################################################# 1756#############################################################################
1641 1757
1642package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1656 can_hover => 1, 1772 can_hover => 1,
1657 can_focus => 1, 1773 can_focus => 1,
1658 valign => 0, 1774 valign => 0,
1659 can_events => 1, 1775 can_events => 1,
1660 #text => ... 1776 #text => ...
1777 #hidden => "*",
1661 @_ 1778 @_
1662 ) 1779 )
1663} 1780}
1664 1781
1665sub _set_text { 1782sub _set_text {
… …
1667 1784
1668 delete $self->{cur_h}; 1785 delete $self->{cur_h};
1669 1786
1670 return if $self->{text} eq $text; 1787 return if $self->{text} eq $text;
1671 1788
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 1789 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 1790 $self->{text} = $text;
1676 1791
1677 $text =~ s/./*/g if $self->{hidden}; 1792 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 1793 $self->{layout}->set_text ("$text ");
1794 delete $self->{size_req};
1679 1795
1680 $self->_emit (changed => $self->{text}); 1796 $self->emit (changed => $self->{text});
1797
1798 $self->realloc;
1799 $self->update;
1681} 1800}
1682 1801
1683sub set_text { 1802sub set_text {
1684 my ($self, $text) = @_; 1803 my ($self, $text) = @_;
1685 1804
1686 $self->{cursor} = length $text; 1805 $self->{cursor} = length $text;
1687 $self->_set_text ($text); 1806 $self->_set_text ($text);
1688
1689 $self->realloc;
1690} 1807}
1691 1808
1692sub get_text { 1809sub get_text {
1693 $_[0]{text} 1810 $_[0]{text}
1694} 1811}
… …
1699 my ($w, $h) = $self->SUPER::size_request; 1816 my ($w, $h) = $self->SUPER::size_request;
1700 1817
1701 ($w + 1, $h) # add 1 for cursor 1818 ($w + 1, $h) # add 1 for cursor
1702} 1819}
1703 1820
1704sub key_down { 1821sub invoke_key_down {
1705 my ($self, $ev) = @_; 1822 my ($self, $ev) = @_;
1706 1823
1707 my $mod = $ev->{mod}; 1824 my $mod = $ev->{mod};
1708 my $sym = $ev->{sym}; 1825 my $sym = $ev->{sym};
1709 my $uni = $ev->{unicode}; 1826 my $uni = $ev->{unicode};
… …
1721 } elsif ($sym == CFClient::SDLK_HOME) { 1838 } elsif ($sym == CFClient::SDLK_HOME) {
1722 $self->{cursor} = 0; 1839 $self->{cursor} = 0;
1723 } elsif ($sym == CFClient::SDLK_END) { 1840 } elsif ($sym == CFClient::SDLK_END) {
1724 $self->{cursor} = length $text; 1841 $self->{cursor} = length $text;
1725 } elsif ($uni == 27) { 1842 } elsif ($uni == 27) {
1726 $self->_emit ('escape'); 1843 $self->emit ('escape');
1727 } elsif ($uni) { 1844 } elsif ($uni) {
1728 substr $text, $self->{cursor}++, 0, chr $uni; 1845 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else { 1846 } else {
1730 return 0; 1847 return 0;
1731 } 1848 }
… …
1735 $self->realloc; 1852 $self->realloc;
1736 1853
1737 1 1854 1
1738} 1855}
1739 1856
1740sub focus_in { 1857sub invoke_focus_in {
1741 my ($self) = @_; 1858 my ($self) = @_;
1742 1859
1743 $self->{last_activity} = $::NOW; 1860 $self->{last_activity} = $::NOW;
1744 1861
1745 $self->SUPER::focus_in; 1862 $self->SUPER::invoke_focus_in
1746} 1863}
1747 1864
1748sub button_down { 1865sub invoke_button_down {
1749 my ($self, $ev, $x, $y) = @_; 1866 my ($self, $ev, $x, $y) = @_;
1750 1867
1751 $self->SUPER::button_down ($ev, $x, $y); 1868 $self->SUPER::invoke_button_down ($ev, $x, $y);
1752 1869
1753 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1754 1871
1755 # byte-index to char-index 1872 # byte-index to char-index
1756 my $text = $self->{text}; 1873 my $text = $self->{text};
1757 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1758 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1759 1876
1760 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1761 $self->update; 1878 $self->update;
1762 1879
1763 1 1880 1
1764} 1881}
1765 1882
1766sub mouse_motion { 1883sub invoke_mouse_motion {
1767 my ($self, $ev, $x, $y) = @_; 1884 my ($self, $ev, $x, $y) = @_;
1768# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1885# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769 1886
1770 0 1887 1
1771} 1888}
1772 1889
1773sub _draw { 1890sub _draw {
1774 my ($self) = @_; 1891 my ($self) = @_;
1775 1892
1776 local $self->{fg} = $self->{fg}; 1893 local $self->{fg} = $self->{fg};
1777 1894
1778 if ($FOCUS == $self) { 1895 if ($FOCUS == $self) {
1779 glColor @{$self->{active_bg}}; 1896 glColor_premultiply @{$self->{active_bg}};
1780 $self->{fg} = $self->{active_fg}; 1897 $self->{fg} = $self->{active_fg};
1781 } else { 1898 } else {
1782 glColor @{$self->{bg}}; 1899 glColor_premultiply @{$self->{bg}};
1783 } 1900 }
1784 1901
1785 glEnable GL_BLEND; 1902 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1903 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787 glBegin GL_QUADS; 1904 glBegin GL_QUADS;
1788 glVertex 0 , 0; 1905 glVertex 0 , 0;
1789 glVertex 0 , $self->{h}; 1906 glVertex 0 , $self->{h};
1790 glVertex $self->{w}, $self->{h}; 1907 glVertex $self->{w}, $self->{h};
1791 glVertex $self->{w}, 0; 1908 glVertex $self->{w}, 0;
… …
1816 1933
1817our @ISA = CFClient::UI::EntryBase::; 1934our @ISA = CFClient::UI::EntryBase::;
1818 1935
1819use CFClient::OpenGL; 1936use CFClient::OpenGL;
1820 1937
1821sub key_down { 1938sub invoke_key_down {
1822 my ($self, $ev) = @_; 1939 my ($self, $ev) = @_;
1823 1940
1824 my $sym = $ev->{sym}; 1941 my $sym = $ev->{sym};
1825 1942
1826 if ($sym == 13) { 1943 if ($sym == 13) {
1827 unshift @{$self->{history}}, 1944 unshift @{$self->{history}},
1828 my $txt = $self->get_text; 1945 my $txt = $self->get_text;
1946
1829 $self->{history_pointer} = -1; 1947 $self->{history_pointer} = -1;
1830 $self->{history_saveback} = ''; 1948 $self->{history_saveback} = '';
1831 $self->_emit (activate => $txt); 1949 $self->emit (activate => $txt);
1832 $self->update; 1950 $self->update;
1833 1951
1834 } elsif ($sym == CFClient::SDLK_UP) { 1952 } elsif ($sym == CFClient::SDLK_UP) {
1835 if ($self->{history_pointer} < 0) { 1953 if ($self->{history_pointer} < 0) {
1836 $self->{history_saveback} = $self->get_text; 1954 $self->{history_saveback} = $self->get_text;
… …
1852 } else { 1970 } else {
1853 $self->set_text ($self->{history_saveback}); 1971 $self->set_text ($self->{history_saveback});
1854 } 1972 }
1855 1973
1856 } else { 1974 } else {
1857 return $self->SUPER::key_down ($ev) 1975 return $self->SUPER::invoke_key_down ($ev)
1858 } 1976 }
1859 1977
1860 1 1978 1
1861} 1979}
1862 1980
… …
1886 can_events => 1, 2004 can_events => 1,
1887 @_ 2005 @_
1888 ) 2006 )
1889} 2007}
1890 2008
1891sub activate { }
1892
1893sub button_up { 2009sub invoke_button_up {
1894 my ($self, $ev, $x, $y) = @_; 2010 my ($self, $ev, $x, $y) = @_;
1895 2011
1896 $self->emit ("activate") 2012 $self->emit ("activate")
1897 if $x >= 0 && $x < $self->{w} 2013 if $x >= 0 && $x < $self->{w}
1898 && $y >= 0 && $y < $self->{h}; 2014 && $y >= 0 && $y < $self->{h};
… …
1901} 2017}
1902 2018
1903sub _draw { 2019sub _draw {
1904 my ($self) = @_; 2020 my ($self) = @_;
1905 2021
1906 local $self->{fg} = $self->{fg}; 2022 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1907
1908 if ($GRAB == $self) {
1909 $self->{fg} = $self->{active_fg};
1910 }
1911 2023
1912 glEnable GL_TEXTURE_2D; 2024 glEnable GL_TEXTURE_2D;
1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914 glColor 0, 0, 0, 1; 2026 glColor 0, 0, 0, 1;
1915 2027
1916 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2028 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1917 2029
1918 glDisable GL_TEXTURE_2D; 2030 glDisable GL_TEXTURE_2D;
1919 2031
1920 $self->SUPER::_draw; 2032 $self->SUPER::_draw;
2033}
2034
2035#############################################################################
2036
2037package CFClient::UI::ImageButton;
2038
2039our @ISA = CFClient::UI::Image::;
2040
2041use CFClient::OpenGL;
2042
2043my %textures;
2044
2045sub new {
2046 my $class = shift;
2047
2048 my $self = $class->SUPER::new (
2049 padding_x => 4,
2050 padding_y => 4,
2051 fg => [1, 1, 1],
2052 active_fg => [0, 0, 1],
2053 can_hover => 1,
2054 align => 0,
2055 valign => 0,
2056 can_events => 1,
2057 @_
2058 );
2059}
2060
2061sub invoke_button_up {
2062 my ($self, $ev, $x, $y) = @_;
2063
2064 $self->emit ("activate")
2065 if $x >= 0 && $x < $self->{w}
2066 && $y >= 0 && $y < $self->{h};
2067
2068 1
1921} 2069}
1922 2070
1923############################################################################# 2071#############################################################################
1924 2072
1925package CFClient::UI::CheckBox; 2073package CFClient::UI::CheckBox;
… …
1952 my ($self) = @_; 2100 my ($self) = @_;
1953 2101
1954 (6) x 2 2102 (6) x 2
1955} 2103}
1956 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
1957sub button_down { 2113sub invoke_button_down {
1958 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
1959 2115
1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1962 $self->{state} = !$self->{state}; 2118 $self->toggle;
1963 $self->_emit (changed => $self->{state});
1964 } else { 2119 } else {
1965 return 0 2120 return 0
1966 } 2121 }
1967 2122
1968 1 2123 1
… …
1993package CFClient::UI::Image; 2148package CFClient::UI::Image;
1994 2149
1995our @ISA = CFClient::UI::Base::; 2150our @ISA = CFClient::UI::Base::;
1996 2151
1997use CFClient::OpenGL; 2152use CFClient::OpenGL;
1998use Carp qw/confess/;
1999 2153
2000our %loaded_images; 2154our %texture_cache;
2001 2155
2002sub new { 2156sub new {
2003 my $class = shift; 2157 my $class = shift;
2004 2158
2005 my $self = $class->SUPER::new (can_events => 0, @_); 2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
2006 2163
2007 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2164 $self->{path} || $self->{tex}
2165 or Carp::croak "'path' or 'tex' attributes required";
2008 2166
2009 $loaded_images{$self->{image}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2010 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2168 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2011 2169
2012 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
2013 2171
2014 Scalar::Util::weaken $loaded_images{$self->{image}}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2015
2016 $self->{aspect} = $tex->{w} / $tex->{h};
2017 2173
2018 $self 2174 $self
2019} 2175}
2020 2176
2021sub size_request { 2177sub size_request {
2022 my ($self) = @_; 2178 my ($self) = @_;
2023 2179
2024 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
2025} 2181}
2026 2182
2027sub _draw { 2183sub _draw {
2028 my ($self) = @_; 2184 my ($self) = @_;
2029 2185
… …
2138 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
2139 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
2140 2296
2141 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
2142 my $h2 = $self->{h} * (1 - $ycut2); 2298 my $h2 = $self->{h} * (1 - $ycut2);
2299 my $h3 = $self->{h};
2300
2301 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2143 2302
2144 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
2145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2304 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2305 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2146 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
2147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2307 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2148 2308
2149 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2309 glBindTexture GL_TEXTURE_2D, $t1->{name};
2150 glBegin GL_QUADS; 2310 glBegin GL_QUADS;
… …
2165 2325
2166 if ($t3) { 2326 if ($t3) {
2167 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
2168 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
2169 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2170 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2171 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2172 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2173 glEnd; 2333 glEnd;
2174 } 2334 }
2175 2335
2176 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2264 $self->update; 2424 $self->update;
2265 2425
2266 $self 2426 $self
2267} 2427}
2268 2428
2269sub changed { }
2270
2271sub set_range { 2429sub set_range {
2272 my ($self, $range) = @_; 2430 my ($self, $range) = @_;
2273 2431
2274 ($range, $self->{range}) = ($self->{range}, $range); 2432 ($range, $self->{range}) = ($self->{range}, $range);
2275 2433
2276 $self->update
2277 if "@$range" ne "@{$self->{range}}"; 2434 if ("@$range" ne "@{$self->{range}}") {
2435 $self->update;
2436 $self->set_value ($self->{range}[0]);
2437 }
2278} 2438}
2279 2439
2280sub set_value { 2440sub set_value {
2281 my ($self, $value) = @_; 2441 my ($self, $value) = @_;
2282 2442
… …
2293 if $unit; 2453 if $unit;
2294 2454
2295 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2455 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2296 2456
2297 if ($value != $old_value) { 2457 if ($value != $old_value) {
2298 $self->_emit (changed => $value); 2458 $self->emit (changed => $value);
2299 $self->update; 2459 $self->update;
2300 } 2460 }
2301} 2461}
2302 2462
2303sub size_request { 2463sub size_request {
2304 my ($self) = @_; 2464 my ($self) = @_;
2305 2465
2306 ($self->{req_w}, $self->{req_h}) 2466 ($self->{req_w}, $self->{req_h})
2307} 2467}
2308 2468
2309sub button_down { 2469sub invoke_button_down {
2310 my ($self, $ev, $x, $y) = @_; 2470 my ($self, $ev, $x, $y) = @_;
2311 2471
2312 $self->SUPER::button_down ($ev, $x, $y); 2472 $self->SUPER::invoke_button_down ($ev, $x, $y);
2313 2473
2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2474 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2315 2475
2316 $self->mouse_motion ($ev, $x, $y) 2476 $self->invoke_mouse_motion ($ev, $x, $y)
2317} 2477}
2318 2478
2319sub mouse_motion { 2479sub invoke_mouse_motion {
2320 my ($self, $ev, $x, $y) = @_; 2480 my ($self, $ev, $x, $y) = @_;
2321 2481
2322 if ($GRAB == $self) { 2482 if ($GRAB == $self) {
2323 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2483 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2324 2484
… …
2332 } 2492 }
2333 2493
2334 1 2494 1
2335} 2495}
2336 2496
2497sub invoke_mouse_wheel {
2498 my ($self, $ev) = @_;
2499
2500 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501
2502 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2503
2504 ! ! $delta
2505}
2506
2337sub update { 2507sub update {
2338 my ($self) = @_; 2508 my ($self) = @_;
2339 2509
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2510 delete $self->{knob_w};
2511 $self->SUPER::update;
2512}
2513
2514sub _draw {
2515 my ($self) = @_;
2516
2517 unless ($self->{knob_w}) {
2341 $self->set_value ($self->{range}[0]); 2518 $self->set_value ($self->{range}[0]);
2342 2519
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2520 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2521 my $range = ($hi - $page - $lo) || 1e-100;
2345 2522
… …
2351 $value = ($value - $lo) / $range; 2528 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2529 $value = $value * $self->{scale} + $self->{offset};
2353 2530
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2531 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2532 $self->{knob_w} = $knob_w;
2356 }); 2533 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2534
2364 $self->SUPER::_draw (); 2535 $self->SUPER::_draw ();
2365 2536
2366 glScale $self->{w}, $self->{h}; 2537 glScale $self->{w}, $self->{h};
2367 2538
… …
2428sub set_range { shift->{slider}->set_range (@_) } 2599sub set_range { shift->{slider}->set_range (@_) }
2429sub set_value { shift->{slider}->set_value (@_) } 2600sub set_value { shift->{slider}->set_value (@_) }
2430 2601
2431############################################################################# 2602#############################################################################
2432 2603
2433package CFClient::UI::TextView; 2604package CFClient::UI::TextScroller;
2434 2605
2435our @ISA = CFClient::UI::HBox::; 2606our @ISA = CFClient::UI::HBox::;
2436 2607
2437use CFClient::OpenGL; 2608use CFClient::OpenGL;
2438 2609
2439sub new { 2610sub new {
2440 my $class = shift; 2611 my $class = shift;
2441 2612
2442 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2443 fontsize => 1, 2614 fontsize => 1,
2444 can_events => 0, 2615 can_events => 1,
2616 indent => 0,
2445 #font => default_font 2617 #font => default_font
2446 @_, 2618 @_,
2447 2619
2448 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2449 par => [], 2621 par => [],
2450 height => 0, 2622 height => 0,
2451 children => [ 2623 children => [
2452 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2453 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2464 2636
2465 $self->{fontsize} = $fontsize; 2637 $self->{fontsize} = $fontsize;
2466 $self->reflow; 2638 $self->reflow;
2467} 2639}
2468 2640
2641sub size_request {
2642 my ($self) = @_;
2643
2644 my ($empty, $slider) = @{ $self->{children} };
2645
2646 local $self->{children} = [$empty, $slider];
2647 $self->SUPER::size_request
2648}
2649
2469sub size_allocate { 2650sub invoke_size_allocate {
2470 my ($self, $w, $h) = @_; 2651 my ($self, $w, $h) = @_;
2471 2652
2472 $self->SUPER::size_allocate ($w, $h); 2653 my ($empty, $slider, @other) = @{ $self->{children} };
2654 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2473 2655
2474 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2656 $self->{layout}->set_font ($self->{font}) if $self->{font};
2475 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2657 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2476 $self->{layout}->set_width ($self->{children}[0]{w}); 2658 $self->{layout}->set_width ($empty->{w});
2659 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2477 2660
2478 $self->reflow; 2661 $self->reflow;
2479}
2480 2662
2481sub text_size { 2663 local $self->{children} = [$empty, $slider];
2664 $self->SUPER::invoke_size_allocate ($w, $h)
2665}
2666
2667sub invoke_mouse_wheel {
2482 my ($self, $text, $indent) = @_; 2668 my ($self, $ev) = @_;
2669
2670 return 0 unless $ev->{dy}; # only vertical movements
2671
2672 $self->{children}[1]->emit (mouse_wheel => $ev);
2673
2674 1
2675}
2676
2677sub get_layout {
2678 my ($self, $para) = @_;
2483 2679
2484 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2485 2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683 $layout->set_foreground (@{$para->{fg}});
2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2684 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $layout->set_width ($self->{children}[0]{w} - $indent); 2685 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2686 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488 $layout->set_markup ($text); 2687 $layout->set_markup ($para->{markup});
2688
2689 $layout->set_shapes (
2690 map
2691 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2692 @{$para->{widget}}
2489 2693 );
2694
2490 $layout->size 2695 $layout
2491} 2696}
2492 2697
2493sub reflow { 2698sub reflow {
2494 my ($self) = @_; 2699 my ($self) = @_;
2495 2700
… …
2504 $self->{children}[1]->set_value ($offset); 2709 $self->{children}[1]->set_value ($offset);
2505} 2710}
2506 2711
2507sub clear { 2712sub clear {
2508 my ($self) = @_; 2713 my ($self) = @_;
2714
2715 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other;
2509 2717
2510 $self->{par} = []; 2718 $self->{par} = [];
2511 $self->{height} = 0; 2719 $self->{height} = 0;
2512 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2513} 2721}
2514 2722
2515sub add_paragraph { 2723sub add_paragraph {
2516 my ($self, $color, $text, $indent) = @_; 2724 my ($self, $color, $para, $indent) = @_;
2517 2725
2518 for my $line (split /\n/, $text) { 2726 my ($text, @w) = ref $para ? @$para : $para;
2519 my ($w, $h) = $self->text_size ($line); 2727
2520 $self->{height} += $h; 2728 $para = {
2521 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2729 w => 1e10,
2730 wrapped => 1,
2731 fg => $color,
2732 indent => $indent,
2733 markup => $text,
2734 widget => \@w,
2522 } 2735 };
2523 2736
2524 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2737 $self->add (@w) if @w;
2738 push @{$self->{par}}, $para;
2739
2740 $self->{need_reflow}++;
2741 $self->update;
2742}
2743
2744sub scroll_to_bottom {
2745 my ($self) = @_;
2746
2747 $self->{scroll_to_bottom} = 1;
2748 $self->update;
2525} 2749}
2526 2750
2527sub update { 2751sub update {
2528 my ($self) = @_; 2752 my ($self) = @_;
2529 2753
… …
2531 2755
2532 return unless $self->{h} > 0; 2756 return unless $self->{h} > 0;
2533 2757
2534 delete $self->{texture}; 2758 delete $self->{texture};
2535 2759
2536 $ROOT->on_post_alloc ($self, sub { 2760 $ROOT->on_post_alloc ($self => sub {
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538 2762
2539 if (delete $self->{need_reflow}) { 2763 if (delete $self->{need_reflow}) {
2540 my $height = 0; 2764 my $height = 0;
2541 2765
2542 my $layout = $self->{layout};
2543
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545
2546 for (@{$self->{par}}) { 2766 for my $para (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2548 $layout->set_width ($W - $_->[3]); 2768 my $layout = $self->get_layout ($para);
2549 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size; 2769 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3]; 2770
2552 $_->[1] = $h; 2771 $para->{w} = $w + $para->{indent};
2772 $para->{h} = $h;
2773 $para->{wrapped} = $layout->has_wrapped;
2553 } 2774 }
2554 2775
2555 $height += $_->[1]; 2776 $height += $para->{h};
2556 } 2777 }
2557 2778
2558 $self->{height} = $height; 2779 $self->{height} = $height;
2559 2780
2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2781 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2561 2782
2562 delete $self->{texture}; 2783 delete $self->{texture};
2563 } 2784 }
2564 2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2788 }
2789
2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2790 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2566 glClearColor 0.5, 0.5, 0.5, 0; 2791 glClearColor 0, 0, 0, 0;
2567 glClear GL_COLOR_BUFFER_BIT; 2792 glClear GL_COLOR_BUFFER_BIT;
2568 2793
2569 my $top = int $self->{children}[1]{range}[0]; 2794 my $top = int $self->{children}[1]{range}[0];
2570 2795
2571 my $y0 = $top; 2796 my $y0 = $top;
2572 my $y1 = $top + $H; 2797 my $y1 = $top + $H;
2573 2798
2574 my $y = 0; 2799 my $y = 0;
2575 2800
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}}) { 2801 for my $para (@{$self->{par}}) {
2585 my $h = $par->[1]; 2802 my $h = $para->{h};
2586 2803
2587 if ($y0 < $y + $h && $y < $y1) { 2804 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 2805
2592 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2806 my $layout = $self->get_layout ($para);
2593 2807
2594 glRasterPos $par->[3], $y - $y0; 2808 $layout->render ($para->{indent}, $y - $y0);
2595 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2809
2810 if (my @w = @{ $para->{widget} }) {
2811 my @s = $layout->get_shapes;
2812
2813 for (@w) {
2814 my ($dx, $dy) = splice @s, 0, 2, ();
2815
2816 $_->{x} = $dx + $para->{indent};
2817 $_->{y} = $dy + $y - $y0;
2818
2819 $_->draw;
2820 }
2821 }
2596 } 2822 }
2597 2823
2598 $y += $h; 2824 $y += $h;
2599 } 2825 }
2600
2601 glDisable GL_BLEND;
2602 }; 2826 };
2603 }); 2827 });
2604} 2828}
2605 2829
2830sub reconfigure {
2831 my ($self) = @_;
2832
2833 $self->SUPER::reconfigure;
2834
2835 $_->{w} = 1e10 for @{ $self->{par} };
2836 $self->reflow;
2837}
2838
2606sub _draw { 2839sub _draw {
2607 my ($self) = @_; 2840 my ($self) = @_;
2608 2841
2609 glEnable GL_TEXTURE_2D; 2842 glEnable GL_TEXTURE_2D;
2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2843 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611 glColor 1, 1, 1, 1; 2844 glColor 0, 0, 0, 1;
2612 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2845 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2613 glDisable GL_TEXTURE_2D; 2846 glDisable GL_TEXTURE_2D;
2614 2847
2615 $self->{children}[1]->draw; 2848 $self->{children}[1]->draw;
2616
2617} 2849}
2618 2850
2619############################################################################# 2851#############################################################################
2620 2852
2621package CFClient::UI::Animator; 2853package CFClient::UI::Animator;
… …
2708 $tooltip .= "\n\n" . (ref $widget) . "\n" 2940 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2941 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n" 2942 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}"; 2943 . "visible $widget->{visible}";
2712 } 2944 }
2945
2946 $tooltip =~ s/^\n+//;
2947 $tooltip =~ s/\n+$//;
2713 2948
2714 $self->add (new CFClient::UI::Label 2949 $self->add (new CFClient::UI::Label
2715 markup => $tooltip, 2950 markup => $tooltip,
2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2717 fontsize => 0.8, 2952 fontsize => 0.8,
… …
2727 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2728 2963
2729 ($w + 4, $h + 4) 2964 ($w + 4, $h + 4)
2730} 2965}
2731 2966
2732sub size_allocate { 2967sub invoke_size_allocate {
2733 my ($self, $w, $h) = @_; 2968 my ($self, $w, $h) = @_;
2734 2969
2735 $self->SUPER::size_allocate ($w - 4, $h - 4); 2970 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2736} 2971}
2737 2972
2738sub visibility_change { 2973sub invoke_visibility_change {
2739 my ($self, $visible) = @_; 2974 my ($self, $visible) = @_;
2740 2975
2741 return unless $visible; 2976 return unless $visible;
2742 2977
2743 $self->{root}->on_post_alloc ("move_$self" => sub { 2978 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2745 or return; 2980 or return;
2746 2981
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2982 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748 2983
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2984 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH; 2985 if $x + $self->{w} > $self->{root}{w};
2751 2986
2752 $self->move_abs ($x, $y); 2987 $self->move_abs ($x, $y);
2753 }); 2988 });
2754} 2989}
2755 2990
… …
2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3079 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2845 3080
2846 if ($tex) { 3081 if ($tex) {
2847 glEnable GL_TEXTURE_2D; 3082 glEnable GL_TEXTURE_2D;
2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3083 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849 glColor 1, 1, 1, 1; 3084 glColor 0, 0, 0, 1;
2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3085 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851 glDisable GL_TEXTURE_2D; 3086 glDisable GL_TEXTURE_2D;
2852 } 3087 }
2853} 3088}
2854 3089
2855sub DESTROY { 3090sub destroy {
2856 my ($self) = @_; 3091 my ($self) = @_;
2857 3092
2858 $self->{timer}->cancel 3093 $self->{timer}->cancel
2859 if $self->{timer}; 3094 if $self->{timer};
2860 3095
2861 $self->SUPER::DESTROY; 3096 $self->SUPER::destroy;
2862} 3097}
2863 3098
2864############################################################################# 3099#############################################################################
2865 3100
2866package CFClient::UI::Buttonbar; 3101package CFClient::UI::Buttonbar;
… …
2887 ); 3122 );
2888 3123
2889 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3124 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2890 3125
2891 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
2892 my ($widget, $cb) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
2893 3128
2894 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
2895 if (!ref $widget) { 3130 if (!ref $widget) {
3131 if ($widget =~ /\t/) {
3132 my ($left, $right) = split /\t/, $widget, 2;
3133
3134 $widget = new CFClient::UI::HBox
3135 can_hover => 1,
3136 can_events => 1,
3137 tooltip => $tooltip,
3138 children => [
3139 (new CFClient::UI::Label markup => $left, expand => 1),
3140 (new CFClient::UI::Label markup => $right, align => +1),
3141 ],
3142 ;
3143
3144 } else {
2896 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
2897 can_hover => 1, 3146 can_hover => 1,
2898 can_events => 1, 3147 can_events => 1,
2899 text => $widget; 3148 markup => $widget,
3149 tooltip => $tooltip;
3150 }
2900 } 3151 }
2901 3152
2902 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
2903 3154
2904 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
2909 3160
2910# popup given the event (must be a mouse button down event currently) 3161# popup given the event (must be a mouse button down event currently)
2911sub popup { 3162sub popup {
2912 my ($self, $ev) = @_; 3163 my ($self, $ev) = @_;
2913 3164
2914 $self->_emit ("popdown"); 3165 $self->emit ("popdown");
2915 3166
2916 # maybe save $GRAB? must be careful about events... 3167 # maybe save $GRAB? must be careful about events...
2917 $GRAB = $self; 3168 $GRAB = $self;
2918 $self->{button} = $ev->{button}; 3169 $self->{button} = $ev->{button};
2919 3170
2920 $self->show; 3171 $self->show;
2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3172 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2922} 3173}
2923 3174
2924sub mouse_motion { 3175sub invoke_mouse_motion {
2925 my ($self, $ev, $x, $y) = @_; 3176 my ($self, $ev, $x, $y) = @_;
2926 3177
2927 # TODO: should use vbox->find_widget or so 3178 # TODO: should use vbox->find_widget or so
2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3179 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2929 $self->{hover} = $self->{item}{$HOVER}; 3180 $self->{hover} = $self->{item}{$HOVER};
2930 3181
2931 0 3182 0
2932} 3183}
2933 3184
2934sub button_up { 3185sub invoke_button_up {
2935 my ($self, $ev, $x, $y) = @_; 3186 my ($self, $ev, $x, $y) = @_;
2936 3187
2937 if ($ev->{button} == $self->{button}) { 3188 if ($ev->{button} == $self->{button}) {
2938 undef $GRAB; 3189 undef $GRAB;
2939 $self->hide; 3190 $self->hide;
2940 3191
2941 $self->_emit ("popdown"); 3192 $self->emit ("popdown");
2942 $self->{hover}[1]->() if $self->{hover}; 3193 $self->{hover}[1]->() if $self->{hover};
2943 } else { 3194 } else {
2944 return 0 3195 return 0
2945 } 3196 }
2946 3197
… …
2973 3224
2974 $self->{current} = $self->{children}[0] 3225 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} }; 3226 if @{ $self->{children} };
2976} 3227}
2977 3228
3229sub get_current_page {
3230 my ($self) = @_;
3231
3232 $self->{current}
3233}
3234
2978sub set_current_page { 3235sub set_current_page {
2979 my ($self, $page_or_widget) = @_; 3236 my ($self, $page_or_widget) = @_;
2980 3237
2981 my $widget = ref $page_or_widget 3238 my $widget = ref $page_or_widget
2982 ? $page_or_widget 3239 ? $page_or_widget
2983 : $self->{children}[$page_or_widget]; 3240 : $self->{children}[$page_or_widget];
2984 3241
2985 $self->{current} = $widget; 3242 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3243 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987 3244
2988 $self->_emit (page_changed => $self->{current}); 3245 $self->emit (page_changed => $self->{current});
2989 3246
2990 $self->realloc; 3247 $self->realloc;
2991} 3248}
2992 3249
2993sub visible_children { 3250sub visible_children {
… …
2998 my ($self) = @_; 3255 my ($self) = @_;
2999 3256
3000 $self->{current}->size_request 3257 $self->{current}->size_request
3001} 3258}
3002 3259
3003sub size_allocate { 3260sub invoke_size_allocate {
3004 my ($self, $w, $h) = @_; 3261 my ($self, $w, $h) = @_;
3005 3262
3006 $self->{current}->configure (0, 0, $w, $h); 3263 $self->{current}->configure (0, 0, $w, $h);
3264
3265 1
3007} 3266}
3008 3267
3009sub _draw { 3268sub _draw {
3010 my ($self) = @_; 3269 my ($self) = @_;
3011 3270
… …
3022 my $class = shift; 3281 my $class = shift;
3023 3282
3024 my $self = $class->SUPER::new ( 3283 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3284 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3285 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3286 # filter => # will be put between multiplexer and $self
3027 @_, 3287 @_,
3028 ); 3288 );
3029 3289
3290 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3291 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3292
3032 $self 3293 $self
3033} 3294}
3034 3295
3035sub add { 3296sub add {
… …
3044 ); 3305 );
3045 3306
3046 $self->{multiplexer}->add ($widget); 3307 $self->{multiplexer}->add ($widget);
3047} 3308}
3048 3309
3310sub get_current_page {
3311 my ($self) = @_;
3312
3313 $self->{multiplexer}->get_current_page
3314}
3315
3049sub set_current_page { 3316sub set_current_page {
3050 my ($self, $page) = @_; 3317 my ($self, $page) = @_;
3051 3318
3052 $self->{multiplexer}->set_current_page ($page); 3319 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current}); 3320 $self->emit (page_changed => $self->{multiplexer}{current});
3054} 3321}
3055 3322
3056############################################################################# 3323#############################################################################
3057 3324
3058package CFClient::UI::Statusbox; 3325package CFClient::UI::Combobox;
3059 3326
3327use utf8;
3328
3060our @ISA = CFClient::UI::VBox::; 3329our @ISA = CFClient::UI::Button::;
3061 3330
3062sub new { 3331sub new {
3063 my $class = shift; 3332 my $class = shift;
3064 3333
3065 $class->SUPER::new ( 3334 my $self = $class->SUPER::new (
3335 options => [], # [value, title, longdesc], ...
3336 value => undef,
3337 @_,
3338 );
3339
3340 $self->_set_value ($self->{value});
3341
3342 $self
3343}
3344
3345sub invoke_button_down {
3346 my ($self, $ev) = @_;
3347
3348 my @menu_items;
3349
3350 for (@{ $self->{options} }) {
3351 my ($value, $title, $tooltip) = @$_;
3352
3353 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354 }
3355
3356 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357}
3358
3359sub _set_value {
3360 my ($self, $value) = @_;
3361
3362 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3363 or return;
3364
3365 $self->{value} = $item->[0];
3366 $self->set_markup ("$item->[1] ⇓");
3367 $self->set_tooltip ($item->[2]);
3368}
3369
3370sub set_value {
3371 my ($self, $value) = @_;
3372
3373 return unless $self->{value} ne $value;
3374
3375 $self->_set_value ($value);
3376 $self->emit (changed => $value);
3377}
3378
3379#############################################################################
3380
3381package CFClient::UI::Statusbox;
3382
3383our @ISA = CFClient::UI::VBox::;
3384
3385sub new {
3386 my $class = shift;
3387
3388 my $self = $class->SUPER::new (
3066 fontsize => 0.8, 3389 fontsize => 0.8,
3067 @_, 3390 @_,
3068 ) 3391 );
3392
3393 Scalar::Util::weaken (my $this = $self);
3394
3395 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3396
3397 $self
3069} 3398}
3070 3399
3071sub reorder { 3400sub reorder {
3072 my ($self) = @_; 3401 my ($self) = @_;
3073 my $NOW = time; 3402 my $NOW = Time::HiRes::time;
3403
3404 # freeze display when hovering over any label
3405 return if $CFClient::UI::TOOLTIP->{owner}
3406 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3407 values %{ $self->{item} };
3074 3408
3075 while (my ($k, $v) = each %{ $self->{item} }) { 3409 while (my ($k, $v) = each %{ $self->{item} }) {
3076 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3410 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077 } 3411 }
3078 3412
… …
3081 my @items = sort { 3415 my @items = sort {
3082 $a->{pri} <=> $b->{pri} 3416 $a->{pri} <=> $b->{pri}
3083 or $b->{id} <=> $a->{id} 3417 or $b->{id} <=> $a->{id}
3084 } values %{ $self->{item} }; 3418 } values %{ $self->{item} };
3085 3419
3420 $self->{timer}->interval (1);
3421
3086 my $count = 10 + 1; 3422 my $count = 10 + 1;
3087 for my $item (@items) { 3423 for my $item (@items) {
3088 last unless --$count; 3424 last unless --$count;
3089 3425
3090 push @widgets, $item->{label} ||= do { 3426 my $label = $item->{label} ||= do {
3091 # TODO: doesn't handle markup well (read as: at all) 3427 # TODO: doesn't handle markup well (read as: at all)
3092 my $short = $item->{count} > 1 3428 my $short = $item->{count} > 1
3093 ? "<b>$item->{count} ×</b> $item->{text}" 3429 ? "<b>$item->{count} ×</b> $item->{text}"
3094 : $item->{text}; 3430 : $item->{text};
3095 3431
… …
3103 tooltip => $item->{tooltip}, 3439 tooltip => $item->{tooltip},
3104 tooltip_font => $::FONT_PROP, 3440 tooltip_font => $::FONT_PROP,
3105 tooltip_width => 0.67, 3441 tooltip_width => 0.67,
3106 fontsize => $item->{fontsize} || $self->{fontsize}, 3442 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44, 3443 max_w => $::WIDTH * 0.44,
3108 fg => $item->{fg}, 3444 fg => [@{ $item->{fg} }],
3109 can_events => 1, 3445 can_events => 1,
3110 can_hover => 1 3446 can_hover => 1
3111 }; 3447 };
3448
3449 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3450 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3451 $label->update;
3452 $label->set_max_size (undef, $label->{req_h} * $diff)
3453 if $diff < 1;
3454 $self->{timer}->interval (1/30);
3455 } else {
3456 $label->{fg}[3] = $item->{fg}[3] || 1;
3457 }
3458
3459 push @widgets, $label;
3112 } 3460 }
3113 3461
3114 $self->clear; 3462 $self->clear;
3115 $self->SUPER::add (reverse @widgets); 3463 $self->SUPER::add (reverse @widgets);
3116} 3464}
… …
3121 $text =~ s/^\s+//; 3469 $text =~ s/^\s+//;
3122 $text =~ s/\s+$//; 3470 $text =~ s/\s+$//;
3123 3471
3124 return unless $text; 3472 return unless $text;
3125 3473
3126 my $timeout = time + ((delete $arg{timeout}) || 60); 3474 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3127 3475
3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3476 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129 3477
3130 if (my $item = $self->{item}{$group}) { 3478 if (my $item = $self->{item}{$group}) {
3131 if ($item->{text} eq $text) { 3479 if ($item->{text} eq $text) {
3132 $item->{count}++; 3480 $item->{count}++;
3133 } else { 3481 } else {
3134 $item->{count} = 1; 3482 $item->{count} = 1;
3135 $item->{text} = $item->{tooltip} = $text; 3483 $item->{text} = $item->{tooltip} = $text;
3136 } 3484 }
3137 $item->{id} = ++$self->{id}; 3485 $item->{id} += 0.2;#d#
3138 $item->{timeout} = $timeout; 3486 $item->{timeout} = $timeout;
3139 delete $item->{label}; 3487 delete $item->{label};
3140 } else { 3488 } else {
3141 $self->{item}{$group} = { 3489 $self->{item}{$group} = {
3142 id => ++$self->{id}, 3490 id => ++$self->{id},
… …
3148 count => 1, 3496 count => 1,
3149 %arg, 3497 %arg,
3150 }; 3498 };
3151 } 3499 }
3152 3500
3501 $ROOT->on_refresh (reorder => sub {
3153 $self->reorder; 3502 $self->reorder;
3503 });
3154} 3504}
3155 3505
3156sub reconfigure { 3506sub reconfigure {
3157 my ($self) = @_; 3507 my ($self) = @_;
3158 3508
… …
3161 3511
3162 $self->reorder; 3512 $self->reorder;
3163 $self->SUPER::reconfigure; 3513 $self->SUPER::reconfigure;
3164} 3514}
3165 3515
3516sub destroy {
3517 my ($self) = @_;
3518
3519 $self->{timer}->cancel;
3520
3521 $self->SUPER::destroy;
3522}
3523
3166############################################################################# 3524#############################################################################
3167 3525
3168package CFClient::UI::Inventory; 3526package CFClient::UI::Inventory;
3169 3527
3170our @ISA = CFClient::UI::ScrolledWindow::; 3528our @ISA = CFClient::UI::Table::;
3171 3529
3172sub new { 3530sub new {
3173 my $class = shift; 3531 my $class = shift;
3174 3532
3175 my $self = $class->SUPER::new ( 3533 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3534 col_expand => [0, 1, 0],
3177 @_, 3535 @_,
3178 ); 3536 );
3179 3537
3180 $self 3538 $self
3181} 3539}
3182 3540
3183sub set_items { 3541sub set_items {
3184 my ($self, $items) = @_; 3542 my ($self, $items) = @_;
3185 3543
3186 $self->{scrolled}->clear; 3544 $self->clear;
3187 return unless $items; 3545 return unless $items;
3188 3546
3189 my @items = sort { 3547 my @items = sort {
3190 ($a->{type} <=> $b->{type}) 3548 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name}) 3549 or ($a->{name} cmp $b->{name})
3192 } @$items; 3550 } values %$items;
3193 3551
3194 $self->{real_items} = \@items; 3552 $self->{real_items} = \@items;
3195 3553
3196 my $row = 0; 3554 my $row = 0;
3197 for my $item (@items) { 3555 for my $item (@items) {
3198 CFClient::Item::update_widgets $item; 3556 CFClient::Item::update_widgets $item;
3199 3557
3200 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3558 $self->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3559 $self->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3560 $self->add (2, $row, $item->{weight_widget});
3203 3561
3204 $row++; 3562 $row++;
3205 } 3563 }
3206} 3564}
3207 3565
3208############################################################################# 3566#############################################################################
3209 3567
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; 3568package CFClient::UI::SpellList;
3408 3569
3409our @ISA = CFClient::UI::ScrolledWindow::; 3570our @ISA = CFClient::UI::Table::;
3410 3571
3411sub new { 3572sub new {
3412 my $class = shift; 3573 my $class = shift;
3413 3574
3414 my $self = $class->SUPER::new ( 3575 my $self = $class->SUPER::new (
3415 binding => [], 3576 binding => [],
3416 commands => [], 3577 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_, 3578 @_,
3419 ) 3579 )
3420} 3580}
3421 3581
3422# XXX: Do sorting? Argl... 3582my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3583
3584my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3585 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3586my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3587 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3588my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3589 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3590my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3591 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3592my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3593 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3594
3595sub rebuild_spell_list {
3596 my ($self) = @_;
3597
3598 $CFClient::UI::ROOT->on_refresh ($self => sub {
3599 $self->clear;
3600
3601 return unless $::CONN;
3602
3603 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3604 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3605 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3606 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3607 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3608
3609 my $row = 0;
3610
3611 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3612 my $spell = $self->{spell}{$_};
3613
3614 $row++;
3615
3616 my $spell_cb = sub {
3617 my ($widget, $ev) = @_;
3618
3619 if ($ev->{button} == 1) {
3620 $::CONN->user_send ("cast $spell->{name}");
3621 } elsif ($ev->{button} == 2) {
3622 $::CONN->user_send ("invoke $spell->{name}");
3623 } elsif ($ev->{button} == 3) {
3624 (new CFClient::UI::Menu
3625 items => [
3626 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3627 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3628 ],
3629 )->popup ($ev);
3630 } else {
3631 return 0;
3632 }
3633
3634 1
3635 };
3636
3637 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3638
3639 #TODO: add path info to tooltip
3640 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3641
3642 $self->add (0, $row, new CFClient::UI::Face
3643 face => $spell->{face},
3644 can_hover => 1,
3645 can_events => 1,
3646 tooltip => $tooltip,
3647 on_button_down => $spell_cb,
3648 );
3649
3650 $self->add (1, $row, new CFClient::UI::Label
3651 expand => 1,
3652 text => $spell->{name},
3653 can_hover => 1,
3654 can_events => 1,
3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3657 );
3658
3659 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3660 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3661 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3662 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3663 }
3664 });
3665}
3666
3423sub add_spell { 3667sub add_spell {
3424 my ($self, $spell) = @_; 3668 my ($self, $spell) = @_;
3669
3425 $self->{spells}->{$spell->{name}} = $spell; 3670 $self->{spell}->{$spell->{name}} = $spell;
3426 3671 $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} 3672}
3455 3673
3456sub remove_spell { 3674sub remove_spell {
3457 my ($self, $spell) = @_; 3675 my ($self, $spell) = @_;
3676
3458 delete $self->{spells}->{$spell->{name}}; 3677 delete $self->{spell}->{$spell->{name}};
3459 $self->rebuild_spell_list; 3678 $self->rebuild_spell_list;
3460} 3679}
3461 3680
3681sub clear_spells {
3682 my ($self) = @_;
3683
3684 $self->{spell} = {};
3685 $self->rebuild_spell_list;
3686}
3687
3462############################################################################# 3688#############################################################################
3463 3689
3464package CFClient::UI::Root; 3690package CFClient::UI::Root;
3465 3691
3466our @ISA = CFClient::UI::Container::; 3692our @ISA = CFClient::UI::Container::;
3693
3694use List::Util qw(min max);
3467 3695
3468use CFClient::OpenGL; 3696use CFClient::OpenGL;
3469 3697
3470sub new { 3698sub new {
3471 my $class = shift; 3699 my $class = shift;
… …
3498 $coord = $max - $size if $coord > $max - $size; 3726 $coord = $max - $size if $coord > $max - $size;
3499 3727
3500 int $coord + 0.5 3728 int $coord + 0.5
3501} 3729}
3502 3730
3503sub size_allocate { 3731sub invoke_size_allocate {
3504 my ($self, $w, $h) = @_; 3732 my ($self, $w, $h) = @_;
3505 3733
3506 for my $child ($self->children) { 3734 for my $child ($self->children) {
3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3735 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3508 3736
… …
3512 $X = _to_pixel $X, $W, $self->{w}; 3740 $X = _to_pixel $X, $W, $self->{w};
3513 $Y = _to_pixel $Y, $H, $self->{h}; 3741 $Y = _to_pixel $Y, $H, $self->{h};
3514 3742
3515 $child->configure ($X, $Y, $W, $H); 3743 $child->configure ($X, $Y, $W, $H);
3516 } 3744 }
3745
3746 1
3517} 3747}
3518 3748
3519sub coord2local { 3749sub coord2local {
3520 my ($self, $x, $y) = @_; 3750 my ($self, $x, $y) = @_;
3521 3751
… …
3606 3836
3607 delete $queue{$widget+0}; 3837 delete $queue{$widget+0};
3608 3838
3609 my ($w, $h) = $widget->size_request; 3839 my ($w, $h) = $widget->size_request;
3610 3840
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3841 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3842 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3843
3844 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3845 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3613 3846
3614 $w = $widget->{force_w} if exists $widget->{force_w}; 3847 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h}; 3848 $h = $widget->{force_h} if exists $widget->{force_h};
3616 3849
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3850 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3643 3876
3644 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3645 3878
3646 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3647 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
3881
3882 $w = max $widget->{min_w}, $w;
3883 $h = max $widget->{min_h}, $h;
3884
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3648 3887
3649 $w = int $w + 0.5; 3888 $w = int $w + 0.5;
3650 $h = int $h + 0.5; 3889 $h = int $h + 0.5;
3651 3890
3652 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3891 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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