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.277 by root, Sun Jun 4 00:21:52 2006 UTC vs.
Revision 1.333 by root, Sun Jul 23 11:09:58 2006 UTC

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

Diff Legend

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