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.271 by root, Fri Jun 2 22:13:47 2006 UTC vs.
Revision 1.297 by root, Wed Jun 7 06:28:30 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}
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
277 delete $self->{visible}; 278 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->focus_out;
286 287
287 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
… …
314} 315}
315 316
316sub move_abs { 317sub move_abs {
317 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
318 319
319 $self->{x} = List::Util::max 0, int $x; 320 $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; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
322 323
323 $self->update; 324 $self->update;
324} 325}
325 326
… …
371sub size_allocate { 372sub size_allocate {
372 # nothing to be done 373 # nothing to be done
373} 374}
374 375
375sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
376} 382}
377 383
378sub set_max_size { 384sub set_max_size {
379 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
380 386
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
383} 391}
384 392
385sub set_tooltip { 393sub set_tooltip {
386 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
387 395
… …
392 400
393 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
394 402
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
398 } 406 }
399} 407}
400 408
401# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
402sub coord2local { 410sub coord2local {
… …
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545 553
546 glPushMatrix; 554 glPushMatrix;
547 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
548 $self->_draw;
549 glPopMatrix;
550 556
551 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
552 my ($x, $y) = @$self{qw(x y)};
553
554 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
555 glEnable GL_BLEND; 559 glEnable GL_BLEND;
556 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
557 glBegin GL_QUADS; 561 glBegin GL_QUADS;
558 glVertex $x , $y; 562 glVertex 0 , 0;
559 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
560 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
561 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
562 glEnd; 566 glEnd;
563 glDisable GL_BLEND; 567 glDisable GL_BLEND;
564 } 568 }
565 569
566 if ($ENV{CFPLUS_DEBUG} & 1) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
567 glPushMatrix; 571 glPushMatrix;
568 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
570 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
571 glVertex 0 , 0; 575 glVertex 0 , 0;
572 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
573 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
574 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
575 glEnd; 579 glEnd;
576 glPopMatrix; 580 glPopMatrix;
577 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
578 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
579} 586}
580 587
581sub _draw { 588sub _draw {
582 my ($self) = @_; 589 my ($self) = @_;
583 590
… …
621 628
622 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
623 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
624 631
625 glEnable GL_BLEND; 632 glEnable GL_BLEND;
626 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
627 glColor @$color; 634 glColor_premultiply @$color;
628 635
629 glBegin GL_QUADS; 636 glBegin GL_QUADS;
630 glVertex 0 , 0; 637 glVertex 0 , 0;
631 glVertex 0 , $h; 638 glVertex 0 , $h;
632 glVertex $w, $h; 639 glVertex $w, $h;
… …
663our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
664 671
665sub new { 672sub new {
666 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
667 674
668 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
669 676
670 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
671 children => [], 678 children => [],
672 can_events => 0, 679 can_events => 0,
673 %arg, 680 %arg,
674 ); 681 );
682
675 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
676 685
677 $self 686 $self
678} 687}
679 688
680sub add { 689sub add {
… …
728 $x -= $self->{x}; 737 $x -= $self->{x};
729 $y -= $self->{y}; 738 $y -= $self->{y};
730 739
731 my $res; 740 my $res;
732 741
733 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
734 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
735 and return $res; 744 and return $res;
736 } 745 }
737 746
738 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
787 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
788} 797}
789 798
790############################################################################# 799#############################################################################
791 800
801# back-buffered drawing area
802
792package CFClient::UI::Window; 803package CFClient::UI::Window;
793 804
794our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
795 806
796use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
847 my $tex = $self->{texture} 858 my $tex = $self->{texture}
848 or return; 859 or return;
849 860
850 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
851 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
852 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
853 864
854 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
855 866
856 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
857} 868}
… …
948package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
949 960
950our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
951 962
952sub new { 963sub new {
953 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
954 967
955 my $self; 968 my $self;
956 969
957 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
958 vertical => 1, 971 vertical => 1,
… …
963 ; 976 ;
964 977
965 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
966 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
967 slider => $slider, 980 slider => $slider,
968 @_, 981 %arg,
969 ); 982 );
970 983
971 $self->{vp}->add ($self->{scrolled});
972 $self->add ($self->{vp});
973 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
974 986
975 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
976} 994}
977 995
978sub update { 996sub update {
979 my ($self) = @_; 997 my ($self) = @_;
980 998
… …
1019 1037
1020 if ($self->{bg}) { 1038 if ($self->{bg}) {
1021 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
1022 1040
1023 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
1024 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1025 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
1026 1044
1027 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
1028 glVertex 0 , 0; 1046 glVertex 0 , 0;
1029 glVertex 0 , $h; 1047 glVertex 0 , $h;
1030 glVertex $w, $h; 1048 glVertex $w, $h;
… …
1144 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1145 1163
1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 $self->realloc; 1168 $self->realloc;
1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1151 }; 1169 };
1152 1170
1153 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1154 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1155 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1158 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1159 1177
1160 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1161 1179
1162 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1163 }; 1183 };
1164 } else { 1184 } else {
1165 return 0; 1185 return 0;
1166 } 1186 }
1167 1187
… …
1519 1539
1520 delete $self->{texture}; 1540 delete $self->{texture};
1521 $self->SUPER::update; 1541 $self->SUPER::update;
1522} 1542}
1523 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1524sub set_text { 1551sub set_text {
1525 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1526 1553
1527 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1528 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1529 1556
1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1531 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1532 1559
1560 delete $self->{size_req};
1533 $self->realloc; 1561 $self->realloc;
1534 $self->update; 1562 $self->update;
1535} 1563}
1536 1564
1537sub set_markup { 1565sub set_markup {
… …
1543 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1544 1572
1545 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1546 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1547 1575
1576 delete $self->{size_req};
1548 $self->realloc; 1577 $self->realloc;
1549 $self->update; 1578 $self->update;
1550} 1579}
1551 1580
1552sub size_request { 1581sub size_request {
1553 my ($self) = @_; 1582 my ($self) = @_;
1554 1583
1584 $self->{size_req} ||= do {
1555 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1556 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1557 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1558 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1559 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1560 1590
1561 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1562 1592
1563 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1564 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1565 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1566 1596
1567 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1568 1598
1569 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1570 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1571 } 1604 };
1572 1605
1573 ($w, $h) 1606 @{ $self->{size_req} }
1574} 1607}
1575 1608
1576sub size_allocate { 1609sub size_allocate {
1577 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1578 1611
… …
1587 1620
1588 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1589 delete $self->{texture}; 1622 delete $self->{texture};
1590 1623
1591 $self->realloc; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1592} 1633}
1593 1634
1594sub _draw { 1635sub _draw {
1595 my ($self) = @_; 1636 my ($self) = @_;
1596 1637
… …
1616 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1617 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1618 }; 1659 };
1619 1660
1620 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1622 1665
1623 if ($tex->{format} == GL_ALPHA) { 1666 if ($tex->{format} == GL_ALPHA) {
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1624 glColor @{$self->{fg}}; 1668 glColor @{$self->{fg}};
1625 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1626 } else { 1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1627 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1628 } 1673 }
1629 1674
1630 glDisable GL_TEXTURE_2D; 1675 glDisable GL_TEXTURE_2D;
1631} 1676}
1632 1677
… …
1649 can_hover => 1, 1694 can_hover => 1,
1650 can_focus => 1, 1695 can_focus => 1,
1651 valign => 0, 1696 valign => 0,
1652 can_events => 1, 1697 can_events => 1,
1653 #text => ... 1698 #text => ...
1699 #hidden => "*",
1654 @_ 1700 @_
1655 ) 1701 )
1656} 1702}
1657 1703
1658sub _set_text { 1704sub _set_text {
… …
1660 1706
1661 delete $self->{cur_h}; 1707 delete $self->{cur_h};
1662 1708
1663 return if $self->{text} eq $text; 1709 return if $self->{text} eq $text;
1664 1710
1665 delete $self->{texture};
1666
1667 $self->{last_activity} = $::NOW; 1711 $self->{last_activity} = $::NOW;
1668 $self->{text} = $text; 1712 $self->{text} = $text;
1669 1713
1670 $text =~ s/./*/g if $self->{hidden}; 1714 $text =~ s/./*/g if $self->{hidden};
1671 $self->{layout}->set_text ("$text "); 1715 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req};
1672 1717
1673 $self->_emit (changed => $self->{text}); 1718 $self->_emit (changed => $self->{text});
1719
1720 $self->realloc;
1721 $self->update;
1674} 1722}
1675 1723
1676sub set_text { 1724sub set_text {
1677 my ($self, $text) = @_; 1725 my ($self, $text) = @_;
1678 1726
1679 $self->{cursor} = length $text; 1727 $self->{cursor} = length $text;
1680 $self->_set_text ($text); 1728 $self->_set_text ($text);
1681
1682 $self->realloc;
1683} 1729}
1684 1730
1685sub get_text { 1731sub get_text {
1686 $_[0]{text} 1732 $_[0]{text}
1687} 1733}
… …
1767 my ($self) = @_; 1813 my ($self) = @_;
1768 1814
1769 local $self->{fg} = $self->{fg}; 1815 local $self->{fg} = $self->{fg};
1770 1816
1771 if ($FOCUS == $self) { 1817 if ($FOCUS == $self) {
1772 glColor @{$self->{active_bg}}; 1818 glColor_premultiply @{$self->{active_bg}};
1773 $self->{fg} = $self->{active_fg}; 1819 $self->{fg} = $self->{active_fg};
1774 } else { 1820 } else {
1775 glColor @{$self->{bg}}; 1821 glColor_premultiply @{$self->{bg}};
1776 } 1822 }
1777 1823
1778 glEnable GL_BLEND; 1824 glEnable GL_BLEND;
1779 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1825 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1780 glBegin GL_QUADS; 1826 glBegin GL_QUADS;
1781 glVertex 0 , 0; 1827 glVertex 0 , 0;
1782 glVertex 0 , $self->{h}; 1828 glVertex 0 , $self->{h};
1783 glVertex $self->{w}, $self->{h}; 1829 glVertex $self->{w}, $self->{h};
1784 glVertex $self->{w}, 0; 1830 glVertex $self->{w}, 0;
… …
1894} 1940}
1895 1941
1896sub _draw { 1942sub _draw {
1897 my ($self) = @_; 1943 my ($self) = @_;
1898 1944
1899 local $self->{fg} = $self->{fg}; 1945 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1900
1901 if ($GRAB == $self) {
1902 $self->{fg} = $self->{active_fg};
1903 }
1904 1946
1905 glEnable GL_TEXTURE_2D; 1947 glEnable GL_TEXTURE_2D;
1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907 glColor 0, 0, 0, 1; 1949 glColor 0, 0, 0, 1;
1908 1950
… …
2133 2175
2134 my $h1 = $self->{h} * (1 - $ycut1); 2176 my $h1 = $self->{h} * (1 - $ycut1);
2135 my $h2 = $self->{h} * (1 - $ycut2); 2177 my $h2 = $self->{h} * (1 - $ycut2);
2136 2178
2137 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
2138 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2180 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2139 glEnable GL_TEXTURE_2D; 2182 glEnable GL_TEXTURE_2D;
2140 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2183 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2141 2184
2142 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2185 glBindTexture GL_TEXTURE_2D, $t1->{name};
2143 glBegin GL_QUADS; 2186 glBegin GL_QUADS;
… …
2264sub set_range { 2307sub set_range {
2265 my ($self, $range) = @_; 2308 my ($self, $range) = @_;
2266 2309
2267 ($range, $self->{range}) = ($self->{range}, $range); 2310 ($range, $self->{range}) = ($self->{range}, $range);
2268 2311
2269 $self->update
2270 if "@$range" ne "@{$self->{range}}"; 2312 if ("@$range" ne "@{$self->{range}}") {
2313 $self->update;
2314 $self->set_value ($self->{range}[0]);
2315 }
2271} 2316}
2272 2317
2273sub set_value { 2318sub set_value {
2274 my ($self, $value) = @_; 2319 my ($self, $value) = @_;
2275 2320
… …
2328} 2373}
2329 2374
2330sub update { 2375sub update {
2331 my ($self) = @_; 2376 my ($self) = @_;
2332 2377
2333 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2378 delete $self->{knob_w};
2379 $self->SUPER::update;
2380}
2381
2382sub _draw {
2383 my ($self) = @_;
2384
2385 unless ($self->{knob_w}) {
2334 $self->set_value ($self->{range}[0]); 2386 $self->set_value ($self->{range}[0]);
2335 2387
2336 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2388 my ($value, $lo, $hi, $page) = @{$self->{range}};
2337 my $range = ($hi - $page - $lo) || 1e-100; 2389 my $range = ($hi - $page - $lo) || 1e-100;
2338 2390
… …
2344 $value = ($value - $lo) / $range; 2396 $value = ($value - $lo) / $range;
2345 $value = $value * $self->{scale} + $self->{offset}; 2397 $value = $value * $self->{scale} + $self->{offset};
2346 2398
2347 $self->{knob_x} = $value - $knob_w * 0.5; 2399 $self->{knob_x} = $value - $knob_w * 0.5;
2348 $self->{knob_w} = $knob_w; 2400 $self->{knob_w} = $knob_w;
2349 }); 2401 }
2350
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356 2402
2357 $self->SUPER::_draw (); 2403 $self->SUPER::_draw ();
2358 2404
2359 glScale $self->{w}, $self->{h}; 2405 glScale $self->{w}, $self->{h};
2360 2406
… …
2421sub set_range { shift->{slider}->set_range (@_) } 2467sub set_range { shift->{slider}->set_range (@_) }
2422sub set_value { shift->{slider}->set_value (@_) } 2468sub set_value { shift->{slider}->set_value (@_) }
2423 2469
2424############################################################################# 2470#############################################################################
2425 2471
2426package CFClient::UI::TextView; 2472package CFClient::UI::TextScroller;
2427 2473
2428our @ISA = CFClient::UI::HBox::; 2474our @ISA = CFClient::UI::HBox::;
2429 2475
2430use CFClient::OpenGL; 2476use CFClient::OpenGL;
2431 2477
… …
2433 my $class = shift; 2479 my $class = shift;
2434 2480
2435 my $self = $class->SUPER::new ( 2481 my $self = $class->SUPER::new (
2436 fontsize => 1, 2482 fontsize => 1,
2437 can_events => 0, 2483 can_events => 0,
2484 indent => 0,
2438 #font => default_font 2485 #font => default_font
2439 @_, 2486 @_,
2440 2487
2441 layout => (new CFClient::Layout 1), 2488 layout => (new CFClient::Layout 1),
2442 par => [], 2489 par => [],
… …
2465 $self->SUPER::size_allocate ($w, $h); 2512 $self->SUPER::size_allocate ($w, $h);
2466 2513
2467 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2514 $self->{layout}->set_font ($self->{font}) if $self->{font};
2468 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2469 $self->{layout}->set_width ($self->{children}[0]{w}); 2516 $self->{layout}->set_width ($self->{children}[0]{w});
2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2470 2518
2471 $self->reflow; 2519 $self->reflow;
2472} 2520}
2473 2521
2474sub text_size { 2522sub text_size {
… …
2476 2524
2477 my $layout = $self->{layout}; 2525 my $layout = $self->{layout};
2478 2526
2479 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2480 $layout->set_width ($self->{children}[0]{w} - $indent); 2528 $layout->set_width ($self->{children}[0]{w} - $indent);
2529 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2481 $layout->set_markup ($text); 2530 $layout->set_markup ($text);
2482 2531
2483 $layout->size 2532 $layout->size
2484} 2533}
2485 2534
… …
2524 2573
2525 return unless $self->{h} > 0; 2574 return unless $self->{h} > 0;
2526 2575
2527 delete $self->{texture}; 2576 delete $self->{texture};
2528 2577
2529 $ROOT->on_post_alloc ($self, sub { 2578 $ROOT->on_post_alloc ($self => sub {
2530 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2531 2580
2532 if (delete $self->{need_reflow}) { 2581 if (delete $self->{need_reflow}) {
2533 my $height = 0; 2582 my $height = 0;
2534 2583
… …
2537 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2538 2587
2539 for (@{$self->{par}}) { 2588 for (@{$self->{par}}) {
2540 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2541 $layout->set_width ($W - $_->[3]); 2590 $layout->set_width ($W - $_->[3]);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2542 $layout->set_markup ($_->[4]); 2592 $layout->set_markup ($_->[4]);
2543 my ($w, $h) = $layout->size; 2593 my ($w, $h) = $layout->size;
2544 $_->[0] = $w + $_->[3]; 2594 $_->[0] = $w + $_->[3];
2545 $_->[1] = $h; 2595 $_->[1] = $h;
2546 } 2596 }
… …
2549 } 2599 }
2550 2600
2551 $self->{height} = $height; 2601 $self->{height} = $height;
2552 2602
2553 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2554 2604
2555 delete $self->{texture}; 2605 delete $self->{texture};
2556 } 2606 }
2557 2607
2558 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2559 glClearColor 0.5, 0.5, 0.5, 0; 2609 glClearColor 0, 0, 0, 0;
2560 glClear GL_COLOR_BUFFER_BIT; 2610 glClear GL_COLOR_BUFFER_BIT;
2561 2611
2562 my $top = int $self->{children}[1]{range}[0]; 2612 my $top = int $self->{children}[1]{range}[0];
2563 2613
2564 my $y0 = $top; 2614 my $y0 = $top;
… …
2578 my $h = $par->[1]; 2628 my $h = $par->[1];
2579 2629
2580 if ($y0 < $y + $h && $y < $y1) { 2630 if ($y0 < $y + $h && $y < $y1) {
2581 $layout->set_foreground (@{ $par->[2] }); 2631 $layout->set_foreground (@{ $par->[2] });
2582 $layout->set_width ($W - $par->[3]); 2632 $layout->set_width ($W - $par->[3]);
2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2583 $layout->set_markup ($par->[4]); 2634 $layout->set_markup ($par->[4]);
2584 2635
2585 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2636 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2586 2637
2587 glRasterPos $par->[3], $y - $y0; 2638 glRasterPos $par->[3], $y - $y0;
… …
2599sub _draw { 2650sub _draw {
2600 my ($self) = @_; 2651 my ($self) = @_;
2601 2652
2602 glEnable GL_TEXTURE_2D; 2653 glEnable GL_TEXTURE_2D;
2603 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2604 glColor 1, 1, 1, 1; 2655 glColor 0, 0, 0, 1;
2605 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2656 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2606 glDisable GL_TEXTURE_2D; 2657 glDisable GL_TEXTURE_2D;
2607 2658
2608 $self->{children}[1]->draw; 2659 $self->{children}[1]->draw;
2609 2660
2610} 2661}
… …
2738 or return; 2789 or return;
2739 2790
2740 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2791 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2741 2792
2742 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2793 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2743 if $x + $self->{w} > $::WIDTH; 2794 if $x + $self->{w} > $self->{root}{w};
2744 2795
2745 $self->move_abs ($x, $y); 2796 $self->move_abs ($x, $y);
2746 }); 2797 });
2747} 2798}
2748 2799
… …
2837 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2888 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2838 2889
2839 if ($tex) { 2890 if ($tex) {
2840 glEnable GL_TEXTURE_2D; 2891 glEnable GL_TEXTURE_2D;
2841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2892 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2842 glColor 1, 1, 1, 1; 2893 glColor 0, 0, 0, 1;
2843 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2894 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2844 glDisable GL_TEXTURE_2D; 2895 glDisable GL_TEXTURE_2D;
2845 } 2896 }
2846} 2897}
2847 2898
… …
2851 $self->{timer}->cancel 2902 $self->{timer}->cancel
2852 if $self->{timer}; 2903 if $self->{timer};
2853 2904
2854 $self->SUPER::DESTROY; 2905 $self->SUPER::DESTROY;
2855} 2906}
2907
2908#############################################################################
2909
2910package CFClient::UI::Buttonbar;
2911
2912our @ISA = CFClient::UI::HBox::;
2913
2914# TODO: should actualyl wrap buttons and other goodies.
2856 2915
2857############################################################################# 2916#############################################################################
2858 2917
2859package CFClient::UI::Menu; 2918package CFClient::UI::Menu;
2860 2919
… …
2872 ); 2931 );
2873 2932
2874 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2933 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2875 2934
2876 for my $item (@{ $self->{items} }) { 2935 for my $item (@{ $self->{items} }) {
2877 my ($widget, $cb) = @$item; 2936 my ($widget, $cb, $tooltip) = @$item;
2878 2937
2879 # handle various types of items, only text for now 2938 # handle various types of items, only text for now
2880 if (!ref $widget) { 2939 if (!ref $widget) {
2881 $widget = new CFClient::UI::Label 2940 $widget = new CFClient::UI::Label
2882 can_hover => 1, 2941 can_hover => 1,
2883 can_events => 1, 2942 can_events => 1,
2884 text => $widget; 2943 text => $widget,
2944 tooltip => $tooltip
2885 } 2945 }
2886 2946
2887 $self->{item}{$widget} = $item; 2947 $self->{item}{$widget} = $item;
2888 2948
2889 $self->{vbox}->add ($widget); 2949 $self->{vbox}->add ($widget);
… …
2932 1 2992 1
2933} 2993}
2934 2994
2935############################################################################# 2995#############################################################################
2936 2996
2937package CFClient::UI::Statusbox; 2997package CFClient::UI::Multiplexer;
2938 2998
2939our @ISA = CFClient::UI::VBox::; 2999our @ISA = CFClient::UI::Container::;
2940 3000
2941sub new { 3001sub new {
2942 my $class = shift; 3002 my $class = shift;
2943 3003
2944 $class->SUPER::new ( 3004 my $self = $class->SUPER::new (
3005 @_,
3006 );
3007
3008 $self->{current} = $self->{children}[0]
3009 if @{ $self->{children} };
3010
3011 $self
3012}
3013
3014sub add {
3015 my ($self, @widgets) = @_;
3016
3017 $self->SUPER::add (@widgets);
3018
3019 $self->{current} = $self->{children}[0]
3020 if @{ $self->{children} };
3021}
3022
3023sub set_current_page {
3024 my ($self, $page_or_widget) = @_;
3025
3026 my $widget = ref $page_or_widget
3027 ? $page_or_widget
3028 : $self->{children}[$page_or_widget];
3029
3030 $self->{current} = $widget;
3031 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3032
3033 $self->_emit (page_changed => $self->{current});
3034
3035 $self->realloc;
3036}
3037
3038sub visible_children {
3039 $_[0]{current}
3040}
3041
3042sub size_request {
3043 my ($self) = @_;
3044
3045 $self->{current}->size_request
3046}
3047
3048sub size_allocate {
3049 my ($self, $w, $h) = @_;
3050
3051 $self->{current}->configure (0, 0, $w, $h);
3052}
3053
3054sub _draw {
3055 my ($self) = @_;
3056
3057 $self->{current}->draw;
3058}
3059
3060#############################################################################
3061
3062package CFClient::UI::Notebook;
3063
3064our @ISA = CFClient::UI::VBox::;
3065
3066sub new {
3067 my $class = shift;
3068
3069 my $self = $class->SUPER::new (
3070 buttonbar => (new CFClient::UI::Buttonbar),
3071 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3072 # filter => # will be put between multiplexer and $self
3073 @_,
3074 );
3075
3076 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3077 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3078
3079 $self
3080}
3081
3082sub add {
3083 my ($self, $title, $widget, $tooltip) = @_;
3084
3085 Scalar::Util::weaken $self;
3086
3087 $self->{buttonbar}->add (new CFClient::UI::Button
3088 markup => $title,
3089 tooltip => $tooltip,
3090 on_activate => sub { $self->set_current_page ($widget) },
3091 );
3092
3093 $self->{multiplexer}->add ($widget);
3094}
3095
3096sub set_current_page {
3097 my ($self, $page) = @_;
3098
3099 $self->{multiplexer}->set_current_page ($page);
3100 $self->_emit (page_changed => $self->{multiplexer}{current});
3101}
3102
3103#############################################################################
3104
3105package CFClient::UI::Combobox;
3106
3107use utf8;
3108
3109our @ISA = CFClient::UI::Button::;
3110
3111sub new {
3112 my $class = shift;
3113
3114 my $self = $class->SUPER::new (
3115 options => [], # [value, title, longdesc], ...
3116 value => undef,
3117 @_,
3118 );
3119
3120 $self->_set_value ($self->{value});
3121
3122 $self
3123}
3124
3125sub button_down {
3126 my ($self, $ev) = @_;
3127
3128 my @menu_items;
3129
3130 for (@{ $self->{options} }) {
3131 my ($value, $title, $tooltip) = @$_;
3132
3133 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3134 }
3135
3136 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3137}
3138
3139sub _set_value {
3140 my ($self, $value) = @_;
3141
3142 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3143 or return;
3144
3145 $self->{value} = $item->[0];
3146 $self->set_markup ("$item->[1] ⇓");
3147 $self->set_tooltip ($item->[2]);
3148}
3149
3150sub set_value {
3151 my ($self, $value) = @_;
3152
3153 return unless $self->{value} ne $value;
3154
3155 $self->_set_value ($value);
3156 $self->_emit (changed => $value);
3157}
3158
3159#############################################################################
3160
3161package CFClient::UI::Statusbox;
3162
3163our @ISA = CFClient::UI::VBox::;
3164
3165sub new {
3166 my $class = shift;
3167
3168 my $self = $class->SUPER::new (
2945 fontsize => 0.8, 3169 fontsize => 0.8,
2946 @_, 3170 @_,
2947 ) 3171 );
3172
3173 Scalar::Util::weaken (my $this = $self);
3174
3175 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3176
3177 $self
2948} 3178}
2949 3179
2950sub reorder { 3180sub reorder {
2951 my ($self) = @_; 3181 my ($self) = @_;
2952 my $NOW = time; 3182 my $NOW = Time::HiRes::time;
3183
3184 # freeze display when hovering over any label
3185 return if $CFClient::UI::TOOLTIP->{owner}
3186 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3187 values %{ $self->{item} };
2953 3188
2954 while (my ($k, $v) = each %{ $self->{item} }) { 3189 while (my ($k, $v) = each %{ $self->{item} }) {
2955 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3190 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2956 } 3191 }
2957 3192
… …
2960 my @items = sort { 3195 my @items = sort {
2961 $a->{pri} <=> $b->{pri} 3196 $a->{pri} <=> $b->{pri}
2962 or $b->{id} <=> $a->{id} 3197 or $b->{id} <=> $a->{id}
2963 } values %{ $self->{item} }; 3198 } values %{ $self->{item} };
2964 3199
3200 $self->{timer}->interval (1);
3201
2965 my $count = 10 + 1; 3202 my $count = 10 + 1;
2966 for my $item (@items) { 3203 for my $item (@items) {
2967 last unless --$count; 3204 last unless --$count;
2968 3205
2969 push @widgets, $item->{label} ||= do { 3206 my $label = $item->{label} ||= do {
2970 # TODO: doesn't handle markup well (read as: at all) 3207 # TODO: doesn't handle markup well (read as: at all)
2971 my $short = $item->{count} > 1 3208 my $short = $item->{count} > 1
2972 ? "<b>$item->{count} ×</b> $item->{text}" 3209 ? "<b>$item->{count} ×</b> $item->{text}"
2973 : $item->{text}; 3210 : $item->{text};
2974 3211
… …
2982 tooltip => $item->{tooltip}, 3219 tooltip => $item->{tooltip},
2983 tooltip_font => $::FONT_PROP, 3220 tooltip_font => $::FONT_PROP,
2984 tooltip_width => 0.67, 3221 tooltip_width => 0.67,
2985 fontsize => $item->{fontsize} || $self->{fontsize}, 3222 fontsize => $item->{fontsize} || $self->{fontsize},
2986 max_w => $::WIDTH * 0.44, 3223 max_w => $::WIDTH * 0.44,
2987 fg => $item->{fg}, 3224 fg => [@{ $item->{fg} }],
2988 can_events => 1, 3225 can_events => 1,
2989 can_hover => 1 3226 can_hover => 1
2990 }; 3227 };
3228
3229 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3230 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3231 $label->update;
3232 $label->set_max_size (undef, $label->{req_h} * $diff)
3233 if $diff < 1;
3234 $self->{timer}->interval (1/30);
3235 } else {
3236 $label->{fg}[3] = $item->{fg}[3] || 1;
3237 }
3238
3239 push @widgets, $label;
2991 } 3240 }
2992 3241
2993 $self->clear; 3242 $self->clear;
2994 $self->SUPER::add (reverse @widgets); 3243 $self->SUPER::add (reverse @widgets);
2995} 3244}
… …
3000 $text =~ s/^\s+//; 3249 $text =~ s/^\s+//;
3001 $text =~ s/\s+$//; 3250 $text =~ s/\s+$//;
3002 3251
3003 return unless $text; 3252 return unless $text;
3004 3253
3005 my $timeout = time + ((delete $arg{timeout}) || 60); 3254 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3006 3255
3007 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3256 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3008 3257
3009 if (my $item = $self->{item}{$group}) { 3258 if (my $item = $self->{item}{$group}) {
3010 if ($item->{text} eq $text) { 3259 if ($item->{text} eq $text) {
… …
3040 3289
3041 $self->reorder; 3290 $self->reorder;
3042 $self->SUPER::reconfigure; 3291 $self->SUPER::reconfigure;
3043} 3292}
3044 3293
3294sub DESTROY {
3295 my ($self) = @_;
3296
3297 $self->{timer}->cancel;
3298
3299 $self->SUPER::DESTROY;
3300}
3301
3045############################################################################# 3302#############################################################################
3046 3303
3047package CFClient::UI::Inventory; 3304package CFClient::UI::Inventory;
3048 3305
3049our @ISA = CFClient::UI::ScrolledWindow::; 3306our @ISA = CFClient::UI::ScrolledWindow::;
3050 3307
3051sub new { 3308sub new {
3052 my $class = shift; 3309 my $class = shift;
3053 3310
3054 my $self = $class->SUPER::new ( 3311 my $self = $class->SUPER::new (
3055 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3312 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3056 @_, 3313 @_,
3057 ); 3314 );
3058 3315
3059 $self 3316 $self
3060} 3317}
3061 3318
3062sub set_items { 3319sub set_items {
3063 my ($self, $items) = @_; 3320 my ($self, $items) = @_;
3064 3321
3065 $self->{scrolled}->clear; 3322 $self->{child}->clear;
3066 return unless $items; 3323 return unless $items;
3067 3324
3068 my @items = sort { 3325 my @items = sort {
3069 ($a->{type} <=> $b->{type}) 3326 ($a->{type} <=> $b->{type})
3070 or ($a->{name} cmp $b->{name}) 3327 or ($a->{name} cmp $b->{name})
… …
3074 3331
3075 my $row = 0; 3332 my $row = 0;
3076 for my $item (@items) { 3333 for my $item (@items) {
3077 CFClient::Item::update_widgets $item; 3334 CFClient::Item::update_widgets $item;
3078 3335
3079 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3336 $self->{child}->add (0, $row, $item->{face_widget});
3080 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3337 $self->{child}->add (1, $row, $item->{desc_widget});
3081 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3338 $self->{child}->add (2, $row, $item->{weight_widget});
3082 3339
3083 $row++; 3340 $row++;
3084 } 3341 }
3085} 3342}
3086 3343
… …
3283 3540
3284############################################################################# 3541#############################################################################
3285 3542
3286package CFClient::UI::SpellList; 3543package CFClient::UI::SpellList;
3287 3544
3288our @ISA = CFClient::UI::FancyFrame::; 3545our @ISA = CFClient::UI::Table::;
3289 3546
3290sub new { 3547sub new {
3291 my $class = shift; 3548 my $class = shift;
3292 3549
3293 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3550 my $self = $class->SUPER::new (
3294 3551 binding => [],
3295 $self->add (new CFClient::UI::ScrolledWindow 3552 commands => [],
3296 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3553 @_,
3297 3554 )
3298 $self;
3299} 3555}
3300 3556
3301# XXX: Do sorting? Argl... 3557my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3559my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3561my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3562 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3563
3564sub rebuild_spell_list {
3565 my ($self) = @_;
3566
3567 $CFClient::UI::ROOT->on_refresh ($self => sub {
3568 $self->clear;
3569
3570 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3571 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3572 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3573 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3574
3575 my $row = 0;
3576
3577 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3578 my $spell = $self->{spell}{$_};
3579
3580 $row++;
3581
3582 $self->add (0, $row, new CFClient::UI::Face
3583 face => $spell->{face},
3584 can_hover => 1,
3585 can_events => 1,
3586 tooltip => $spell->{message},
3587 );
3588
3589 $self->add (1, $row, new CFClient::UI::Label
3590 expand => 1,
3591 text => $spell->{name},
3592 can_hover => 1,
3593 can_events => 1,
3594 tooltip => $spell->{message},
3595 );
3596
3597 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600
3601 # TODO: should be done via popup
3602 $self->add (5, $row, new CFClient::UI::Button
3603 text => "bind",
3604 tooltip => "bind spell readying (cast command) to key",
3605 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3606 );
3607 }
3608 });
3609}
3610
3302sub add_spell { 3611sub add_spell {
3303 my ($self, $spell) = @_; 3612 my ($self, $spell) = @_;
3613
3304 $self->{spells}->{$spell->{name}} = $spell; 3614 $self->{spell}->{$spell->{name}} = $spell;
3305 3615 $self->rebuild_spell_list;
3306 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3307 face => $spell->{face},
3308 can_hover => 1,
3309 can_events => 1,
3310 tooltip => $spell->{message});
3311
3312 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3313 text => $spell->{name},
3314 can_hover => 1,
3315 can_events => 1,
3316 tooltip => $spell->{message},
3317 expand => 1);
3318
3319 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3320 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3321 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3322 expand => 1);
3323
3324 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3325 text => "bind to key",
3326 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3327}
3328
3329sub rebuild_spell_list {
3330 my ($self) = @_;
3331 $self->{tbl_idx} = 0;
3332 $self->add_spell ($_) for values %{$self->{spells}};
3333} 3616}
3334 3617
3335sub remove_spell { 3618sub remove_spell {
3336 my ($self, $spell) = @_; 3619 my ($self, $spell) = @_;
3620
3337 delete $self->{spells}->{$spell->{name}}; 3621 delete $self->{spell}->{$spell->{name}};
3338 $self->rebuild_spell_list; 3622 $self->rebuild_spell_list;
3339} 3623}
3340 3624
3341############################################################################# 3625#############################################################################
3342 3626
3343package CFClient::UI::Root; 3627package CFClient::UI::Root;
3344 3628
3345our @ISA = CFClient::UI::Container::; 3629our @ISA = CFClient::UI::Container::;
3630
3631use List::Util qw(min max);
3346 3632
3347use CFClient::OpenGL; 3633use CFClient::OpenGL;
3348 3634
3349sub new { 3635sub new {
3350 my $class = shift; 3636 my $class = shift;
… …
3485 3771
3486 delete $queue{$widget+0}; 3772 delete $queue{$widget+0};
3487 3773
3488 my ($w, $h) = $widget->size_request; 3774 my ($w, $h) = $widget->size_request;
3489 3775
3490 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3776 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3491 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3777 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3778
3779 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3780 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3492 3781
3493 $w = $widget->{force_w} if exists $widget->{force_w}; 3782 $w = $widget->{force_w} if exists $widget->{force_w};
3494 $h = $widget->{force_h} if exists $widget->{force_h}; 3783 $h = $widget->{force_h} if exists $widget->{force_h};
3495 3784
3496 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3785 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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