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.273 by root, Sat Jun 3 02:32:35 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
… …
970 $self->{vp}->set_offset (0, $_[1]); 1007 $self->{vp}->set_offset (0, $_[1]);
971 }, 1008 },
972 ; 1009 ;
973 1010
974 $self = $class->SUPER::new ( 1011 $self = $class->SUPER::new (
975 vp => (new CFClient::UI::ViewPort expand => 1), 1012 vp => (new CFClient::UI::ViewPort expand => 1),
1013 can_events => 1,
976 slider => $slider, 1014 slider => $slider,
977 %arg, 1015 %arg,
978 ); 1016 );
979 1017
980 $self->SUPER::add ($self->{vp}, $self->{slider}); 1018 $self->SUPER::add ($self->{vp}, $self->{slider});
981 $self->add ($child) if $child; 1019 $self->add ($child) if $child;
982 1020
983 $self 1021 $self
984} 1022}
985 1023
1024#TODO# update range on size_allocate depending on child
1025
986sub add { 1026sub add {
987 my ($self, $widget) = @_; 1027 my ($self, $widget) = @_;
988 1028
989 $self->{vp}->add ($self->{child} = $widget); 1029 $self->{vp}->add ($self->{child} = $widget);
990} 1030}
991 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
992sub update { 1048sub update {
993 my ($self) = @_; 1049 my ($self) = @_;
994 1050
995 $self->SUPER::update; 1051 $self->SUPER::update;
996 1052
997 # todo: overwrite size_allocate of child 1053 $self->update_slider;
998 my $child = $self->{vp}->child;
999 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1000} 1054}
1001 1055
1002sub size_allocate { 1056sub invoke_size_allocate {
1003 my ($self, $w, $h) = @_; 1057 my ($self, $w, $h) = @_;
1004 1058
1059 $self->update_slider;
1060
1005 $self->SUPER::size_allocate ($w, $h); 1061 $self->SUPER::invoke_size_allocate ($w, $h)
1006
1007 my $child = $self->{vp}->child;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009} 1062}
1010
1011#TODO# update range on size_allocate depending on child
1012# update viewport offset on scroll
1013 1063
1014############################################################################# 1064#############################################################################
1015 1065
1016package CFClient::UI::Frame; 1066package CFClient::UI::Frame;
1017 1067
… …
1033 1083
1034 if ($self->{bg}) { 1084 if ($self->{bg}) {
1035 my ($w, $h) = @$self{qw(w h)}; 1085 my ($w, $h) = @$self{qw(w h)};
1036 1086
1037 glEnable GL_BLEND; 1087 glEnable GL_BLEND;
1038 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1088 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1039 glColor @{ $self->{bg} }; 1089 glColor_premultiply @{ $self->{bg} };
1040 1090
1041 glBegin GL_QUADS; 1091 glBegin GL_QUADS;
1042 glVertex 0 , 0; 1092 glVertex 0 , 0;
1043 glVertex 0 , $h; 1093 glVertex 0 , $h;
1044 glVertex $w, $h; 1094 glVertex $w, $h;
… …
1068 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);
1069 1119
1070sub new { 1120sub new {
1071 my ($class, %arg) = @_; 1121 my ($class, %arg) = @_;
1072 1122
1073 my $title = delete $arg{title};
1074
1075 my $self = $class->SUPER::new ( 1123 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1124 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1125 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1126 border => 0.6,
1079 can_events => 1, 1127 can_events => 1,
1080 min_w => 16, 1128 min_w => 64,
1081 min_h => 16, 1129 min_h => 32,
1082 %arg, 1130 %arg,
1083 ); 1131 );
1084 1132
1085 $self->{title} = new CFClient::UI::Label 1133 $self->{title_widget} = new CFClient::UI::Label
1086 align => 0, 1134 align => 0,
1087 valign => 1, 1135 valign => 1,
1088 text => $title, 1136 text => $self->{title},
1089 fontsize => $self->{border} 1137 fontsize => $self->{border},
1090 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 }
1091 1148
1092 $self 1149 $self
1093} 1150}
1094 1151
1095sub add { 1152sub add {
1096 my ($self, @widgets) = @_; 1153 my ($self, @widgets) = @_;
1097 1154
1098 $self->SUPER::add (@widgets); 1155 $self->SUPER::add (@widgets);
1156 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1157 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1100} 1158}
1101 1159
1102sub border { 1160sub border {
1103 int $_[0]{border} * $::FONTSIZE 1161 int $_[0]{border} * $::FONTSIZE
1104} 1162}
1105 1163
1106sub size_request { 1164sub size_request {
1107 my ($self) = @_; 1165 my ($self) = @_;
1108 1166
1109 $self->{title}->size_request 1167 $self->{title_widget}->size_request
1110 if $self->{title}; 1168 if $self->{title_widget};
1169
1170 $self->{close_button}->size_request
1171 if $self->{close_button};
1111 1172
1112 my ($w, $h) = $self->SUPER::size_request; 1173 my ($w, $h) = $self->SUPER::size_request;
1113 1174
1114 ( 1175 (
1115 $w + $self->border * 2, 1176 $w + $self->border * 2,
1116 $h + $self->border * 2, 1177 $h + $self->border * 2,
1117 ) 1178 )
1118} 1179}
1119 1180
1120sub size_allocate { 1181sub invoke_size_allocate {
1121 my ($self, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
1122 1183
1123 if ($self->{title}) { 1184 if ($self->{title_widget}) {
1124 $self->{title}{w} = $w; 1185 $self->{title_widget}{w} = $w;
1125 $self->{title}{h} = $h; 1186 $self->{title_widget}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h); 1187 $self->{title_widget}->invoke_size_allocate ($w, $h);
1127 } 1188 }
1128 1189
1129 my $border = $self->border; 1190 my $border = $self->border;
1130 1191
1131 $h -= List::Util::max 0, $border * 2; 1192 $h -= List::Util::max 0, $border * 2;
1132 $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;
1133 1207
1134 $self->child->configure ($border, $border, $w, $h); 1208 1
1135} 1209}
1136 1210
1137sub button_down { 1211sub invoke_button_down {
1138 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1139 1213
1140 my ($w, $h) = @$self{qw(w h)}; 1214 my ($w, $h) = @$self{qw(w h)};
1141 my $border = $self->border; 1215 my $border = $self->border;
1142 1216
… …
1158 my $dy = $ev->{y} - $oy; 1232 my $dy = $ev->{y} - $oy;
1159 1233
1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1234 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1235 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162 1236
1237 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1163 $self->realloc; 1238 $self->realloc;
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 }; 1239 };
1166 1240
1167 } elsif ($lr ^ $td) { 1241 } elsif ($lr ^ $td) {
1168 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1242 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1169 my ($bx, $by) = ($self->{x}, $self->{y}); 1243 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1172 my ($ev, $x, $y) = @_; 1246 my ($ev, $x, $y) = @_;
1173 1247
1174 ($x, $y) = ($ev->{x}, $ev->{y}); 1248 ($x, $y) = ($ev->{x}, $ev->{y});
1175 1249
1176 $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});
1177 }; 1253 };
1178 } else { 1254 } else {
1179 return 0; 1255 return 0;
1180 } 1256 }
1181 1257
1182 1 1258 1
1183} 1259}
1184 1260
1185sub button_up { 1261sub invoke_button_up {
1186 my ($self, $ev, $x, $y) = @_; 1262 my ($self, $ev, $x, $y) = @_;
1187 1263
1188 !!delete $self->{motion} 1264 ! ! delete $self->{motion}
1189} 1265}
1190 1266
1191sub mouse_motion { 1267sub invoke_mouse_motion {
1192 my ($self, $ev, $x, $y) = @_; 1268 my ($self, $ev, $x, $y) = @_;
1193 1269
1194 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1270 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195 1271
1196 !!$self->{motion} 1272 ! ! $self->{motion}
1197} 1273}
1198 1274
1199sub _draw { 1275sub _draw {
1200 my ($self) = @_; 1276 my ($self) = @_;
1201 1277
… …
1227 1303
1228 glDisable GL_TEXTURE_2D; 1304 glDisable GL_TEXTURE_2D;
1229 1305
1230 $child->draw; 1306 $child->draw;
1231 1307
1232 if ($self->{title}) { 1308 if ($self->{title_widget}) {
1233 glTranslate 0, $border - $self->{h}; 1309 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw; 1310 $self->{title_widget}->_draw;
1311
1312 glTranslate 0, - ($border - $self->{h});
1235 } 1313 }
1314
1315 $self->{close_button}->draw
1316 if $self->{close_button};
1236} 1317}
1237 1318
1238############################################################################# 1319#############################################################################
1239 1320
1240package CFClient::UI::Table; 1321package CFClient::UI::Table;
… …
1263 1344
1264 $child->set_parent ($self); 1345 $child->set_parent ($self);
1265 $self->{children}[$y][$x] = $child; 1346 $self->{children}[$y][$x] = $child;
1266 1347
1267 $self->realloc; 1348 $self->realloc;
1349}
1350
1351sub remove {
1352 my ($self, $child) = @_;
1353
1354 # TODO: not yet implemented
1268} 1355}
1269 1356
1270# 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?
1271sub clear { 1358sub clear {
1272 my ($self) = @_; 1359 my ($self) = @_;
… …
1313 (sum @$ws), 1400 (sum @$ws),
1314 (sum @$hs), 1401 (sum @$hs),
1315 ) 1402 )
1316} 1403}
1317 1404
1318sub size_allocate { 1405sub invoke_size_allocate {
1319 my ($self, $w, $h) = @_; 1406 my ($self, $w, $h) = @_;
1320 1407
1321 my ($ws, $hs) = $self->get_wh; 1408 my ($ws, $hs) = $self->get_wh;
1322 1409
1323 my $req_w = (sum @$ws) || 1; 1410 my $req_w = (sum @$ws) || 1;
… …
1355 } 1442 }
1356 1443
1357 $y += $row_h; 1444 $y += $row_h;
1358 } 1445 }
1359 1446
1447 1
1360} 1448}
1361 1449
1362sub find_widget { 1450sub find_widget {
1363 my ($self, $x, $y) = @_; 1451 my ($self, $x, $y) = @_;
1364 1452
… …
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1489 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1490 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 ) 1491 )
1404} 1492}
1405 1493
1406sub size_allocate { 1494sub invoke_size_allocate {
1407 my ($self, $w, $h) = @_; 1495 my ($self, $w, $h) = @_;
1408 1496
1409 my $space = $self->{vertical} ? $h : $w; 1497 my $space = $self->{vertical} ? $h : $w;
1410 my $children = $self->{children}; 1498 my @children = $self->visible_children;
1411 1499
1412 my @req; 1500 my @req;
1413 1501
1414 if ($self->{homogeneous}) { 1502 if ($self->{homogeneous}) {
1415 @req = ($space / (@$children || 1)) x @$children; 1503 @req = ($space / (@children || 1)) x @children;
1416 } else { 1504 } else {
1417 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1505 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1418 my $req = List::Util::sum @req; 1506 my $req = List::Util::sum @req;
1419 1507
1420 if ($req > $space) { 1508 if ($req > $space) {
1421 # ah well, not enough space 1509 # ah well, not enough space
1422 $_ *= $space / $req for @req; 1510 $_ *= $space / $req for @req;
1423 } else { 1511 } else {
1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1512 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1425 1513
1426 $space = ($space - $req) / $expand; # remaining space to give away 1514 $space = ($space - $req) / $expand; # remaining space to give away
1427 1515
1428 $req[$_] += $space * $children->[$_]{expand} 1516 $req[$_] += $space * $children[$_]{expand}
1429 for 0 .. $#$children; 1517 for 0 .. $#children;
1430 } 1518 }
1431 } 1519 }
1432 1520
1433 CFClient::UI::harmonize \@req; 1521 CFClient::UI::harmonize \@req;
1434 1522
1435 my $pos = 0; 1523 my $pos = 0;
1436 for (0 .. $#$children) { 1524 for (0 .. $#children) {
1437 my $alloc = $req[$_]; 1525 my $alloc = $req[$_];
1438 $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));
1439 1527
1440 $pos += $alloc; 1528 $pos += $alloc;
1441 } 1529 }
1442 1530
1443 1 1531 1
… …
1533 1621
1534 delete $self->{texture}; 1622 delete $self->{texture};
1535 $self->SUPER::update; 1623 $self->SUPER::update;
1536} 1624}
1537 1625
1626sub realloc {
1627 my ($self) = @_;
1628
1629 delete $self->{ox};
1630 $self->SUPER::realloc;
1631}
1632
1538sub set_text { 1633sub set_text {
1539 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1540 1635
1541 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1542 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1543 1638
1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1545 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1546 1640
1641 delete $self->{size_req};
1547 $self->realloc; 1642 $self->realloc;
1548 $self->update; 1643 $self->update;
1549} 1644}
1550 1645
1551sub set_markup { 1646sub set_markup {
… …
1554 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1555 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1556 1651
1557 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1558 1653
1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1560 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1561 1655
1656 delete $self->{size_req};
1562 $self->realloc; 1657 $self->realloc;
1563 $self->update; 1658 $self->update;
1564} 1659}
1565 1660
1566sub size_request { 1661sub size_request {
1567 my ($self) = @_; 1662 my ($self) = @_;
1568 1663
1664 $self->{size_req} ||= do {
1569 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1665 $self->{layout}->set_font ($self->{font}) if $self->{font};
1570 $self->{layout}->set_width ($self->{max_w} || -1); 1666 $self->{layout}->set_width ($self->{max_w} || -1);
1571 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1667 $self->{layout}->set_ellipsise ($self->{ellipsise});
1572 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1668 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1669 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1574 1670
1575 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1576 1672
1577 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1578 $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);
1579 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1677
1581 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1582 1679
1583 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
1584 $h = List::Util::max $h, $h2; 1681 $h = List::Util::max $h, $h2;
1682 }
1683
1684 [$w, $h]
1585 } 1685 };
1586 1686
1587 ($w, $h) 1687 @{ $self->{size_req} }
1588} 1688}
1589 1689
1690sub baseline_shift {
1691 $_[0]{layout}->descent
1692}
1693
1590sub size_allocate { 1694sub invoke_size_allocate {
1591 my ($self, $w, $h) = @_; 1695 my ($self, $w, $h) = @_;
1592 1696
1593 delete $self->{ox}; 1697 delete $self->{ox};
1594 1698
1595 delete $self->{texture} 1699 delete $self->{texture}
1596 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
1597} 1703}
1598 1704
1599sub set_fontsize { 1705sub set_fontsize {
1600 my ($self, $fontsize) = @_; 1706 my ($self, $fontsize) = @_;
1601 1707
1602 $self->{fontsize} = $fontsize; 1708 $self->{fontsize} = $fontsize;
1709 delete $self->{size_req};
1603 delete $self->{texture}; 1710 delete $self->{texture};
1604 1711
1605 $self->realloc; 1712 $self->realloc;
1606} 1713}
1607 1714
1715sub reconfigure {
1716 my ($self) = @_;
1717
1718 delete $self->{size_req};
1719 delete $self->{texture};
1720
1721 $self->SUPER::reconfigure;
1722}
1723
1608sub _draw { 1724sub _draw {
1609 my ($self) = @_; 1725 my ($self) = @_;
1610 1726
1611 $self->SUPER::_draw; # draw background, if applicable 1727 $self->SUPER::_draw; # draw background, if applicable
1612 1728
1613 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1614 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1615 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1616 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1617 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1618 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1619 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1620 1736
1621 new_from_layout CFClient::Texture $self->{layout} 1737 [$self->{layout}->size]
1622 }; 1738 };
1623 1739
1624 unless (exists $self->{ox}) { 1740 unless (exists $self->{ox}) {
1625 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1741 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1626 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1742 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1627 : ($self->{w} - $tex->{w}) * 0.5); 1743 : ($self->{w} - $size->[0]) * 0.5);
1628 1744
1629 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1631 : ($self->{h} - $tex->{h}) * 0.5); 1747 : ($self->{h} - $size->[1]) * 0.5);
1632 }; 1748 };
1633 1749
1634 glEnable GL_TEXTURE_2D; 1750 my $w = List::Util::min $self->{w} + 4, $size->[0];
1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1751 my $h = List::Util::min $self->{h} + 2, $size->[1];
1636 1752
1637 if ($tex->{format} == GL_ALPHA) { 1753 $self->{layout}->render ($self->{ox}, $self->{oy});
1638 glColor @{$self->{fg}};
1639 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1640 } else {
1641 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1642 }
1643
1644 glDisable GL_TEXTURE_2D;
1645} 1754}
1646 1755
1647############################################################################# 1756#############################################################################
1648 1757
1649package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1663 can_hover => 1, 1772 can_hover => 1,
1664 can_focus => 1, 1773 can_focus => 1,
1665 valign => 0, 1774 valign => 0,
1666 can_events => 1, 1775 can_events => 1,
1667 #text => ... 1776 #text => ...
1777 #hidden => "*",
1668 @_ 1778 @_
1669 ) 1779 )
1670} 1780}
1671 1781
1672sub _set_text { 1782sub _set_text {
… …
1674 1784
1675 delete $self->{cur_h}; 1785 delete $self->{cur_h};
1676 1786
1677 return if $self->{text} eq $text; 1787 return if $self->{text} eq $text;
1678 1788
1679 delete $self->{texture};
1680
1681 $self->{last_activity} = $::NOW; 1789 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1790 $self->{text} = $text;
1683 1791
1684 $text =~ s/./*/g if $self->{hidden}; 1792 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1793 $self->{layout}->set_text ("$text ");
1794 delete $self->{size_req};
1686 1795
1687 $self->_emit (changed => $self->{text}); 1796 $self->emit (changed => $self->{text});
1797
1798 $self->realloc;
1799 $self->update;
1688} 1800}
1689 1801
1690sub set_text { 1802sub set_text {
1691 my ($self, $text) = @_; 1803 my ($self, $text) = @_;
1692 1804
1693 $self->{cursor} = length $text; 1805 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1806 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1807}
1698 1808
1699sub get_text { 1809sub get_text {
1700 $_[0]{text} 1810 $_[0]{text}
1701} 1811}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 1816 my ($w, $h) = $self->SUPER::size_request;
1707 1817
1708 ($w + 1, $h) # add 1 for cursor 1818 ($w + 1, $h) # add 1 for cursor
1709} 1819}
1710 1820
1711sub key_down { 1821sub invoke_key_down {
1712 my ($self, $ev) = @_; 1822 my ($self, $ev) = @_;
1713 1823
1714 my $mod = $ev->{mod}; 1824 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 1825 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 1826 my $uni = $ev->{unicode};
… …
1728 } elsif ($sym == CFClient::SDLK_HOME) { 1838 } elsif ($sym == CFClient::SDLK_HOME) {
1729 $self->{cursor} = 0; 1839 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) { 1840 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text; 1841 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 1842 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 1843 $self->emit ('escape');
1734 } elsif ($uni) { 1844 } elsif ($uni) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 1845 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 1846 } else {
1737 return 0; 1847 return 0;
1738 } 1848 }
… …
1742 $self->realloc; 1852 $self->realloc;
1743 1853
1744 1 1854 1
1745} 1855}
1746 1856
1747sub focus_in { 1857sub invoke_focus_in {
1748 my ($self) = @_; 1858 my ($self) = @_;
1749 1859
1750 $self->{last_activity} = $::NOW; 1860 $self->{last_activity} = $::NOW;
1751 1861
1752 $self->SUPER::focus_in; 1862 $self->SUPER::invoke_focus_in
1753} 1863}
1754 1864
1755sub button_down { 1865sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 1866 my ($self, $ev, $x, $y) = @_;
1757 1867
1758 $self->SUPER::button_down ($ev, $x, $y); 1868 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 1869
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 1871
1762 # byte-index to char-index 1872 # byte-index to char-index
1763 my $text = $self->{text}; 1873 my $text = $self->{text};
1764 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1765 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1766 1876
1767 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1768 $self->update; 1878 $self->update;
1769 1879
1770 1 1880 1
1771} 1881}
1772 1882
1773sub mouse_motion { 1883sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 1884 my ($self, $ev, $x, $y) = @_;
1775# 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#
1776 1886
1777 0 1887 1
1778} 1888}
1779 1889
1780sub _draw { 1890sub _draw {
1781 my ($self) = @_; 1891 my ($self) = @_;
1782 1892
1783 local $self->{fg} = $self->{fg}; 1893 local $self->{fg} = $self->{fg};
1784 1894
1785 if ($FOCUS == $self) { 1895 if ($FOCUS == $self) {
1786 glColor @{$self->{active_bg}}; 1896 glColor_premultiply @{$self->{active_bg}};
1787 $self->{fg} = $self->{active_fg}; 1897 $self->{fg} = $self->{active_fg};
1788 } else { 1898 } else {
1789 glColor @{$self->{bg}}; 1899 glColor_premultiply @{$self->{bg}};
1790 } 1900 }
1791 1901
1792 glEnable GL_BLEND; 1902 glEnable GL_BLEND;
1793 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1903 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1794 glBegin GL_QUADS; 1904 glBegin GL_QUADS;
1795 glVertex 0 , 0; 1905 glVertex 0 , 0;
1796 glVertex 0 , $self->{h}; 1906 glVertex 0 , $self->{h};
1797 glVertex $self->{w}, $self->{h}; 1907 glVertex $self->{w}, $self->{h};
1798 glVertex $self->{w}, 0; 1908 glVertex $self->{w}, 0;
… …
1823 1933
1824our @ISA = CFClient::UI::EntryBase::; 1934our @ISA = CFClient::UI::EntryBase::;
1825 1935
1826use CFClient::OpenGL; 1936use CFClient::OpenGL;
1827 1937
1828sub key_down { 1938sub invoke_key_down {
1829 my ($self, $ev) = @_; 1939 my ($self, $ev) = @_;
1830 1940
1831 my $sym = $ev->{sym}; 1941 my $sym = $ev->{sym};
1832 1942
1833 if ($sym == 13) { 1943 if ($sym == 13) {
1834 unshift @{$self->{history}}, 1944 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 1945 my $txt = $self->get_text;
1946
1836 $self->{history_pointer} = -1; 1947 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 1948 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 1949 $self->emit (activate => $txt);
1839 $self->update; 1950 $self->update;
1840 1951
1841 } elsif ($sym == CFClient::SDLK_UP) { 1952 } elsif ($sym == CFClient::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 1953 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 1954 $self->{history_saveback} = $self->get_text;
… …
1859 } else { 1970 } else {
1860 $self->set_text ($self->{history_saveback}); 1971 $self->set_text ($self->{history_saveback});
1861 } 1972 }
1862 1973
1863 } else { 1974 } else {
1864 return $self->SUPER::key_down ($ev) 1975 return $self->SUPER::invoke_key_down ($ev)
1865 } 1976 }
1866 1977
1867 1 1978 1
1868} 1979}
1869 1980
… …
1893 can_events => 1, 2004 can_events => 1,
1894 @_ 2005 @_
1895 ) 2006 )
1896} 2007}
1897 2008
1898sub activate { }
1899
1900sub button_up { 2009sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 2010 my ($self, $ev, $x, $y) = @_;
1902 2011
1903 $self->emit ("activate") 2012 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 2013 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 2014 && $y >= 0 && $y < $self->{h};
… …
1908} 2017}
1909 2018
1910sub _draw { 2019sub _draw {
1911 my ($self) = @_; 2020 my ($self) = @_;
1912 2021
1913 local $self->{fg} = $self->{fg}; 2022 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1914
1915 if ($GRAB == $self) {
1916 $self->{fg} = $self->{active_fg};
1917 }
1918 2023
1919 glEnable GL_TEXTURE_2D; 2024 glEnable GL_TEXTURE_2D;
1920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1921 glColor 0, 0, 0, 1; 2026 glColor 0, 0, 0, 1;
1922 2027
1923 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2028 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1924 2029
1925 glDisable GL_TEXTURE_2D; 2030 glDisable GL_TEXTURE_2D;
1926 2031
1927 $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
1928} 2069}
1929 2070
1930############################################################################# 2071#############################################################################
1931 2072
1932package CFClient::UI::CheckBox; 2073package CFClient::UI::CheckBox;
… …
1959 my ($self) = @_; 2100 my ($self) = @_;
1960 2101
1961 (6) x 2 2102 (6) x 2
1962} 2103}
1963 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
1964sub button_down { 2113sub invoke_button_down {
1965 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
1966 2115
1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1969 $self->{state} = !$self->{state}; 2118 $self->toggle;
1970 $self->_emit (changed => $self->{state});
1971 } else { 2119 } else {
1972 return 0 2120 return 0
1973 } 2121 }
1974 2122
1975 1 2123 1
… …
2000package CFClient::UI::Image; 2148package CFClient::UI::Image;
2001 2149
2002our @ISA = CFClient::UI::Base::; 2150our @ISA = CFClient::UI::Base::;
2003 2151
2004use CFClient::OpenGL; 2152use CFClient::OpenGL;
2005use Carp qw/confess/;
2006 2153
2007our %loaded_images; 2154our %texture_cache;
2008 2155
2009sub new { 2156sub new {
2010 my $class = shift; 2157 my $class = shift;
2011 2158
2012 my $self = $class->SUPER::new (can_events => 0, @_); 2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
2013 2163
2014 $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";
2015 2166
2016 $loaded_images{$self->{image}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2017 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;
2018 2169
2019 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
2020 2171
2021 Scalar::Util::weaken $loaded_images{$self->{image}}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2022
2023 $self->{aspect} = $tex->{w} / $tex->{h};
2024 2173
2025 $self 2174 $self
2026} 2175}
2027 2176
2028sub size_request { 2177sub size_request {
2029 my ($self) = @_; 2178 my ($self) = @_;
2030 2179
2031 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
2032} 2181}
2033 2182
2034sub _draw { 2183sub _draw {
2035 my ($self) = @_; 2184 my ($self) = @_;
2036 2185
… …
2145 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
2146 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
2147 2296
2148 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
2149 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);
2150 2302
2151 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
2152 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;
2153 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2307 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155 2308
2156 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2309 glBindTexture GL_TEXTURE_2D, $t1->{name};
2157 glBegin GL_QUADS; 2310 glBegin GL_QUADS;
… …
2172 2325
2173 if ($t3) { 2326 if ($t3) {
2174 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
2175 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
2176 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2177 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2178 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2179 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2180 glEnd; 2333 glEnd;
2181 } 2334 }
2182 2335
2183 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2271 $self->update; 2424 $self->update;
2272 2425
2273 $self 2426 $self
2274} 2427}
2275 2428
2276sub changed { }
2277
2278sub set_range { 2429sub set_range {
2279 my ($self, $range) = @_; 2430 my ($self, $range) = @_;
2280 2431
2281 ($range, $self->{range}) = ($self->{range}, $range); 2432 ($range, $self->{range}) = ($self->{range}, $range);
2282 2433
2283 $self->update
2284 if "@$range" ne "@{$self->{range}}"; 2434 if ("@$range" ne "@{$self->{range}}") {
2435 $self->update;
2436 $self->set_value ($self->{range}[0]);
2437 }
2285} 2438}
2286 2439
2287sub set_value { 2440sub set_value {
2288 my ($self, $value) = @_; 2441 my ($self, $value) = @_;
2289 2442
… …
2300 if $unit; 2453 if $unit;
2301 2454
2302 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2455 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2303 2456
2304 if ($value != $old_value) { 2457 if ($value != $old_value) {
2305 $self->_emit (changed => $value); 2458 $self->emit (changed => $value);
2306 $self->update; 2459 $self->update;
2307 } 2460 }
2308} 2461}
2309 2462
2310sub size_request { 2463sub size_request {
2311 my ($self) = @_; 2464 my ($self) = @_;
2312 2465
2313 ($self->{req_w}, $self->{req_h}) 2466 ($self->{req_w}, $self->{req_h})
2314} 2467}
2315 2468
2316sub button_down { 2469sub invoke_button_down {
2317 my ($self, $ev, $x, $y) = @_; 2470 my ($self, $ev, $x, $y) = @_;
2318 2471
2319 $self->SUPER::button_down ($ev, $x, $y); 2472 $self->SUPER::invoke_button_down ($ev, $x, $y);
2320 2473
2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2474 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2322 2475
2323 $self->mouse_motion ($ev, $x, $y) 2476 $self->invoke_mouse_motion ($ev, $x, $y)
2324} 2477}
2325 2478
2326sub mouse_motion { 2479sub invoke_mouse_motion {
2327 my ($self, $ev, $x, $y) = @_; 2480 my ($self, $ev, $x, $y) = @_;
2328 2481
2329 if ($GRAB == $self) { 2482 if ($GRAB == $self) {
2330 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2483 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2331 2484
… …
2339 } 2492 }
2340 2493
2341 1 2494 1
2342} 2495}
2343 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
2344sub update { 2507sub update {
2345 my ($self) = @_; 2508 my ($self) = @_;
2346 2509
2347 $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}) {
2348 $self->set_value ($self->{range}[0]); 2518 $self->set_value ($self->{range}[0]);
2349 2519
2350 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2520 my ($value, $lo, $hi, $page) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100; 2521 my $range = ($hi - $page - $lo) || 1e-100;
2352 2522
… …
2358 $value = ($value - $lo) / $range; 2528 $value = ($value - $lo) / $range;
2359 $value = $value * $self->{scale} + $self->{offset}; 2529 $value = $value * $self->{scale} + $self->{offset};
2360 2530
2361 $self->{knob_x} = $value - $knob_w * 0.5; 2531 $self->{knob_x} = $value - $knob_w * 0.5;
2362 $self->{knob_w} = $knob_w; 2532 $self->{knob_w} = $knob_w;
2363 }); 2533 }
2364
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370 2534
2371 $self->SUPER::_draw (); 2535 $self->SUPER::_draw ();
2372 2536
2373 glScale $self->{w}, $self->{h}; 2537 glScale $self->{w}, $self->{h};
2374 2538
… …
2435sub set_range { shift->{slider}->set_range (@_) } 2599sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 2600sub set_value { shift->{slider}->set_value (@_) }
2437 2601
2438############################################################################# 2602#############################################################################
2439 2603
2440package CFClient::UI::TextView; 2604package CFClient::UI::TextScroller;
2441 2605
2442our @ISA = CFClient::UI::HBox::; 2606our @ISA = CFClient::UI::HBox::;
2443 2607
2444use CFClient::OpenGL; 2608use CFClient::OpenGL;
2445 2609
2446sub new { 2610sub new {
2447 my $class = shift; 2611 my $class = shift;
2448 2612
2449 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2450 fontsize => 1, 2614 fontsize => 1,
2451 can_events => 0, 2615 can_events => 1,
2616 indent => 0,
2452 #font => default_font 2617 #font => default_font
2453 @_, 2618 @_,
2454 2619
2455 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2456 par => [], 2621 par => [],
2457 height => 0, 2622 height => 0,
2458 children => [ 2623 children => [
2459 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2460 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2471 2636
2472 $self->{fontsize} = $fontsize; 2637 $self->{fontsize} = $fontsize;
2473 $self->reflow; 2638 $self->reflow;
2474} 2639}
2475 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
2476sub size_allocate { 2650sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 2651 my ($self, $w, $h) = @_;
2478 2652
2479 $self->SUPER::size_allocate ($w, $h); 2653 my ($empty, $slider, @other) = @{ $self->{children} };
2654 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2480 2655
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2656 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2657 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $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});
2484 2660
2485 $self->reflow; 2661 $self->reflow;
2486}
2487 2662
2488sub text_size { 2663 local $self->{children} = [$empty, $slider];
2664 $self->SUPER::invoke_size_allocate ($w, $h)
2665}
2666
2667sub invoke_mouse_wheel {
2489 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) = @_;
2490 2679
2491 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2492 2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683 $layout->set_foreground (@{$para->{fg}});
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2684 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $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});
2495 $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}}
2496 2693 );
2694
2497 $layout->size 2695 $layout
2498} 2696}
2499 2697
2500sub reflow { 2698sub reflow {
2501 my ($self) = @_; 2699 my ($self) = @_;
2502 2700
… …
2511 $self->{children}[1]->set_value ($offset); 2709 $self->{children}[1]->set_value ($offset);
2512} 2710}
2513 2711
2514sub clear { 2712sub clear {
2515 my ($self) = @_; 2713 my ($self) = @_;
2714
2715 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other;
2516 2717
2517 $self->{par} = []; 2718 $self->{par} = [];
2518 $self->{height} = 0; 2719 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520} 2721}
2521 2722
2522sub add_paragraph { 2723sub add_paragraph {
2523 my ($self, $color, $text, $indent) = @_; 2724 my ($self, $color, $para, $indent) = @_;
2524 2725
2525 for my $line (split /\n/, $text) { 2726 my ($text, @w) = ref $para ? @$para : $para;
2526 my ($w, $h) = $self->text_size ($line); 2727
2527 $self->{height} += $h; 2728 $para = {
2528 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,
2529 } 2735 };
2530 2736
2531 $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;
2532} 2749}
2533 2750
2534sub update { 2751sub update {
2535 my ($self) = @_; 2752 my ($self) = @_;
2536 2753
… …
2538 2755
2539 return unless $self->{h} > 0; 2756 return unless $self->{h} > 0;
2540 2757
2541 delete $self->{texture}; 2758 delete $self->{texture};
2542 2759
2543 $ROOT->on_post_alloc ($self, sub { 2760 $ROOT->on_post_alloc ($self => sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 2762
2546 if (delete $self->{need_reflow}) { 2763 if (delete $self->{need_reflow}) {
2547 my $height = 0; 2764 my $height = 0;
2548 2765
2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2553 for (@{$self->{par}}) { 2766 for my $para (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2555 $layout->set_width ($W - $_->[3]); 2768 my $layout = $self->get_layout ($para);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size; 2769 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3]; 2770
2559 $_->[1] = $h; 2771 $para->{w} = $w + $para->{indent};
2772 $para->{h} = $h;
2773 $para->{wrapped} = $layout->has_wrapped;
2560 } 2774 }
2561 2775
2562 $height += $_->[1]; 2776 $height += $para->{h};
2563 } 2777 }
2564 2778
2565 $self->{height} = $height; 2779 $self->{height} = $height;
2566 2780
2567 $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]);
2568 2782
2569 delete $self->{texture}; 2783 delete $self->{texture};
2570 } 2784 }
2571 2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2788 }
2789
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2790 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2573 glClearColor 0.5, 0.5, 0.5, 0; 2791 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 2792 glClear GL_COLOR_BUFFER_BIT;
2575 2793
2576 my $top = int $self->{children}[1]{range}[0]; 2794 my $top = int $self->{children}[1]{range}[0];
2577 2795
2578 my $y0 = $top; 2796 my $y0 = $top;
2579 my $y1 = $top + $H; 2797 my $y1 = $top + $H;
2580 2798
2581 my $y = 0; 2799 my $y = 0;
2582 2800
2583 my $layout = $self->{layout};
2584
2585 $layout->set_font ($self->{font}) if $self->{font};
2586
2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590
2591 for my $par (@{$self->{par}}) { 2801 for my $para (@{$self->{par}}) {
2592 my $h = $par->[1]; 2802 my $h = $para->{h};
2593 2803
2594 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] });
2596 $layout->set_width ($W - $par->[3]);
2597 $layout->set_markup ($par->[4]);
2598 2805
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2806 my $layout = $self->get_layout ($para);
2600 2807
2601 glRasterPos $par->[3], $y - $y0; 2808 $layout->render ($para->{indent}, $y - $y0);
2602 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 }
2603 } 2822 }
2604 2823
2605 $y += $h; 2824 $y += $h;
2606 } 2825 }
2607
2608 glDisable GL_BLEND;
2609 }; 2826 };
2610 }); 2827 });
2611} 2828}
2612 2829
2830sub reconfigure {
2831 my ($self) = @_;
2832
2833 $self->SUPER::reconfigure;
2834
2835 $_->{w} = 1e10 for @{ $self->{par} };
2836 $self->reflow;
2837}
2838
2613sub _draw { 2839sub _draw {
2614 my ($self) = @_; 2840 my ($self) = @_;
2615 2841
2616 glEnable GL_TEXTURE_2D; 2842 glEnable GL_TEXTURE_2D;
2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2843 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2618 glColor 1, 1, 1, 1; 2844 glColor 0, 0, 0, 1;
2619 $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});
2620 glDisable GL_TEXTURE_2D; 2846 glDisable GL_TEXTURE_2D;
2621 2847
2622 $self->{children}[1]->draw; 2848 $self->{children}[1]->draw;
2623
2624} 2849}
2625 2850
2626############################################################################# 2851#############################################################################
2627 2852
2628package CFClient::UI::Animator; 2853package CFClient::UI::Animator;
… …
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 2940 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2941 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 2942 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 2943 . "visible $widget->{visible}";
2719 } 2944 }
2945
2946 $tooltip =~ s/^\n+//;
2947 $tooltip =~ s/\n+$//;
2720 2948
2721 $self->add (new CFClient::UI::Label 2949 $self->add (new CFClient::UI::Label
2722 markup => $tooltip, 2950 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 2952 fontsize => 0.8,
… …
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735 2963
2736 ($w + 4, $h + 4) 2964 ($w + 4, $h + 4)
2737} 2965}
2738 2966
2739sub size_allocate { 2967sub invoke_size_allocate {
2740 my ($self, $w, $h) = @_; 2968 my ($self, $w, $h) = @_;
2741 2969
2742 $self->SUPER::size_allocate ($w - 4, $h - 4); 2970 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743} 2971}
2744 2972
2745sub visibility_change { 2973sub invoke_visibility_change {
2746 my ($self, $visible) = @_; 2974 my ($self, $visible) = @_;
2747 2975
2748 return unless $visible; 2976 return unless $visible;
2749 2977
2750 $self->{root}->on_post_alloc ("move_$self" => sub { 2978 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2752 or return; 2980 or return;
2753 2981
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2982 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 2983
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2984 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 2985 if $x + $self->{w} > $self->{root}{w};
2758 2986
2759 $self->move_abs ($x, $y); 2987 $self->move_abs ($x, $y);
2760 }); 2988 });
2761} 2989}
2762 2990
… …
2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3079 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2852 3080
2853 if ($tex) { 3081 if ($tex) {
2854 glEnable GL_TEXTURE_2D; 3082 glEnable GL_TEXTURE_2D;
2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3083 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856 glColor 1, 1, 1, 1; 3084 glColor 0, 0, 0, 1;
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3085 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 3086 glDisable GL_TEXTURE_2D;
2859 } 3087 }
2860} 3088}
2861 3089
2862sub DESTROY { 3090sub destroy {
2863 my ($self) = @_; 3091 my ($self) = @_;
2864 3092
2865 $self->{timer}->cancel 3093 $self->{timer}->cancel
2866 if $self->{timer}; 3094 if $self->{timer};
2867 3095
2868 $self->SUPER::DESTROY; 3096 $self->SUPER::destroy;
2869} 3097}
2870 3098
2871############################################################################# 3099#############################################################################
2872 3100
2873package CFClient::UI::Buttonbar; 3101package CFClient::UI::Buttonbar;
… …
2894 ); 3122 );
2895 3123
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3124 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2897 3125
2898 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
2900 3128
2901 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
2902 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 {
2903 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
2904 can_hover => 1, 3146 can_hover => 1,
2905 can_events => 1, 3147 can_events => 1,
2906 text => $widget; 3148 markup => $widget,
3149 tooltip => $tooltip;
3150 }
2907 } 3151 }
2908 3152
2909 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
2910 3154
2911 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
2916 3160
2917# 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)
2918sub popup { 3162sub popup {
2919 my ($self, $ev) = @_; 3163 my ($self, $ev) = @_;
2920 3164
2921 $self->_emit ("popdown"); 3165 $self->emit ("popdown");
2922 3166
2923 # maybe save $GRAB? must be careful about events... 3167 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self; 3168 $GRAB = $self;
2925 $self->{button} = $ev->{button}; 3169 $self->{button} = $ev->{button};
2926 3170
2927 $self->show; 3171 $self->show;
2928 $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);
2929} 3173}
2930 3174
2931sub mouse_motion { 3175sub invoke_mouse_motion {
2932 my ($self, $ev, $x, $y) = @_; 3176 my ($self, $ev, $x, $y) = @_;
2933 3177
2934 # TODO: should use vbox->find_widget or so 3178 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3179 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER}; 3180 $self->{hover} = $self->{item}{$HOVER};
2937 3181
2938 0 3182 0
2939} 3183}
2940 3184
2941sub button_up { 3185sub invoke_button_up {
2942 my ($self, $ev, $x, $y) = @_; 3186 my ($self, $ev, $x, $y) = @_;
2943 3187
2944 if ($ev->{button} == $self->{button}) { 3188 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB; 3189 undef $GRAB;
2946 $self->hide; 3190 $self->hide;
2947 3191
2948 $self->_emit ("popdown"); 3192 $self->emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover}; 3193 $self->{hover}[1]->() if $self->{hover};
2950 } else { 3194 } else {
2951 return 0 3195 return 0
2952 } 3196 }
2953 3197
… …
2980 3224
2981 $self->{current} = $self->{children}[0] 3225 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} }; 3226 if @{ $self->{children} };
2983} 3227}
2984 3228
3229sub get_current_page {
3230 my ($self) = @_;
3231
3232 $self->{current}
3233}
3234
2985sub set_current_page { 3235sub set_current_page {
2986 my ($self, $page_or_widget) = @_; 3236 my ($self, $page_or_widget) = @_;
2987 3237
2988 my $widget = ref $page_or_widget 3238 my $widget = ref $page_or_widget
2989 ? $page_or_widget 3239 ? $page_or_widget
2990 : $self->{children}[$page_or_widget]; 3240 : $self->{children}[$page_or_widget];
2991 3241
2992 $self->{current} = $widget; 3242 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3243 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994 3244
2995 $self->_emit (page_changed => $self->{current}); 3245 $self->emit (page_changed => $self->{current});
2996 3246
2997 $self->realloc; 3247 $self->realloc;
2998} 3248}
2999 3249
3000sub visible_children { 3250sub visible_children {
… …
3005 my ($self) = @_; 3255 my ($self) = @_;
3006 3256
3007 $self->{current}->size_request 3257 $self->{current}->size_request
3008} 3258}
3009 3259
3010sub size_allocate { 3260sub invoke_size_allocate {
3011 my ($self, $w, $h) = @_; 3261 my ($self, $w, $h) = @_;
3012 3262
3013 $self->{current}->configure (0, 0, $w, $h); 3263 $self->{current}->configure (0, 0, $w, $h);
3264
3265 1
3014} 3266}
3015 3267
3016sub _draw { 3268sub _draw {
3017 my ($self) = @_; 3269 my ($self) = @_;
3018 3270
… …
3053 ); 3305 );
3054 3306
3055 $self->{multiplexer}->add ($widget); 3307 $self->{multiplexer}->add ($widget);
3056} 3308}
3057 3309
3310sub get_current_page {
3311 my ($self) = @_;
3312
3313 $self->{multiplexer}->get_current_page
3314}
3315
3058sub set_current_page { 3316sub set_current_page {
3059 my ($self, $page) = @_; 3317 my ($self, $page) = @_;
3060 3318
3061 $self->{multiplexer}->set_current_page ($page); 3319 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current}); 3320 $self->emit (page_changed => $self->{multiplexer}{current});
3063} 3321}
3064 3322
3065############################################################################# 3323#############################################################################
3066 3324
3067package CFClient::UI::Statusbox; 3325package CFClient::UI::Combobox;
3068 3326
3327use utf8;
3328
3069our @ISA = CFClient::UI::VBox::; 3329our @ISA = CFClient::UI::Button::;
3070 3330
3071sub new { 3331sub new {
3072 my $class = shift; 3332 my $class = shift;
3073 3333
3074 $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 (
3075 fontsize => 0.8, 3389 fontsize => 0.8,
3076 @_, 3390 @_,
3077 ) 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
3078} 3398}
3079 3399
3080sub reorder { 3400sub reorder {
3081 my ($self) = @_; 3401 my ($self) = @_;
3082 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} };
3083 3408
3084 while (my ($k, $v) = each %{ $self->{item} }) { 3409 while (my ($k, $v) = each %{ $self->{item} }) {
3085 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3410 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3086 } 3411 }
3087 3412
… …
3090 my @items = sort { 3415 my @items = sort {
3091 $a->{pri} <=> $b->{pri} 3416 $a->{pri} <=> $b->{pri}
3092 or $b->{id} <=> $a->{id} 3417 or $b->{id} <=> $a->{id}
3093 } values %{ $self->{item} }; 3418 } values %{ $self->{item} };
3094 3419
3420 $self->{timer}->interval (1);
3421
3095 my $count = 10 + 1; 3422 my $count = 10 + 1;
3096 for my $item (@items) { 3423 for my $item (@items) {
3097 last unless --$count; 3424 last unless --$count;
3098 3425
3099 push @widgets, $item->{label} ||= do { 3426 my $label = $item->{label} ||= do {
3100 # TODO: doesn't handle markup well (read as: at all) 3427 # TODO: doesn't handle markup well (read as: at all)
3101 my $short = $item->{count} > 1 3428 my $short = $item->{count} > 1
3102 ? "<b>$item->{count} ×</b> $item->{text}" 3429 ? "<b>$item->{count} ×</b> $item->{text}"
3103 : $item->{text}; 3430 : $item->{text};
3104 3431
… …
3112 tooltip => $item->{tooltip}, 3439 tooltip => $item->{tooltip},
3113 tooltip_font => $::FONT_PROP, 3440 tooltip_font => $::FONT_PROP,
3114 tooltip_width => 0.67, 3441 tooltip_width => 0.67,
3115 fontsize => $item->{fontsize} || $self->{fontsize}, 3442 fontsize => $item->{fontsize} || $self->{fontsize},
3116 max_w => $::WIDTH * 0.44, 3443 max_w => $::WIDTH * 0.44,
3117 fg => $item->{fg}, 3444 fg => [@{ $item->{fg} }],
3118 can_events => 1, 3445 can_events => 1,
3119 can_hover => 1 3446 can_hover => 1
3120 }; 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;
3121 } 3460 }
3122 3461
3123 $self->clear; 3462 $self->clear;
3124 $self->SUPER::add (reverse @widgets); 3463 $self->SUPER::add (reverse @widgets);
3125} 3464}
… …
3130 $text =~ s/^\s+//; 3469 $text =~ s/^\s+//;
3131 $text =~ s/\s+$//; 3470 $text =~ s/\s+$//;
3132 3471
3133 return unless $text; 3472 return unless $text;
3134 3473
3135 my $timeout = time + ((delete $arg{timeout}) || 60); 3474 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3136 3475
3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3476 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3138 3477
3139 if (my $item = $self->{item}{$group}) { 3478 if (my $item = $self->{item}{$group}) {
3140 if ($item->{text} eq $text) { 3479 if ($item->{text} eq $text) {
3141 $item->{count}++; 3480 $item->{count}++;
3142 } else { 3481 } else {
3143 $item->{count} = 1; 3482 $item->{count} = 1;
3144 $item->{text} = $item->{tooltip} = $text; 3483 $item->{text} = $item->{tooltip} = $text;
3145 } 3484 }
3146 $item->{id} = ++$self->{id}; 3485 $item->{id} += 0.2;#d#
3147 $item->{timeout} = $timeout; 3486 $item->{timeout} = $timeout;
3148 delete $item->{label}; 3487 delete $item->{label};
3149 } else { 3488 } else {
3150 $self->{item}{$group} = { 3489 $self->{item}{$group} = {
3151 id => ++$self->{id}, 3490 id => ++$self->{id},
… …
3157 count => 1, 3496 count => 1,
3158 %arg, 3497 %arg,
3159 }; 3498 };
3160 } 3499 }
3161 3500
3501 $ROOT->on_refresh (reorder => sub {
3162 $self->reorder; 3502 $self->reorder;
3503 });
3163} 3504}
3164 3505
3165sub reconfigure { 3506sub reconfigure {
3166 my ($self) = @_; 3507 my ($self) = @_;
3167 3508
… …
3170 3511
3171 $self->reorder; 3512 $self->reorder;
3172 $self->SUPER::reconfigure; 3513 $self->SUPER::reconfigure;
3173} 3514}
3174 3515
3516sub destroy {
3517 my ($self) = @_;
3518
3519 $self->{timer}->cancel;
3520
3521 $self->SUPER::destroy;
3522}
3523
3175############################################################################# 3524#############################################################################
3176 3525
3177package CFClient::UI::Inventory; 3526package CFClient::UI::Inventory;
3178 3527
3179our @ISA = CFClient::UI::ScrolledWindow::; 3528our @ISA = CFClient::UI::Table::;
3180 3529
3181sub new { 3530sub new {
3182 my $class = shift; 3531 my $class = shift;
3183 3532
3184 my $self = $class->SUPER::new ( 3533 my $self = $class->SUPER::new (
3185 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3534 col_expand => [0, 1, 0],
3186 @_, 3535 @_,
3187 ); 3536 );
3188 3537
3189 $self 3538 $self
3190} 3539}
3191 3540
3192sub set_items { 3541sub set_items {
3193 my ($self, $items) = @_; 3542 my ($self, $items) = @_;
3194 3543
3195 $self->{child}->clear; 3544 $self->clear;
3196 return unless $items; 3545 return unless $items;
3197 3546
3198 my @items = sort { 3547 my @items = sort {
3199 ($a->{type} <=> $b->{type}) 3548 ($a->{type} <=> $b->{type})
3200 or ($a->{name} cmp $b->{name}) 3549 or ($a->{name} cmp $b->{name})
3201 } @$items; 3550 } values %$items;
3202 3551
3203 $self->{real_items} = \@items; 3552 $self->{real_items} = \@items;
3204 3553
3205 my $row = 0; 3554 my $row = 0;
3206 for my $item (@items) { 3555 for my $item (@items) {
3207 CFClient::Item::update_widgets $item; 3556 CFClient::Item::update_widgets $item;
3208 3557
3209 $self->{child}->add (0, $row, $item->{face_widget}); 3558 $self->add (0, $row, $item->{face_widget});
3210 $self->{child}->add (1, $row, $item->{desc_widget}); 3559 $self->add (1, $row, $item->{desc_widget});
3211 $self->{child}->add (2, $row, $item->{weight_widget}); 3560 $self->add (2, $row, $item->{weight_widget});
3212 3561
3213 $row++; 3562 $row++;
3214 }
3215}
3216
3217#############################################################################
3218
3219package CFClient::UI::BindEditor;
3220
3221our @ISA = CFClient::UI::FancyFrame::;
3222
3223sub new {
3224 my $class = shift;
3225
3226 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3227
3228 $self->add (my $vb = new CFClient::UI::VBox);
3229
3230
3231 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3232 text => "start recording",
3233 tooltip => "Start/Stops recording of actions."
3234 ."All subsequent actions after the recording started will be captured."
3235 ."The actions are displayed after the record was stopped."
3236 ."To bind the action you have to click on the 'Bind' button",
3237 on_activate => sub {
3238 unless ($self->{recording}) {
3239 $self->start;
3240 } else {
3241 $self->stop;
3242 }
3243 });
3244
3245 $vb->add (new CFClient::UI::Label text => "Actions:");
3246 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3247
3248 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3251 $hb->add (new CFClient::UI::Button
3252 text => "bind",
3253 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3254 on_activate => sub {
3255 $self->ask_for_bind;
3256 });
3257
3258 $vb->add (my $hb = new CFClient::UI::HBox);
3259 $hb->add (new CFClient::UI::Button
3260 text => "ok",
3261 expand => 1,
3262 tooltip => "This closes the binding editor and saves the binding",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->commit;
3266 });
3267
3268 $hb->add (new CFClient::UI::Button
3269 text => "cancel",
3270 expand => 1,
3271 tooltip => "This closes the binding editor without saving",
3272 on_activate => sub {
3273 $self->hide;
3274 $self->{binding_cancel}->()
3275 if $self->{binding_cancel};
3276 });
3277
3278 $self->update_binding_widgets;
3279
3280 $self
3281}
3282
3283sub commit {
3284 my ($self) = @_;
3285 my ($mod, $sym, $cmds) = $self->get_binding;
3286 if ($sym != 0 && @$cmds > 0) {
3287 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3288 ."'. Don't forget 'Save Config'!");
3289 $self->{binding_change}->($mod, $sym, $cmds)
3290 if $self->{binding_change};
3291 } else {
3292 $::STATUSBOX->add ("No action bound, no key or action specified!");
3293 $self->{binding_cancel}->()
3294 if $self->{binding_cancel};
3295 }
3296}
3297
3298sub start {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("stop recording");
3302 $self->{recording} = 1;
3303 $self->clear_command_list;
3304 $::CONN->start_record if $::CONN;
3305}
3306
3307sub stop {
3308 my ($self) = @_;
3309
3310 $self->{rec_btn}->set_text ("start recording");
3311 $self->{recording} = 0;
3312
3313 my $rec;
3314 $rec = $::CONN->stop_record if $::CONN;
3315 return unless ref $rec eq 'ARRAY';
3316 $self->set_command_list ($rec);
3317}
3318
3319
3320sub ask_for_bind_and_commit {
3321 my ($self) = @_;
3322 $self->ask_for_bind (1);
3323}
3324
3325sub ask_for_bind {
3326 my ($self, $commit) = @_;
3327
3328 CFClient::Binder::open_binding_dialog (sub {
3329 my ($mod, $sym) = @_;
3330 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3331 $self->update_binding_widgets;
3332 $self->commit if $commit;
3333 });
3334}
3335
3336# $mod and $sym are the modifiers and key symbol
3337# $cmds is a array ref of strings (the commands)
3338# $cb is the callback that is executed on OK
3339# $ccb is the callback that is executed on CANCEL and
3340# when the binding was unsuccessful on OK
3341sub set_binding {
3342 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3343
3344 $self->clear_command_list;
3345 $self->{recording} = 0;
3346 $self->{rec_btn}->set_text ("start recording");
3347
3348 $self->{binding} = [$mod, $sym];
3349 $self->{commands} = $cmds;
3350
3351 $self->{binding_change} = $cb;
3352 $self->{binding_cancel} = $ccb;
3353
3354 $self->update_binding_widgets;
3355}
3356
3357# this is a shortcut method that asks for a binding
3358# and then just binds it.
3359sub do_quick_binding {
3360 my ($self, $cmds) = @_;
3361 $self->set_binding (undef, undef, $cmds, sub {
3362 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3363 });
3364 $self->ask_for_bind (1);
3365}
3366
3367sub update_binding_widgets {
3368 my ($self) = @_;
3369 my ($mod, $sym, $cmds) = $self->get_binding;
3370 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3371 $self->set_command_list ($cmds);
3372}
3373
3374sub get_binding {
3375 my ($self) = @_;
3376 return (
3377 $self->{binding}->[0],
3378 $self->{binding}->[1],
3379 [ grep { defined $_ } @{$self->{commands}} ]
3380 );
3381}
3382
3383sub clear_command_list {
3384 my ($self) = @_;
3385 $self->{cmdbox}->clear ();
3386}
3387
3388sub set_command_list {
3389 my ($self, $cmds) = @_;
3390
3391 $self->{cmdbox}->clear ();
3392 $self->{commands} = $cmds;
3393
3394 my $idx = 0;
3395
3396 for (@$cmds) {
3397 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3398
3399 my $i = $idx;
3400 $hb->add (new CFClient::UI::Label text => $_);
3401 $hb->add (new CFClient::UI::Button
3402 text => "delete",
3403 tooltip => "Deletes the action from the record",
3404 on_activate => sub {
3405 $self->{cmdbox}->remove ($hb);
3406 $cmds->[$i] = undef;
3407 });
3408
3409
3410 $idx++
3411 } 3563 }
3412} 3564}
3413 3565
3414############################################################################# 3566#############################################################################
3415 3567
… …
3425 commands => [], 3577 commands => [],
3426 @_, 3578 @_,
3427 ) 3579 )
3428} 3580}
3429 3581
3430# 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
3431sub add_spell { 3667sub add_spell {
3432 my ($self, $spell) = @_; 3668 my ($self, $spell) = @_;
3669
3433 $self->{spells}->{$spell->{name}} = $spell; 3670 $self->{spell}->{$spell->{name}} = $spell;
3434 3671 $self->rebuild_spell_list;
3435 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3436 face => $spell->{face},
3437 can_hover => 1,
3438 can_events => 1,
3439 tooltip => $spell->{message});
3440
3441 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => $spell->{name},
3443 can_hover => 1,
3444 can_events => 1,
3445 tooltip => $spell->{message},
3446 expand => 1);
3447
3448 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3450 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3451 expand => 1);
3452
3453 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3454 text => "bind to key",
3455 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3456}
3457
3458sub rebuild_spell_list {
3459 my ($self) = @_;
3460 $self->{tbl_idx} = 0;
3461 $self->add_spell ($_) for values %{$self->{spells}};
3462} 3672}
3463 3673
3464sub remove_spell { 3674sub remove_spell {
3465 my ($self, $spell) = @_; 3675 my ($self, $spell) = @_;
3676
3466 delete $self->{spells}->{$spell->{name}}; 3677 delete $self->{spell}->{$spell->{name}};
3467 $self->rebuild_spell_list; 3678 $self->rebuild_spell_list;
3468} 3679}
3469 3680
3681sub clear_spells {
3682 my ($self) = @_;
3683
3684 $self->{spell} = {};
3685 $self->rebuild_spell_list;
3686}
3687
3470############################################################################# 3688#############################################################################
3471 3689
3472package CFClient::UI::Root; 3690package CFClient::UI::Root;
3473 3691
3474our @ISA = CFClient::UI::Container::; 3692our @ISA = CFClient::UI::Container::;
3693
3694use List::Util qw(min max);
3475 3695
3476use CFClient::OpenGL; 3696use CFClient::OpenGL;
3477 3697
3478sub new { 3698sub new {
3479 my $class = shift; 3699 my $class = shift;
… …
3506 $coord = $max - $size if $coord > $max - $size; 3726 $coord = $max - $size if $coord > $max - $size;
3507 3727
3508 int $coord + 0.5 3728 int $coord + 0.5
3509} 3729}
3510 3730
3511sub size_allocate { 3731sub invoke_size_allocate {
3512 my ($self, $w, $h) = @_; 3732 my ($self, $w, $h) = @_;
3513 3733
3514 for my $child ($self->children) { 3734 for my $child ($self->children) {
3515 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)};
3516 3736
… …
3520 $X = _to_pixel $X, $W, $self->{w}; 3740 $X = _to_pixel $X, $W, $self->{w};
3521 $Y = _to_pixel $Y, $H, $self->{h}; 3741 $Y = _to_pixel $Y, $H, $self->{h};
3522 3742
3523 $child->configure ($X, $Y, $W, $H); 3743 $child->configure ($X, $Y, $W, $H);
3524 } 3744 }
3745
3746 1
3525} 3747}
3526 3748
3527sub coord2local { 3749sub coord2local {
3528 my ($self, $x, $y) = @_; 3750 my ($self, $x, $y) = @_;
3529 3751
… …
3614 3836
3615 delete $queue{$widget+0}; 3837 delete $queue{$widget+0};
3616 3838
3617 my ($w, $h) = $widget->size_request; 3839 my ($w, $h) = $widget->size_request;
3618 3840
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3841 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $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};
3621 3846
3622 $w = $widget->{force_w} if exists $widget->{force_w}; 3847 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h}; 3848 $h = $widget->{force_h} if exists $widget->{force_h};
3624 3849
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3850 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3651 3876
3652 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3653 3878
3654 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3655 $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};
3656 3887
3657 $w = int $w + 0.5; 3888 $w = int $w + 0.5;
3658 $h = int $h + 0.5; 3889 $h = int $h + 0.5;
3659 3890
3660 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