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.292 by root, Tue Jun 6 03:02:15 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);
… …
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;
1622 1662
1623 if ($tex->{format} == GL_ALPHA) { 1663 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1624 glColor @{$self->{fg}}; 1665 glColor @{$self->{fg}};
1625 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1626 } else { 1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1627 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1628 } 1670 }
1629 1671
1630 glDisable GL_TEXTURE_2D; 1672 glDisable GL_TEXTURE_2D;
1631} 1673}
… …
1649 can_hover => 1, 1691 can_hover => 1,
1650 can_focus => 1, 1692 can_focus => 1,
1651 valign => 0, 1693 valign => 0,
1652 can_events => 1, 1694 can_events => 1,
1653 #text => ... 1695 #text => ...
1696 #hidden => "*",
1654 @_ 1697 @_
1655 ) 1698 )
1656} 1699}
1657 1700
1658sub _set_text { 1701sub _set_text {
… …
1660 1703
1661 delete $self->{cur_h}; 1704 delete $self->{cur_h};
1662 1705
1663 return if $self->{text} eq $text; 1706 return if $self->{text} eq $text;
1664 1707
1665 delete $self->{texture};
1666
1667 $self->{last_activity} = $::NOW; 1708 $self->{last_activity} = $::NOW;
1668 $self->{text} = $text; 1709 $self->{text} = $text;
1669 1710
1670 $text =~ s/./*/g if $self->{hidden}; 1711 $text =~ s/./*/g if $self->{hidden};
1671 $self->{layout}->set_text ("$text "); 1712 $self->{layout}->set_text ("$text ");
1713 delete $self->{size_req};
1672 1714
1673 $self->_emit (changed => $self->{text}); 1715 $self->_emit (changed => $self->{text});
1716
1717 $self->realloc;
1718 $self->update;
1674} 1719}
1675 1720
1676sub set_text { 1721sub set_text {
1677 my ($self, $text) = @_; 1722 my ($self, $text) = @_;
1678 1723
1679 $self->{cursor} = length $text; 1724 $self->{cursor} = length $text;
1680 $self->_set_text ($text); 1725 $self->_set_text ($text);
1681
1682 $self->realloc;
1683} 1726}
1684 1727
1685sub get_text { 1728sub get_text {
1686 $_[0]{text} 1729 $_[0]{text}
1687} 1730}
… …
1767 my ($self) = @_; 1810 my ($self) = @_;
1768 1811
1769 local $self->{fg} = $self->{fg}; 1812 local $self->{fg} = $self->{fg};
1770 1813
1771 if ($FOCUS == $self) { 1814 if ($FOCUS == $self) {
1772 glColor @{$self->{active_bg}}; 1815 glColor_premultiply @{$self->{active_bg}};
1773 $self->{fg} = $self->{active_fg}; 1816 $self->{fg} = $self->{active_fg};
1774 } else { 1817 } else {
1775 glColor @{$self->{bg}}; 1818 glColor_premultiply @{$self->{bg}};
1776 } 1819 }
1777 1820
1778 glEnable GL_BLEND; 1821 glEnable GL_BLEND;
1779 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1822 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1780 glBegin GL_QUADS; 1823 glBegin GL_QUADS;
1781 glVertex 0 , 0; 1824 glVertex 0 , 0;
1782 glVertex 0 , $self->{h}; 1825 glVertex 0 , $self->{h};
1783 glVertex $self->{w}, $self->{h}; 1826 glVertex $self->{w}, $self->{h};
1784 glVertex $self->{w}, 0; 1827 glVertex $self->{w}, 0;
… …
1894} 1937}
1895 1938
1896sub _draw { 1939sub _draw {
1897 my ($self) = @_; 1940 my ($self) = @_;
1898 1941
1899 local $self->{fg} = $self->{fg}; 1942 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1900
1901 if ($GRAB == $self) {
1902 $self->{fg} = $self->{active_fg};
1903 }
1904 1943
1905 glEnable GL_TEXTURE_2D; 1944 glEnable GL_TEXTURE_2D;
1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1945 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907 glColor 0, 0, 0, 1; 1946 glColor 0, 0, 0, 1;
1908 1947
… …
2133 2172
2134 my $h1 = $self->{h} * (1 - $ycut1); 2173 my $h1 = $self->{h} * (1 - $ycut1);
2135 my $h2 = $self->{h} * (1 - $ycut2); 2174 my $h2 = $self->{h} * (1 - $ycut2);
2136 2175
2137 glEnable GL_BLEND; 2176 glEnable GL_BLEND;
2138 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2177 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2178 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2139 glEnable GL_TEXTURE_2D; 2179 glEnable GL_TEXTURE_2D;
2140 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2180 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2141 2181
2142 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2182 glBindTexture GL_TEXTURE_2D, $t1->{name};
2143 glBegin GL_QUADS; 2183 glBegin GL_QUADS;
… …
2328} 2368}
2329 2369
2330sub update { 2370sub update {
2331 my ($self) = @_; 2371 my ($self) = @_;
2332 2372
2333 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2373 delete $self->{knob_w};
2374 $self->SUPER::update;
2375}
2376
2377sub _draw {
2378 my ($self) = @_;
2379
2380 unless ($self->{knob_w}) {
2334 $self->set_value ($self->{range}[0]); 2381 $self->set_value ($self->{range}[0]);
2335 2382
2336 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2383 my ($value, $lo, $hi, $page) = @{$self->{range}};
2337 my $range = ($hi - $page - $lo) || 1e-100; 2384 my $range = ($hi - $page - $lo) || 1e-100;
2338 2385
… …
2344 $value = ($value - $lo) / $range; 2391 $value = ($value - $lo) / $range;
2345 $value = $value * $self->{scale} + $self->{offset}; 2392 $value = $value * $self->{scale} + $self->{offset};
2346 2393
2347 $self->{knob_x} = $value - $knob_w * 0.5; 2394 $self->{knob_x} = $value - $knob_w * 0.5;
2348 $self->{knob_w} = $knob_w; 2395 $self->{knob_w} = $knob_w;
2349 }); 2396 }
2350
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356 2397
2357 $self->SUPER::_draw (); 2398 $self->SUPER::_draw ();
2358 2399
2359 glScale $self->{w}, $self->{h}; 2400 glScale $self->{w}, $self->{h};
2360 2401
… …
2465 $self->SUPER::size_allocate ($w, $h); 2506 $self->SUPER::size_allocate ($w, $h);
2466 2507
2467 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2508 $self->{layout}->set_font ($self->{font}) if $self->{font};
2468 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2509 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2469 $self->{layout}->set_width ($self->{children}[0]{w}); 2510 $self->{layout}->set_width ($self->{children}[0]{w});
2511 $self->{layout}->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2470 2512
2471 $self->reflow; 2513 $self->reflow;
2472} 2514}
2473 2515
2474sub text_size { 2516sub text_size {
… …
2476 2518
2477 my $layout = $self->{layout}; 2519 my $layout = $self->{layout};
2478 2520
2479 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2521 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2480 $layout->set_width ($self->{children}[0]{w} - $indent); 2522 $layout->set_width ($self->{children}[0]{w} - $indent);
2523 $layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2481 $layout->set_markup ($text); 2524 $layout->set_markup ($text);
2482 2525
2483 $layout->size 2526 $layout->size
2484} 2527}
2485 2528
… …
2537 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2580 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2538 2581
2539 for (@{$self->{par}}) { 2582 for (@{$self->{par}}) {
2540 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2583 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2541 $layout->set_width ($W - $_->[3]); 2584 $layout->set_width ($W - $_->[3]);
2585 $layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2542 $layout->set_markup ($_->[4]); 2586 $layout->set_markup ($_->[4]);
2543 my ($w, $h) = $layout->size; 2587 my ($w, $h) = $layout->size;
2544 $_->[0] = $w + $_->[3]; 2588 $_->[0] = $w + $_->[3];
2545 $_->[1] = $h; 2589 $_->[1] = $h;
2546 } 2590 }
… …
2554 2598
2555 delete $self->{texture}; 2599 delete $self->{texture};
2556 } 2600 }
2557 2601
2558 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2602 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2559 glClearColor 0.5, 0.5, 0.5, 0; 2603 glClearColor 0, 0, 0, 0;
2560 glClear GL_COLOR_BUFFER_BIT; 2604 glClear GL_COLOR_BUFFER_BIT;
2561 2605
2562 my $top = int $self->{children}[1]{range}[0]; 2606 my $top = int $self->{children}[1]{range}[0];
2563 2607
2564 my $y0 = $top; 2608 my $y0 = $top;
… …
2578 my $h = $par->[1]; 2622 my $h = $par->[1];
2579 2623
2580 if ($y0 < $y + $h && $y < $y1) { 2624 if ($y0 < $y + $h && $y < $y1) {
2581 $layout->set_foreground (@{ $par->[2] }); 2625 $layout->set_foreground (@{ $par->[2] });
2582 $layout->set_width ($W - $par->[3]); 2626 $layout->set_width ($W - $par->[3]);
2627 $layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2583 $layout->set_markup ($par->[4]); 2628 $layout->set_markup ($par->[4]);
2584 2629
2585 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2630 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2586 2631
2587 glRasterPos $par->[3], $y - $y0; 2632 glRasterPos $par->[3], $y - $y0;
… …
2599sub _draw { 2644sub _draw {
2600 my ($self) = @_; 2645 my ($self) = @_;
2601 2646
2602 glEnable GL_TEXTURE_2D; 2647 glEnable GL_TEXTURE_2D;
2603 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2648 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2604 glColor 1, 1, 1, 1; 2649 glColor 0, 0, 0, 1;
2605 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2650 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2606 glDisable GL_TEXTURE_2D; 2651 glDisable GL_TEXTURE_2D;
2607 2652
2608 $self->{children}[1]->draw; 2653 $self->{children}[1]->draw;
2609 2654
2610} 2655}
… …
2837 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2882 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2838 2883
2839 if ($tex) { 2884 if ($tex) {
2840 glEnable GL_TEXTURE_2D; 2885 glEnable GL_TEXTURE_2D;
2841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2886 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2842 glColor 1, 1, 1, 1; 2887 glColor 0, 0, 0, 1;
2843 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2888 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2844 glDisable GL_TEXTURE_2D; 2889 glDisable GL_TEXTURE_2D;
2845 } 2890 }
2846} 2891}
2847 2892
… …
2851 $self->{timer}->cancel 2896 $self->{timer}->cancel
2852 if $self->{timer}; 2897 if $self->{timer};
2853 2898
2854 $self->SUPER::DESTROY; 2899 $self->SUPER::DESTROY;
2855} 2900}
2901
2902#############################################################################
2903
2904package CFClient::UI::Buttonbar;
2905
2906our @ISA = CFClient::UI::HBox::;
2907
2908# TODO: should actualyl wrap buttons and other goodies.
2856 2909
2857############################################################################# 2910#############################################################################
2858 2911
2859package CFClient::UI::Menu; 2912package CFClient::UI::Menu;
2860 2913
… …
2872 ); 2925 );
2873 2926
2874 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2927 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2875 2928
2876 for my $item (@{ $self->{items} }) { 2929 for my $item (@{ $self->{items} }) {
2877 my ($widget, $cb) = @$item; 2930 my ($widget, $cb, $tooltip) = @$item;
2878 2931
2879 # handle various types of items, only text for now 2932 # handle various types of items, only text for now
2880 if (!ref $widget) { 2933 if (!ref $widget) {
2881 $widget = new CFClient::UI::Label 2934 $widget = new CFClient::UI::Label
2882 can_hover => 1, 2935 can_hover => 1,
2883 can_events => 1, 2936 can_events => 1,
2884 text => $widget; 2937 text => $widget,
2938 tooltip => $tooltip
2885 } 2939 }
2886 2940
2887 $self->{item}{$widget} = $item; 2941 $self->{item}{$widget} = $item;
2888 2942
2889 $self->{vbox}->add ($widget); 2943 $self->{vbox}->add ($widget);
… …
2932 1 2986 1
2933} 2987}
2934 2988
2935############################################################################# 2989#############################################################################
2936 2990
2937package CFClient::UI::Statusbox; 2991package CFClient::UI::Multiplexer;
2938 2992
2939our @ISA = CFClient::UI::VBox::; 2993our @ISA = CFClient::UI::Container::;
2940 2994
2941sub new { 2995sub new {
2942 my $class = shift; 2996 my $class = shift;
2943 2997
2944 $class->SUPER::new ( 2998 my $self = $class->SUPER::new (
2999 @_,
3000 );
3001
3002 $self->{current} = $self->{children}[0]
3003 if @{ $self->{children} };
3004
3005 $self
3006}
3007
3008sub add {
3009 my ($self, @widgets) = @_;
3010
3011 $self->SUPER::add (@widgets);
3012
3013 $self->{current} = $self->{children}[0]
3014 if @{ $self->{children} };
3015}
3016
3017sub set_current_page {
3018 my ($self, $page_or_widget) = @_;
3019
3020 my $widget = ref $page_or_widget
3021 ? $page_or_widget
3022 : $self->{children}[$page_or_widget];
3023
3024 $self->{current} = $widget;
3025 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3026
3027 $self->_emit (page_changed => $self->{current});
3028
3029 $self->realloc;
3030}
3031
3032sub visible_children {
3033 $_[0]{current}
3034}
3035
3036sub size_request {
3037 my ($self) = @_;
3038
3039 $self->{current}->size_request
3040}
3041
3042sub size_allocate {
3043 my ($self, $w, $h) = @_;
3044
3045 $self->{current}->configure (0, 0, $w, $h);
3046}
3047
3048sub _draw {
3049 my ($self) = @_;
3050
3051 $self->{current}->draw;
3052}
3053
3054#############################################################################
3055
3056package CFClient::UI::Notebook;
3057
3058our @ISA = CFClient::UI::VBox::;
3059
3060sub new {
3061 my $class = shift;
3062
3063 my $self = $class->SUPER::new (
3064 buttonbar => (new CFClient::UI::Buttonbar),
3065 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3066 # filter => # will be put between multiplexer and $self
3067 @_,
3068 );
3069
3070 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3071 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3072
3073 $self
3074}
3075
3076sub add {
3077 my ($self, $title, $widget, $tooltip) = @_;
3078
3079 Scalar::Util::weaken $self;
3080
3081 $self->{buttonbar}->add (new CFClient::UI::Button
3082 markup => $title,
3083 tooltip => $tooltip,
3084 on_activate => sub { $self->set_current_page ($widget) },
3085 );
3086
3087 $self->{multiplexer}->add ($widget);
3088}
3089
3090sub set_current_page {
3091 my ($self, $page) = @_;
3092
3093 $self->{multiplexer}->set_current_page ($page);
3094 $self->_emit (page_changed => $self->{multiplexer}{current});
3095}
3096
3097#############################################################################
3098
3099package CFClient::UI::Combobox;
3100
3101use utf8;
3102
3103our @ISA = CFClient::UI::Button::;
3104
3105sub new {
3106 my $class = shift;
3107
3108 my $self = $class->SUPER::new (
3109 options => [], # [title, value, tooltip], ...
3110 value => undef,
3111 @_,
3112 );
3113
3114 $self->_set_value ($self->{value});
3115
3116 $self
3117}
3118
3119sub button_down {
3120 my ($self, $ev) = @_;
3121
3122 my @menu_items;
3123
3124 for (@{ $self->{options} }) {
3125 my ($title, $value, $tooltip) = @$_;
3126
3127 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3128 }
3129
3130 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3131}
3132
3133sub _set_value {
3134 my ($self, $value) = @_;
3135
3136 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3137 or return;
3138
3139 $self->{value} = $item->[1];
3140 $self->set_markup ("$item->[0] ⇓");
3141 $self->set_tooltip ($item->[2]);
3142}
3143
3144sub set_value {
3145 my ($self, $value) = @_;
3146
3147 return unless $self->{value} ne $value;
3148
3149 $self->_set_value ($value);
3150 $self->_emit (changed => $value);
3151}
3152
3153#############################################################################
3154
3155package CFClient::UI::Statusbox;
3156
3157our @ISA = CFClient::UI::VBox::;
3158
3159sub new {
3160 my $class = shift;
3161
3162 my $self = $class->SUPER::new (
2945 fontsize => 0.8, 3163 fontsize => 0.8,
2946 @_, 3164 @_,
2947 ) 3165 );
3166
3167 Scalar::Util::weaken (my $this = $self);
3168
3169 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3170
3171 $self
2948} 3172}
2949 3173
2950sub reorder { 3174sub reorder {
2951 my ($self) = @_; 3175 my ($self) = @_;
2952 my $NOW = time; 3176 my $NOW = Time::HiRes::time;
3177
3178 # freeze display when hovering over any label
3179 return if $CFClient::UI::TOOLTIP->{owner}
3180 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3181 values %{ $self->{item} };
2953 3182
2954 while (my ($k, $v) = each %{ $self->{item} }) { 3183 while (my ($k, $v) = each %{ $self->{item} }) {
2955 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3184 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2956 } 3185 }
2957 3186
… …
2960 my @items = sort { 3189 my @items = sort {
2961 $a->{pri} <=> $b->{pri} 3190 $a->{pri} <=> $b->{pri}
2962 or $b->{id} <=> $a->{id} 3191 or $b->{id} <=> $a->{id}
2963 } values %{ $self->{item} }; 3192 } values %{ $self->{item} };
2964 3193
3194 $self->{timer}->interval (1);
3195
2965 my $count = 10 + 1; 3196 my $count = 10 + 1;
2966 for my $item (@items) { 3197 for my $item (@items) {
2967 last unless --$count; 3198 last unless --$count;
2968 3199
2969 push @widgets, $item->{label} ||= do { 3200 my $label = $item->{label} ||= do {
2970 # TODO: doesn't handle markup well (read as: at all) 3201 # TODO: doesn't handle markup well (read as: at all)
2971 my $short = $item->{count} > 1 3202 my $short = $item->{count} > 1
2972 ? "<b>$item->{count} ×</b> $item->{text}" 3203 ? "<b>$item->{count} ×</b> $item->{text}"
2973 : $item->{text}; 3204 : $item->{text};
2974 3205
… …
2982 tooltip => $item->{tooltip}, 3213 tooltip => $item->{tooltip},
2983 tooltip_font => $::FONT_PROP, 3214 tooltip_font => $::FONT_PROP,
2984 tooltip_width => 0.67, 3215 tooltip_width => 0.67,
2985 fontsize => $item->{fontsize} || $self->{fontsize}, 3216 fontsize => $item->{fontsize} || $self->{fontsize},
2986 max_w => $::WIDTH * 0.44, 3217 max_w => $::WIDTH * 0.44,
2987 fg => $item->{fg}, 3218 fg => [@{ $item->{fg} }],
2988 can_events => 1, 3219 can_events => 1,
2989 can_hover => 1 3220 can_hover => 1
2990 }; 3221 };
3222
3223 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3224 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3225 $label->update;
3226 $label->set_max_size (undef, $label->{req_h} * $diff)
3227 if $diff < 1;
3228 $self->{timer}->interval (1/30);
3229 } else {
3230 $label->{fg}[3] = $item->{fg}[3] || 1;
3231 }
3232
3233 push @widgets, $label;
2991 } 3234 }
2992 3235
2993 $self->clear; 3236 $self->clear;
2994 $self->SUPER::add (reverse @widgets); 3237 $self->SUPER::add (reverse @widgets);
2995} 3238}
… …
3000 $text =~ s/^\s+//; 3243 $text =~ s/^\s+//;
3001 $text =~ s/\s+$//; 3244 $text =~ s/\s+$//;
3002 3245
3003 return unless $text; 3246 return unless $text;
3004 3247
3005 my $timeout = time + ((delete $arg{timeout}) || 60); 3248 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3006 3249
3007 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3250 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3008 3251
3009 if (my $item = $self->{item}{$group}) { 3252 if (my $item = $self->{item}{$group}) {
3010 if ($item->{text} eq $text) { 3253 if ($item->{text} eq $text) {
… …
3040 3283
3041 $self->reorder; 3284 $self->reorder;
3042 $self->SUPER::reconfigure; 3285 $self->SUPER::reconfigure;
3043} 3286}
3044 3287
3288sub DESTROY {
3289 my ($self) = @_;
3290
3291 $self->{timer}->cancel;
3292
3293 $self->SUPER::DESTROY;
3294}
3295
3045############################################################################# 3296#############################################################################
3046 3297
3047package CFClient::UI::Inventory; 3298package CFClient::UI::Inventory;
3048 3299
3049our @ISA = CFClient::UI::ScrolledWindow::; 3300our @ISA = CFClient::UI::ScrolledWindow::;
3050 3301
3051sub new { 3302sub new {
3052 my $class = shift; 3303 my $class = shift;
3053 3304
3054 my $self = $class->SUPER::new ( 3305 my $self = $class->SUPER::new (
3055 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3306 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3056 @_, 3307 @_,
3057 ); 3308 );
3058 3309
3059 $self 3310 $self
3060} 3311}
3061 3312
3062sub set_items { 3313sub set_items {
3063 my ($self, $items) = @_; 3314 my ($self, $items) = @_;
3064 3315
3065 $self->{scrolled}->clear; 3316 $self->{child}->clear;
3066 return unless $items; 3317 return unless $items;
3067 3318
3068 my @items = sort { 3319 my @items = sort {
3069 ($a->{type} <=> $b->{type}) 3320 ($a->{type} <=> $b->{type})
3070 or ($a->{name} cmp $b->{name}) 3321 or ($a->{name} cmp $b->{name})
… …
3074 3325
3075 my $row = 0; 3326 my $row = 0;
3076 for my $item (@items) { 3327 for my $item (@items) {
3077 CFClient::Item::update_widgets $item; 3328 CFClient::Item::update_widgets $item;
3078 3329
3079 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3330 $self->{child}->add (0, $row, $item->{face_widget});
3080 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3331 $self->{child}->add (1, $row, $item->{desc_widget});
3081 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3332 $self->{child}->add (2, $row, $item->{weight_widget});
3082 3333
3083 $row++; 3334 $row++;
3084 } 3335 }
3085} 3336}
3086 3337
… …
3283 3534
3284############################################################################# 3535#############################################################################
3285 3536
3286package CFClient::UI::SpellList; 3537package CFClient::UI::SpellList;
3287 3538
3288our @ISA = CFClient::UI::FancyFrame::; 3539our @ISA = CFClient::UI::Table::;
3289 3540
3290sub new { 3541sub new {
3291 my $class = shift; 3542 my $class = shift;
3292 3543
3293 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3544 my $self = $class->SUPER::new (
3294 3545 binding => [],
3295 $self->add (new CFClient::UI::ScrolledWindow 3546 commands => [],
3296 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3547 @_,
3297 3548 )
3298 $self;
3299} 3549}
3300 3550
3301# XXX: Do sorting? Argl... 3551my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3552 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3553my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3554 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3555my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3556 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3557
3558sub rebuild_spell_list {
3559 my ($self) = @_;
3560
3561 $CFClient::UI::ROOT->on_refresh ($self => sub {
3562 $self->clear;
3563
3564 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3565 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3566 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3567 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3568
3569 my $row = 0;
3570
3571 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3572 my $spell = $self->{spell}{$_};
3573
3574 $row++;
3575
3576 $self->add (0, $row, new CFClient::UI::Face
3577 face => $spell->{face},
3578 can_hover => 1,
3579 can_events => 1,
3580 tooltip => $spell->{message},
3581 );
3582
3583 $self->add (1, $row, new CFClient::UI::Label
3584 expand => 1,
3585 text => $spell->{name},
3586 can_hover => 1,
3587 can_events => 1,
3588 tooltip => $spell->{message},
3589 );
3590
3591 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3592 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3593 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3594
3595 # TODO: should be done via popup
3596 $self->add (5, $row, new CFClient::UI::Button
3597 text => "bind",
3598 tooltip => "bind spell readying (cast command) to key",
3599 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3600 );
3601 }
3602 });
3603}
3604
3302sub add_spell { 3605sub add_spell {
3303 my ($self, $spell) = @_; 3606 my ($self, $spell) = @_;
3607
3304 $self->{spells}->{$spell->{name}} = $spell; 3608 $self->{spell}->{$spell->{name}} = $spell;
3305 3609 $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} 3610}
3334 3611
3335sub remove_spell { 3612sub remove_spell {
3336 my ($self, $spell) = @_; 3613 my ($self, $spell) = @_;
3614
3337 delete $self->{spells}->{$spell->{name}}; 3615 delete $self->{spell}->{$spell->{name}};
3338 $self->rebuild_spell_list; 3616 $self->rebuild_spell_list;
3339} 3617}
3340 3618
3341############################################################################# 3619#############################################################################
3342 3620
3343package CFClient::UI::Root; 3621package CFClient::UI::Root;
3344 3622
3345our @ISA = CFClient::UI::Container::; 3623our @ISA = CFClient::UI::Container::;
3624
3625use List::Util qw(min max);
3346 3626
3347use CFClient::OpenGL; 3627use CFClient::OpenGL;
3348 3628
3349sub new { 3629sub new {
3350 my $class = shift; 3630 my $class = shift;
… …
3485 3765
3486 delete $queue{$widget+0}; 3766 delete $queue{$widget+0};
3487 3767
3488 my ($w, $h) = $widget->size_request; 3768 my ($w, $h) = $widget->size_request;
3489 3769
3490 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3770 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3491 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3771 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3772
3773 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3774 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3492 3775
3493 $w = $widget->{force_w} if exists $widget->{force_w}; 3776 $w = $widget->{force_w} if exists $widget->{force_w};
3494 $h = $widget->{force_h} if exists $widget->{force_h}; 3777 $h = $widget->{force_h} if exists $widget->{force_h};
3495 3778
3496 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3779 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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