ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.301 by elmex, Mon Jun 12 12:28:06 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
… …
381} 382}
382 383
383sub set_max_size { 384sub set_max_size {
384 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
385 386
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
388} 391}
389 392
390sub set_tooltip { 393sub set_tooltip {
391 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
392 395
… …
397 400
398 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
399 402
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
403 } 406 }
404} 407}
405 408
406# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
407sub coord2local { 410sub coord2local {
… …
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 553
551 glPushMatrix; 554 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 556
556 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 559 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 561 glBegin GL_QUADS;
563 glVertex $x , $y; 562 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
567 glEnd; 566 glEnd;
568 glDisable GL_BLEND; 567 glDisable GL_BLEND;
569 } 568 }
570 569
571 if ($ENV{CFPLUS_DEBUG} & 1) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 571 glPushMatrix;
573 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 575 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
580 glEnd; 579 glEnd;
581 glPopMatrix; 580 glPopMatrix;
582 #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;
583 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
584} 586}
585 587
586sub _draw { 588sub _draw {
587 my ($self) = @_; 589 my ($self) = @_;
588 590
… …
626 628
627 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
629 631
630 glEnable GL_BLEND; 632 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 634 glColor_premultiply @$color;
633 635
634 glBegin GL_QUADS; 636 glBegin GL_QUADS;
635 glVertex 0 , 0; 637 glVertex 0 , 0;
636 glVertex 0 , $h; 638 glVertex 0 , $h;
637 glVertex $w, $h; 639 glVertex $w, $h;
… …
794 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
795} 797}
796 798
797############################################################################# 799#############################################################################
798 800
801# back-buffered drawing area
802
799package CFClient::UI::Window; 803package CFClient::UI::Window;
800 804
801our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
802 806
803use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
854 my $tex = $self->{texture} 858 my $tex = $self->{texture}
855 or return; 859 or return;
856 860
857 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
860 864
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862 866
863 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
864} 868}
… …
955package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
956 960
957our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
958 962
959sub new { 963sub new {
960 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
961 967
962 my $self; 968 my $self;
963 969
964 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
965 vertical => 1, 971 vertical => 1,
… …
970 ; 976 ;
971 977
972 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
974 slider => $slider, 980 slider => $slider,
975 @_, 981 %arg,
976 ); 982 );
977 983
978 $self->{vp}->add ($self->{scrolled});
979 $self->add ($self->{vp});
980 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
981 986
982 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
983} 994}
984 995
985sub update { 996sub update {
986 my ($self) = @_; 997 my ($self) = @_;
987 998
… …
1026 1037
1027 if ($self->{bg}) { 1038 if ($self->{bg}) {
1028 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
1029 1040
1030 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1032 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
1033 1044
1034 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
1035 glVertex 0 , 0; 1046 glVertex 0 , 0;
1036 glVertex 0 , $h; 1047 glVertex 0 , $h;
1037 glVertex $w, $h; 1048 glVertex $w, $h;
… …
1151 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1152 1163
1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1156 $self->realloc; 1168 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1158 }; 1169 };
1159 1170
1160 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1161 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1162 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1165 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1166 1177
1167 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1168 1179
1169 $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});
1170 }; 1183 };
1171 } else { 1184 } else {
1172 return 0; 1185 return 0;
1173 } 1186 }
1174 1187
… …
1526 1539
1527 delete $self->{texture}; 1540 delete $self->{texture};
1528 $self->SUPER::update; 1541 $self->SUPER::update;
1529} 1542}
1530 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1531sub set_text { 1551sub set_text {
1532 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1533 1553
1534 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1535 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1536 1556
1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1538 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1539 1559
1560 delete $self->{size_req};
1540 $self->realloc; 1561 $self->realloc;
1541 $self->update; 1562 $self->update;
1542} 1563}
1543 1564
1544sub set_markup { 1565sub set_markup {
… …
1550 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1551 1572
1552 $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;
1553 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1554 1575
1576 delete $self->{size_req};
1555 $self->realloc; 1577 $self->realloc;
1556 $self->update; 1578 $self->update;
1557} 1579}
1558 1580
1559sub size_request { 1581sub size_request {
1560 my ($self) = @_; 1582 my ($self) = @_;
1561 1583
1584 $self->{size_req} ||= do {
1562 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1563 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1564 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1565 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1567 1590
1568 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1569 1592
1570 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1571 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1572 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1596
1574 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1575 1598
1576 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1577 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1578 } 1604 };
1579 1605
1580 ($w, $h) 1606 @{ $self->{size_req} }
1581} 1607}
1582 1608
1583sub size_allocate { 1609sub size_allocate {
1584 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1585 1611
… …
1594 1620
1595 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1596 delete $self->{texture}; 1622 delete $self->{texture};
1597 1623
1598 $self->realloc; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1599} 1633}
1600 1634
1601sub _draw { 1635sub _draw {
1602 my ($self) = @_; 1636 my ($self) = @_;
1603 1637
… …
1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1624 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1625 }; 1659 };
1626 1660
1627 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1628 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};
1629 1665
1630 if ($tex->{format} == GL_ALPHA) { 1666 if ($tex->{format} == GL_ALPHA) {
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1631 glColor @{$self->{fg}}; 1668 glColor @{$self->{fg}};
1632 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1633 } else { 1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1634 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1635 } 1673 }
1636 1674
1637 glDisable GL_TEXTURE_2D; 1675 glDisable GL_TEXTURE_2D;
1638} 1676}
1639 1677
… …
1656 can_hover => 1, 1694 can_hover => 1,
1657 can_focus => 1, 1695 can_focus => 1,
1658 valign => 0, 1696 valign => 0,
1659 can_events => 1, 1697 can_events => 1,
1660 #text => ... 1698 #text => ...
1699 #hidden => "*",
1661 @_ 1700 @_
1662 ) 1701 )
1663} 1702}
1664 1703
1665sub _set_text { 1704sub _set_text {
… …
1667 1706
1668 delete $self->{cur_h}; 1707 delete $self->{cur_h};
1669 1708
1670 return if $self->{text} eq $text; 1709 return if $self->{text} eq $text;
1671 1710
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 1711 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 1712 $self->{text} = $text;
1676 1713
1677 $text =~ s/./*/g if $self->{hidden}; 1714 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 1715 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req};
1679 1717
1680 $self->_emit (changed => $self->{text}); 1718 $self->_emit (changed => $self->{text});
1719
1720 $self->realloc;
1721 $self->update;
1681} 1722}
1682 1723
1683sub set_text { 1724sub set_text {
1684 my ($self, $text) = @_; 1725 my ($self, $text) = @_;
1685 1726
1686 $self->{cursor} = length $text; 1727 $self->{cursor} = length $text;
1687 $self->_set_text ($text); 1728 $self->_set_text ($text);
1688
1689 $self->realloc;
1690} 1729}
1691 1730
1692sub get_text { 1731sub get_text {
1693 $_[0]{text} 1732 $_[0]{text}
1694} 1733}
… …
1774 my ($self) = @_; 1813 my ($self) = @_;
1775 1814
1776 local $self->{fg} = $self->{fg}; 1815 local $self->{fg} = $self->{fg};
1777 1816
1778 if ($FOCUS == $self) { 1817 if ($FOCUS == $self) {
1779 glColor @{$self->{active_bg}}; 1818 glColor_premultiply @{$self->{active_bg}};
1780 $self->{fg} = $self->{active_fg}; 1819 $self->{fg} = $self->{active_fg};
1781 } else { 1820 } else {
1782 glColor @{$self->{bg}}; 1821 glColor_premultiply @{$self->{bg}};
1783 } 1822 }
1784 1823
1785 glEnable GL_BLEND; 1824 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1825 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787 glBegin GL_QUADS; 1826 glBegin GL_QUADS;
1788 glVertex 0 , 0; 1827 glVertex 0 , 0;
1789 glVertex 0 , $self->{h}; 1828 glVertex 0 , $self->{h};
1790 glVertex $self->{w}, $self->{h}; 1829 glVertex $self->{w}, $self->{h};
1791 glVertex $self->{w}, 0; 1830 glVertex $self->{w}, 0;
… …
1901} 1940}
1902 1941
1903sub _draw { 1942sub _draw {
1904 my ($self) = @_; 1943 my ($self) = @_;
1905 1944
1906 local $self->{fg} = $self->{fg}; 1945 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1907
1908 if ($GRAB == $self) {
1909 $self->{fg} = $self->{active_fg};
1910 }
1911 1946
1912 glEnable GL_TEXTURE_2D; 1947 glEnable GL_TEXTURE_2D;
1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914 glColor 0, 0, 0, 1; 1949 glColor 0, 0, 0, 1;
1915 1950
… …
2140 2175
2141 my $h1 = $self->{h} * (1 - $ycut1); 2176 my $h1 = $self->{h} * (1 - $ycut1);
2142 my $h2 = $self->{h} * (1 - $ycut2); 2177 my $h2 = $self->{h} * (1 - $ycut2);
2143 2178
2144 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
2145 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;
2146 glEnable GL_TEXTURE_2D; 2182 glEnable GL_TEXTURE_2D;
2147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2183 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2148 2184
2149 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2185 glBindTexture GL_TEXTURE_2D, $t1->{name};
2150 glBegin GL_QUADS; 2186 glBegin GL_QUADS;
… …
2271sub set_range { 2307sub set_range {
2272 my ($self, $range) = @_; 2308 my ($self, $range) = @_;
2273 2309
2274 ($range, $self->{range}) = ($self->{range}, $range); 2310 ($range, $self->{range}) = ($self->{range}, $range);
2275 2311
2276 $self->update
2277 if "@$range" ne "@{$self->{range}}"; 2312 if ("@$range" ne "@{$self->{range}}") {
2313 $self->update;
2314 $self->set_value ($self->{range}[0]);
2315 }
2278} 2316}
2279 2317
2280sub set_value { 2318sub set_value {
2281 my ($self, $value) = @_; 2319 my ($self, $value) = @_;
2282 2320
… …
2335} 2373}
2336 2374
2337sub update { 2375sub update {
2338 my ($self) = @_; 2376 my ($self) = @_;
2339 2377
2340 $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}) {
2341 $self->set_value ($self->{range}[0]); 2386 $self->set_value ($self->{range}[0]);
2342 2387
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2388 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2389 my $range = ($hi - $page - $lo) || 1e-100;
2345 2390
… …
2351 $value = ($value - $lo) / $range; 2396 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2397 $value = $value * $self->{scale} + $self->{offset};
2353 2398
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2399 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2400 $self->{knob_w} = $knob_w;
2356 }); 2401 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2402
2364 $self->SUPER::_draw (); 2403 $self->SUPER::_draw ();
2365 2404
2366 glScale $self->{w}, $self->{h}; 2405 glScale $self->{w}, $self->{h};
2367 2406
… …
2428sub set_range { shift->{slider}->set_range (@_) } 2467sub set_range { shift->{slider}->set_range (@_) }
2429sub set_value { shift->{slider}->set_value (@_) } 2468sub set_value { shift->{slider}->set_value (@_) }
2430 2469
2431############################################################################# 2470#############################################################################
2432 2471
2433package CFClient::UI::TextView; 2472package CFClient::UI::TextScroller;
2434 2473
2435our @ISA = CFClient::UI::HBox::; 2474our @ISA = CFClient::UI::HBox::;
2436 2475
2437use CFClient::OpenGL; 2476use CFClient::OpenGL;
2438 2477
… …
2440 my $class = shift; 2479 my $class = shift;
2441 2480
2442 my $self = $class->SUPER::new ( 2481 my $self = $class->SUPER::new (
2443 fontsize => 1, 2482 fontsize => 1,
2444 can_events => 0, 2483 can_events => 0,
2484 indent => 0,
2445 #font => default_font 2485 #font => default_font
2446 @_, 2486 @_,
2447 2487
2448 layout => (new CFClient::Layout 1), 2488 layout => (new CFClient::Layout 1),
2449 par => [], 2489 par => [],
… …
2472 $self->SUPER::size_allocate ($w, $h); 2512 $self->SUPER::size_allocate ($w, $h);
2473 2513
2474 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2514 $self->{layout}->set_font ($self->{font}) if $self->{font};
2475 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2476 $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});
2477 2518
2478 $self->reflow; 2519 $self->reflow;
2479} 2520}
2480 2521
2481sub text_size { 2522sub text_size {
… …
2483 2524
2484 my $layout = $self->{layout}; 2525 my $layout = $self->{layout};
2485 2526
2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $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});
2488 $layout->set_markup ($text); 2530 $layout->set_markup ($text);
2489 2531
2490 $layout->size 2532 $layout->size
2491} 2533}
2492 2534
… …
2531 2573
2532 return unless $self->{h} > 0; 2574 return unless $self->{h} > 0;
2533 2575
2534 delete $self->{texture}; 2576 delete $self->{texture};
2535 2577
2536 $ROOT->on_post_alloc ($self, sub { 2578 $ROOT->on_post_alloc ($self => sub {
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538 2580
2539 if (delete $self->{need_reflow}) { 2581 if (delete $self->{need_reflow}) {
2540 my $height = 0; 2582 my $height = 0;
2541 2583
… …
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545 2587
2546 for (@{$self->{par}}) { 2588 for (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2548 $layout->set_width ($W - $_->[3]); 2590 $layout->set_width ($W - $_->[3]);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2549 $layout->set_markup ($_->[4]); 2592 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size; 2593 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3]; 2594 $_->[0] = $w + $_->[3];
2552 $_->[1] = $h; 2595 $_->[1] = $h;
2553 } 2596 }
… …
2556 } 2599 }
2557 2600
2558 $self->{height} = $height; 2601 $self->{height} = $height;
2559 2602
2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2561 2604
2562 delete $self->{texture}; 2605 delete $self->{texture};
2563 } 2606 }
2564 2607
2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2566 glClearColor 0.5, 0.5, 0.5, 0; 2609 glClearColor 0, 0, 0, 0;
2567 glClear GL_COLOR_BUFFER_BIT; 2610 glClear GL_COLOR_BUFFER_BIT;
2568 2611
2569 my $top = int $self->{children}[1]{range}[0]; 2612 my $top = int $self->{children}[1]{range}[0];
2570 2613
2571 my $y0 = $top; 2614 my $y0 = $top;
… …
2585 my $h = $par->[1]; 2628 my $h = $par->[1];
2586 2629
2587 if ($y0 < $y + $h && $y < $y1) { 2630 if ($y0 < $y + $h && $y < $y1) {
2588 $layout->set_foreground (@{ $par->[2] }); 2631 $layout->set_foreground (@{ $par->[2] });
2589 $layout->set_width ($W - $par->[3]); 2632 $layout->set_width ($W - $par->[3]);
2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590 $layout->set_markup ($par->[4]); 2634 $layout->set_markup ($par->[4]);
2591 2635
2592 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2636 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2593 2637
2594 glRasterPos $par->[3], $y - $y0; 2638 glRasterPos $par->[3], $y - $y0;
… …
2606sub _draw { 2650sub _draw {
2607 my ($self) = @_; 2651 my ($self) = @_;
2608 2652
2609 glEnable GL_TEXTURE_2D; 2653 glEnable GL_TEXTURE_2D;
2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611 glColor 1, 1, 1, 1; 2655 glColor 0, 0, 0, 1;
2612 $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});
2613 glDisable GL_TEXTURE_2D; 2657 glDisable GL_TEXTURE_2D;
2614 2658
2615 $self->{children}[1]->draw; 2659 $self->{children}[1]->draw;
2616 2660
2617} 2661}
… …
2708 $tooltip .= "\n\n" . (ref $widget) . "\n" 2752 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2753 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n" 2754 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}"; 2755 . "visible $widget->{visible}";
2712 } 2756 }
2757
2758 $tooltip =~ s/^\n+//;
2759 $tooltip =~ s/\n+$//;
2713 2760
2714 $self->add (new CFClient::UI::Label 2761 $self->add (new CFClient::UI::Label
2715 markup => $tooltip, 2762 markup => $tooltip,
2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2763 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2717 fontsize => 0.8, 2764 fontsize => 0.8,
… …
2745 or return; 2792 or return;
2746 2793
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2794 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748 2795
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2796 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH; 2797 if $x + $self->{w} > $self->{root}{w};
2751 2798
2752 $self->move_abs ($x, $y); 2799 $self->move_abs ($x, $y);
2753 }); 2800 });
2754} 2801}
2755 2802
… …
2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2891 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2845 2892
2846 if ($tex) { 2893 if ($tex) {
2847 glEnable GL_TEXTURE_2D; 2894 glEnable GL_TEXTURE_2D;
2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2895 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849 glColor 1, 1, 1, 1; 2896 glColor 0, 0, 0, 1;
2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2897 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851 glDisable GL_TEXTURE_2D; 2898 glDisable GL_TEXTURE_2D;
2852 } 2899 }
2853} 2900}
2854 2901
… …
2887 ); 2934 );
2888 2935
2889 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2936 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2890 2937
2891 for my $item (@{ $self->{items} }) { 2938 for my $item (@{ $self->{items} }) {
2892 my ($widget, $cb) = @$item; 2939 my ($widget, $cb, $tooltip) = @$item;
2893 2940
2894 # handle various types of items, only text for now 2941 # handle various types of items, only text for now
2895 if (!ref $widget) { 2942 if (!ref $widget) {
2896 $widget = new CFClient::UI::Label 2943 $widget = new CFClient::UI::Label
2897 can_hover => 1, 2944 can_hover => 1,
2898 can_events => 1, 2945 can_events => 1,
2899 text => $widget; 2946 markup => $widget,
2947 tooltip => $tooltip
2900 } 2948 }
2901 2949
2902 $self->{item}{$widget} = $item; 2950 $self->{item}{$widget} = $item;
2903 2951
2904 $self->{vbox}->add ($widget); 2952 $self->{vbox}->add ($widget);
… …
3022 my $class = shift; 3070 my $class = shift;
3023 3071
3024 my $self = $class->SUPER::new ( 3072 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3073 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3074 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3075 # filter => # will be put between multiplexer and $self
3027 @_, 3076 @_,
3028 ); 3077 );
3029 3078
3079 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3080 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3081
3032 $self 3082 $self
3033} 3083}
3034 3084
3035sub add { 3085sub add {
… …
3053 $self->_emit (page_changed => $self->{multiplexer}{current}); 3103 $self->_emit (page_changed => $self->{multiplexer}{current});
3054} 3104}
3055 3105
3056############################################################################# 3106#############################################################################
3057 3107
3058package CFClient::UI::Statusbox; 3108package CFClient::UI::Combobox;
3059 3109
3110use utf8;
3111
3060our @ISA = CFClient::UI::VBox::; 3112our @ISA = CFClient::UI::Button::;
3061 3113
3062sub new { 3114sub new {
3063 my $class = shift; 3115 my $class = shift;
3064 3116
3065 $class->SUPER::new ( 3117 my $self = $class->SUPER::new (
3118 options => [], # [value, title, longdesc], ...
3119 value => undef,
3120 @_,
3121 );
3122
3123 $self->_set_value ($self->{value});
3124
3125 $self
3126}
3127
3128sub button_down {
3129 my ($self, $ev) = @_;
3130
3131 my @menu_items;
3132
3133 for (@{ $self->{options} }) {
3134 my ($value, $title, $tooltip) = @$_;
3135
3136 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3137 }
3138
3139 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3140}
3141
3142sub _set_value {
3143 my ($self, $value) = @_;
3144
3145 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3146 or return;
3147
3148 $self->{value} = $item->[0];
3149 $self->set_markup ("$item->[1] ⇓");
3150 $self->set_tooltip ($item->[2]);
3151}
3152
3153sub set_value {
3154 my ($self, $value) = @_;
3155
3156 return unless $self->{value} ne $value;
3157
3158 $self->_set_value ($value);
3159 $self->_emit (changed => $value);
3160}
3161
3162#############################################################################
3163
3164package CFClient::UI::Statusbox;
3165
3166our @ISA = CFClient::UI::VBox::;
3167
3168sub new {
3169 my $class = shift;
3170
3171 my $self = $class->SUPER::new (
3066 fontsize => 0.8, 3172 fontsize => 0.8,
3067 @_, 3173 @_,
3068 ) 3174 );
3175
3176 Scalar::Util::weaken (my $this = $self);
3177
3178 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3179
3180 $self
3069} 3181}
3070 3182
3071sub reorder { 3183sub reorder {
3072 my ($self) = @_; 3184 my ($self) = @_;
3073 my $NOW = time; 3185 my $NOW = Time::HiRes::time;
3186
3187 # freeze display when hovering over any label
3188 return if $CFClient::UI::TOOLTIP->{owner}
3189 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3190 values %{ $self->{item} };
3074 3191
3075 while (my ($k, $v) = each %{ $self->{item} }) { 3192 while (my ($k, $v) = each %{ $self->{item} }) {
3076 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3193 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077 } 3194 }
3078 3195
… …
3081 my @items = sort { 3198 my @items = sort {
3082 $a->{pri} <=> $b->{pri} 3199 $a->{pri} <=> $b->{pri}
3083 or $b->{id} <=> $a->{id} 3200 or $b->{id} <=> $a->{id}
3084 } values %{ $self->{item} }; 3201 } values %{ $self->{item} };
3085 3202
3203 $self->{timer}->interval (1);
3204
3086 my $count = 10 + 1; 3205 my $count = 10 + 1;
3087 for my $item (@items) { 3206 for my $item (@items) {
3088 last unless --$count; 3207 last unless --$count;
3089 3208
3090 push @widgets, $item->{label} ||= do { 3209 my $label = $item->{label} ||= do {
3091 # TODO: doesn't handle markup well (read as: at all) 3210 # TODO: doesn't handle markup well (read as: at all)
3092 my $short = $item->{count} > 1 3211 my $short = $item->{count} > 1
3093 ? "<b>$item->{count} ×</b> $item->{text}" 3212 ? "<b>$item->{count} ×</b> $item->{text}"
3094 : $item->{text}; 3213 : $item->{text};
3095 3214
… …
3103 tooltip => $item->{tooltip}, 3222 tooltip => $item->{tooltip},
3104 tooltip_font => $::FONT_PROP, 3223 tooltip_font => $::FONT_PROP,
3105 tooltip_width => 0.67, 3224 tooltip_width => 0.67,
3106 fontsize => $item->{fontsize} || $self->{fontsize}, 3225 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44, 3226 max_w => $::WIDTH * 0.44,
3108 fg => $item->{fg}, 3227 fg => [@{ $item->{fg} }],
3109 can_events => 1, 3228 can_events => 1,
3110 can_hover => 1 3229 can_hover => 1
3111 }; 3230 };
3231
3232 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3233 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3234 $label->update;
3235 $label->set_max_size (undef, $label->{req_h} * $diff)
3236 if $diff < 1;
3237 $self->{timer}->interval (1/30);
3238 } else {
3239 $label->{fg}[3] = $item->{fg}[3] || 1;
3240 }
3241
3242 push @widgets, $label;
3112 } 3243 }
3113 3244
3114 $self->clear; 3245 $self->clear;
3115 $self->SUPER::add (reverse @widgets); 3246 $self->SUPER::add (reverse @widgets);
3116} 3247}
… …
3121 $text =~ s/^\s+//; 3252 $text =~ s/^\s+//;
3122 $text =~ s/\s+$//; 3253 $text =~ s/\s+$//;
3123 3254
3124 return unless $text; 3255 return unless $text;
3125 3256
3126 my $timeout = time + ((delete $arg{timeout}) || 60); 3257 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3127 3258
3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3259 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129 3260
3130 if (my $item = $self->{item}{$group}) { 3261 if (my $item = $self->{item}{$group}) {
3131 if ($item->{text} eq $text) { 3262 if ($item->{text} eq $text) {
3132 $item->{count}++; 3263 $item->{count}++;
3133 } else { 3264 } else {
3134 $item->{count} = 1; 3265 $item->{count} = 1;
3135 $item->{text} = $item->{tooltip} = $text; 3266 $item->{text} = $item->{tooltip} = $text;
3136 } 3267 }
3137 $item->{id} = ++$self->{id}; 3268 $item->{id} += 0.2;#d#
3138 $item->{timeout} = $timeout; 3269 $item->{timeout} = $timeout;
3139 delete $item->{label}; 3270 delete $item->{label};
3140 } else { 3271 } else {
3141 $self->{item}{$group} = { 3272 $self->{item}{$group} = {
3142 id => ++$self->{id}, 3273 id => ++$self->{id},
… …
3161 3292
3162 $self->reorder; 3293 $self->reorder;
3163 $self->SUPER::reconfigure; 3294 $self->SUPER::reconfigure;
3164} 3295}
3165 3296
3297sub DESTROY {
3298 my ($self) = @_;
3299
3300 $self->{timer}->cancel;
3301
3302 $self->SUPER::DESTROY;
3303}
3304
3166############################################################################# 3305#############################################################################
3167 3306
3168package CFClient::UI::Inventory; 3307package CFClient::UI::Inventory;
3169 3308
3170our @ISA = CFClient::UI::ScrolledWindow::; 3309our @ISA = CFClient::UI::ScrolledWindow::;
3171 3310
3172sub new { 3311sub new {
3173 my $class = shift; 3312 my $class = shift;
3174 3313
3175 my $self = $class->SUPER::new ( 3314 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3315 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_, 3316 @_,
3178 ); 3317 );
3179 3318
3180 $self 3319 $self
3181} 3320}
3182 3321
3183sub set_items { 3322sub set_items {
3184 my ($self, $items) = @_; 3323 my ($self, $items) = @_;
3185 3324
3186 $self->{scrolled}->clear; 3325 $self->{child}->clear;
3187 return unless $items; 3326 return unless $items;
3188 3327
3189 my @items = sort { 3328 my @items = sort {
3190 ($a->{type} <=> $b->{type}) 3329 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name}) 3330 or ($a->{name} cmp $b->{name})
… …
3195 3334
3196 my $row = 0; 3335 my $row = 0;
3197 for my $item (@items) { 3336 for my $item (@items) {
3198 CFClient::Item::update_widgets $item; 3337 CFClient::Item::update_widgets $item;
3199 3338
3200 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3339 $self->{child}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3340 $self->{child}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3341 $self->{child}->add (2, $row, $item->{weight_widget});
3203 3342
3204 $row++; 3343 $row++;
3205 } 3344 }
3206} 3345}
3207 3346
… …
3404 3543
3405############################################################################# 3544#############################################################################
3406 3545
3407package CFClient::UI::SpellList; 3546package CFClient::UI::SpellList;
3408 3547
3409our @ISA = CFClient::UI::ScrolledWindow::; 3548our @ISA = CFClient::UI::Table::;
3410 3549
3411sub new { 3550sub new {
3412 my $class = shift; 3551 my $class = shift;
3413 3552
3414 my $self = $class->SUPER::new ( 3553 my $self = $class->SUPER::new (
3415 binding => [], 3554 binding => [],
3416 commands => [], 3555 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_, 3556 @_,
3419 ) 3557 )
3420} 3558}
3421 3559
3422# XXX: Do sorting? Argl... 3560my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3561
3562my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3563 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3564my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3565 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3566my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3567 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3568my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3569 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3570my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3571 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3572
3573sub rebuild_spell_list {
3574 my ($self) = @_;
3575
3576 $CFClient::UI::ROOT->on_refresh ($self => sub {
3577 $self->clear;
3578
3579 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3580 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3581 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3582 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3583 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3584
3585 my $row = 0;
3586
3587 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3588 my $spell = $self->{spell}{$_};
3589
3590 $row++;
3591
3592 my $spell_cb = sub {
3593 my ($widget, $ev) = @_;
3594
3595 if ($ev->{button} == 1) {
3596 $::CONN->user_send ("cast $spell->{name}");
3597 } elsif ($ev->{button} == 2) {
3598 $::CONN->user_send ("invoke $spell->{name}");
3599 } elsif ($ev->{button} == 3) {
3600 (new CFClient::UI::Menu
3601 items => [
3602 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3603 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3604 ],
3605 )->popup ($ev);
3606 } else {
3607 return 0;
3608 }
3609
3610 1
3611 };
3612
3613 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3614
3615 #TODO: add path info to tooltip
3616 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3617
3618 $self->add (0, $row, new CFClient::UI::Face
3619 face => $spell->{face},
3620 can_hover => 1,
3621 can_events => 1,
3622 tooltip => $tooltip,
3623 on_button_down => $spell_cb,
3624 );
3625
3626 $self->add (1, $row, new CFClient::UI::Label
3627 expand => 1,
3628 text => $spell->{name},
3629 can_hover => 1,
3630 can_events => 1,
3631 tooltip => $tooltip,
3632 on_button_down => $spell_cb,
3633 );
3634
3635 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3636 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3637 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3638 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3639 }
3640 });
3641}
3642
3423sub add_spell { 3643sub add_spell {
3424 my ($self, $spell) = @_; 3644 my ($self, $spell) = @_;
3645
3425 $self->{spells}->{$spell->{name}} = $spell; 3646 $self->{spell}->{$spell->{name}} = $spell;
3426 3647 $self->rebuild_spell_list;
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454} 3648}
3455 3649
3456sub remove_spell { 3650sub remove_spell {
3457 my ($self, $spell) = @_; 3651 my ($self, $spell) = @_;
3652
3458 delete $self->{spells}->{$spell->{name}}; 3653 delete $self->{spell}->{$spell->{name}};
3459 $self->rebuild_spell_list; 3654 $self->rebuild_spell_list;
3460} 3655}
3461 3656
3657sub clear_spells {
3658 my ($self) = @_;
3659
3660 $self->{spell} = {};
3661 $self->rebuild_spell_list;
3662}
3663
3462############################################################################# 3664#############################################################################
3463 3665
3464package CFClient::UI::Root; 3666package CFClient::UI::Root;
3465 3667
3466our @ISA = CFClient::UI::Container::; 3668our @ISA = CFClient::UI::Container::;
3669
3670use List::Util qw(min max);
3467 3671
3468use CFClient::OpenGL; 3672use CFClient::OpenGL;
3469 3673
3470sub new { 3674sub new {
3471 my $class = shift; 3675 my $class = shift;
… …
3606 3810
3607 delete $queue{$widget+0}; 3811 delete $queue{$widget+0};
3608 3812
3609 my ($w, $h) = $widget->size_request; 3813 my ($w, $h) = $widget->size_request;
3610 3814
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3815 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3816 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3817
3818 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3819 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3613 3820
3614 $w = $widget->{force_w} if exists $widget->{force_w}; 3821 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h}; 3822 $h = $widget->{force_h} if exists $widget->{force_h};
3616 3823
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3824 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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