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.269 by root, Fri Jun 2 06:22:55 2006 UTC vs.
Revision 1.294 by root, Tue Jun 6 03:19:26 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 {
… …
439 447
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS; 449 unless $FOCUS;
442} 450}
443 451
444sub mouse_motion { } 452sub mouse_motion { 0 }
445sub button_up { } 453sub button_up { 0 }
446sub key_down { } 454sub key_down { 0 }
447sub key_up { } 455sub key_up { 0 }
448 456
449sub button_down { 457sub button_down {
450 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
451 459
452 $self->focus_in; 460 $self->focus_in;
461
462 0
453} 463}
454 464
455sub find_widget { 465sub find_widget {
456 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
457 467
… …
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
543 553
544 glPushMatrix; 554 glPushMatrix;
545 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
546 $self->_draw;
547 glPopMatrix;
548 556
549 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
550 my ($x, $y) = @$self{qw(x y)};
551
552 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
553 glEnable GL_BLEND; 559 glEnable GL_BLEND;
554 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
555 glBegin GL_QUADS; 561 glBegin GL_QUADS;
556 glVertex $x , $y; 562 glVertex 0 , 0;
557 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
558 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
559 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
560 glEnd; 566 glEnd;
561 glDisable GL_BLEND; 567 glDisable GL_BLEND;
562 } 568 }
563 569
564 if ($ENV{CFPLUS_DEBUG} & 1) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
565 glPushMatrix; 571 glPushMatrix;
566 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
568 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
569 glVertex 0 , 0; 575 glVertex 0 , 0;
570 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
571 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
572 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
573 glEnd; 579 glEnd;
574 glPopMatrix; 580 glPopMatrix;
575 #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;
576 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
577} 586}
578 587
579sub _draw { 588sub _draw {
580 my ($self) = @_; 589 my ($self) = @_;
581 590
… …
619 628
620 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
621 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
622 631
623 glEnable GL_BLEND; 632 glEnable GL_BLEND;
624 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
625 glColor @$color; 634 glColor_premultiply @$color;
626 635
627 glBegin GL_QUADS; 636 glBegin GL_QUADS;
628 glVertex 0 , 0; 637 glVertex 0 , 0;
629 glVertex 0 , $h; 638 glVertex 0 , $h;
630 glVertex $w, $h; 639 glVertex $w, $h;
… …
661our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
662 671
663sub new { 672sub new {
664 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
665 674
666 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
667 676
668 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
669 children => [], 678 children => [],
670 can_events => 0, 679 can_events => 0,
671 %arg, 680 %arg,
672 ); 681 );
682
673 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
674 685
675 $self 686 $self
676} 687}
677 688
678sub add { 689sub add {
… …
726 $x -= $self->{x}; 737 $x -= $self->{x};
727 $y -= $self->{y}; 738 $y -= $self->{y};
728 739
729 my $res; 740 my $res;
730 741
731 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
732 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
733 and return $res; 744 and return $res;
734 } 745 }
735 746
736 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
785 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
786} 797}
787 798
788############################################################################# 799#############################################################################
789 800
801# back-buffered drawing area
802
790package CFClient::UI::Window; 803package CFClient::UI::Window;
791 804
792our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
793 806
794use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
845 my $tex = $self->{texture} 858 my $tex = $self->{texture}
846 or return; 859 or return;
847 860
848 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
850 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
851 864
852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
853 866
854 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
855} 868}
… …
946package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
947 960
948our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
949 962
950sub new { 963sub new {
951 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
952 967
953 my $self; 968 my $self;
954 969
955 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
956 vertical => 1, 971 vertical => 1,
… …
961 ; 976 ;
962 977
963 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
964 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
965 slider => $slider, 980 slider => $slider,
966 @_, 981 %arg,
967 ); 982 );
968 983
969 $self->{vp}->add ($self->{scrolled});
970 $self->add ($self->{vp});
971 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
972 986
973 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
974} 994}
975 995
976sub update { 996sub update {
977 my ($self) = @_; 997 my ($self) = @_;
978 998
… …
1017 1037
1018 if ($self->{bg}) { 1038 if ($self->{bg}) {
1019 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
1020 1040
1021 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1023 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
1024 1044
1025 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
1026 glVertex 0 , 0; 1046 glVertex 0 , 0;
1027 glVertex 0 , $h; 1047 glVertex 0 , $h;
1028 glVertex $w, $h; 1048 glVertex $w, $h;
… …
1142 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1143 1163
1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1147 $self->realloc; 1168 $self->realloc;
1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 }; 1169 };
1150 1170
1151 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1152 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1153 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1156 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1157 1177
1158 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1159 1179
1160 $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});
1161 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1162 } 1188 1
1163} 1189}
1164 1190
1165sub button_up { 1191sub button_up {
1166 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1167 1193
1168 delete $self->{motion}; 1194 !!delete $self->{motion}
1169} 1195}
1170 1196
1171sub mouse_motion { 1197sub mouse_motion {
1172 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1173 1199
1174 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1175} 1203}
1176 1204
1177sub _draw { 1205sub _draw {
1178 my ($self) = @_; 1206 my ($self) = @_;
1179 1207
… …
1511 1539
1512 delete $self->{texture}; 1540 delete $self->{texture};
1513 $self->SUPER::update; 1541 $self->SUPER::update;
1514} 1542}
1515 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1516sub set_text { 1551sub set_text {
1517 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1518 1553
1519 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1520 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1521 1556
1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1523 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1524 1559
1560 delete $self->{size_req};
1525 $self->realloc; 1561 $self->realloc;
1526 $self->update; 1562 $self->update;
1527} 1563}
1528 1564
1529sub set_markup { 1565sub set_markup {
… …
1535 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1536 1572
1537 $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;
1538 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1539 1575
1576 delete $self->{size_req};
1540 $self->realloc; 1577 $self->realloc;
1541 $self->update; 1578 $self->update;
1542} 1579}
1543 1580
1544sub size_request { 1581sub size_request {
1545 my ($self) = @_; 1582 my ($self) = @_;
1546 1583
1584 $self->{size_req} ||= do {
1547 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1548 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1590
1553 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1554 1592
1555 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1556 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1557 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1558 1596
1559 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1560 1598
1561 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1562 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1563 } 1604 };
1564 1605
1565 ($w, $h) 1606 @{ $self->{size_req} }
1566} 1607}
1567 1608
1568sub size_allocate { 1609sub size_allocate {
1569 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1570 1611
… …
1579 1620
1580 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1581 delete $self->{texture}; 1622 delete $self->{texture};
1582 1623
1583 $self->realloc; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1584} 1633}
1585 1634
1586sub _draw { 1635sub _draw {
1587 my ($self) = @_; 1636 my ($self) = @_;
1588 1637
… …
1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1609 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1610 }; 1659 };
1611 1660
1612 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1613 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};
1614 1665
1615 if ($tex->{format} == GL_ALPHA) { 1666 if ($tex->{format} == GL_ALPHA) {
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1616 glColor @{$self->{fg}}; 1668 glColor @{$self->{fg}};
1617 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1618 } else { 1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1619 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1620 } 1673 }
1621 1674
1622 glDisable GL_TEXTURE_2D; 1675 glDisable GL_TEXTURE_2D;
1623} 1676}
1624 1677
… …
1641 can_hover => 1, 1694 can_hover => 1,
1642 can_focus => 1, 1695 can_focus => 1,
1643 valign => 0, 1696 valign => 0,
1644 can_events => 1, 1697 can_events => 1,
1645 #text => ... 1698 #text => ...
1699 #hidden => "*",
1646 @_ 1700 @_
1647 ) 1701 )
1648} 1702}
1649 1703
1650sub _set_text { 1704sub _set_text {
… …
1652 1706
1653 delete $self->{cur_h}; 1707 delete $self->{cur_h};
1654 1708
1655 return if $self->{text} eq $text; 1709 return if $self->{text} eq $text;
1656 1710
1657 delete $self->{texture};
1658
1659 $self->{last_activity} = $::NOW; 1711 $self->{last_activity} = $::NOW;
1660 $self->{text} = $text; 1712 $self->{text} = $text;
1661 1713
1662 $text =~ s/./*/g if $self->{hidden}; 1714 $text =~ s/./*/g if $self->{hidden};
1663 $self->{layout}->set_text ("$text "); 1715 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req};
1664 1717
1665 $self->_emit (changed => $self->{text}); 1718 $self->_emit (changed => $self->{text});
1719
1720 $self->realloc;
1721 $self->update;
1666} 1722}
1667 1723
1668sub set_text { 1724sub set_text {
1669 my ($self, $text) = @_; 1725 my ($self, $text) = @_;
1670 1726
1671 $self->{cursor} = length $text; 1727 $self->{cursor} = length $text;
1672 $self->_set_text ($text); 1728 $self->_set_text ($text);
1673
1674 $self->realloc;
1675} 1729}
1676 1730
1677sub get_text { 1731sub get_text {
1678 $_[0]{text} 1732 $_[0]{text}
1679} 1733}
… …
1709 $self->{cursor} = length $text; 1763 $self->{cursor} = length $text;
1710 } elsif ($uni == 27) { 1764 } elsif ($uni == 27) {
1711 $self->_emit ('escape'); 1765 $self->_emit ('escape');
1712 } elsif ($uni) { 1766 } elsif ($uni) {
1713 substr $text, $self->{cursor}++, 0, chr $uni; 1767 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else {
1769 return 0;
1714 } 1770 }
1715 1771
1716 $self->_set_text ($text); 1772 $self->_set_text ($text);
1717 1773
1718 $self->realloc; 1774 $self->realloc;
1775
1776 1
1719} 1777}
1720 1778
1721sub focus_in { 1779sub focus_in {
1722 my ($self) = @_; 1780 my ($self) = @_;
1723 1781
… …
1738 utf8::encode $text; 1796 utf8::encode $text;
1739 $self->{cursor} = length substr $text, 0, $idx; 1797 $self->{cursor} = length substr $text, 0, $idx;
1740 1798
1741 $self->_set_text ($self->{text}); 1799 $self->_set_text ($self->{text});
1742 $self->update; 1800 $self->update;
1801
1802 1
1743} 1803}
1744 1804
1745sub mouse_motion { 1805sub mouse_motion {
1746 my ($self, $ev, $x, $y) = @_; 1806 my ($self, $ev, $x, $y) = @_;
1747# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1807# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808
1809 0
1748} 1810}
1749 1811
1750sub _draw { 1812sub _draw {
1751 my ($self) = @_; 1813 my ($self) = @_;
1752 1814
1753 local $self->{fg} = $self->{fg}; 1815 local $self->{fg} = $self->{fg};
1754 1816
1755 if ($FOCUS == $self) { 1817 if ($FOCUS == $self) {
1756 glColor @{$self->{active_bg}}; 1818 glColor_premultiply @{$self->{active_bg}};
1757 $self->{fg} = $self->{active_fg}; 1819 $self->{fg} = $self->{active_fg};
1758 } else { 1820 } else {
1759 glColor @{$self->{bg}}; 1821 glColor_premultiply @{$self->{bg}};
1760 } 1822 }
1761 1823
1762 glEnable GL_BLEND; 1824 glEnable GL_BLEND;
1763 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1825 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1764 glBegin GL_QUADS; 1826 glBegin GL_QUADS;
1765 glVertex 0 , 0; 1827 glVertex 0 , 0;
1766 glVertex 0 , $self->{h}; 1828 glVertex 0 , $self->{h};
1767 glVertex $self->{w}, $self->{h}; 1829 glVertex $self->{w}, $self->{h};
1768 glVertex $self->{w}, 0; 1830 glVertex $self->{w}, 0;
… …
1829 } else { 1891 } else {
1830 $self->set_text ($self->{history_saveback}); 1892 $self->set_text ($self->{history_saveback});
1831 } 1893 }
1832 1894
1833 } else { 1895 } else {
1834 $self->SUPER::key_down ($ev); 1896 return $self->SUPER::key_down ($ev)
1897 }
1898
1835 } 1899 1
1836
1837} 1900}
1838 1901
1839############################################################################# 1902#############################################################################
1840 1903
1841package CFClient::UI::Button; 1904package CFClient::UI::Button;
… …
1870 my ($self, $ev, $x, $y) = @_; 1933 my ($self, $ev, $x, $y) = @_;
1871 1934
1872 $self->emit ("activate") 1935 $self->emit ("activate")
1873 if $x >= 0 && $x < $self->{w} 1936 if $x >= 0 && $x < $self->{w}
1874 && $y >= 0 && $y < $self->{h}; 1937 && $y >= 0 && $y < $self->{h};
1938
1939 1
1875} 1940}
1876 1941
1877sub _draw { 1942sub _draw {
1878 my ($self) = @_; 1943 my ($self) = @_;
1879 1944
1880 local $self->{fg} = $self->{fg}; 1945 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1881
1882 if ($GRAB == $self) {
1883 $self->{fg} = $self->{active_fg};
1884 }
1885 1946
1886 glEnable GL_TEXTURE_2D; 1947 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 glColor 0, 0, 0, 1; 1949 glColor 0, 0, 0, 1;
1889 1950
… …
1933 1994
1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1936 $self->{state} = !$self->{state}; 1997 $self->{state} = !$self->{state};
1937 $self->_emit (changed => $self->{state}); 1998 $self->_emit (changed => $self->{state});
1999 } else {
2000 return 0
2001 }
2002
1938 } 2003 1
1939} 2004}
1940 2005
1941sub _draw { 2006sub _draw {
1942 my ($self) = @_; 2007 my ($self) = @_;
1943 2008
… …
2110 2175
2111 my $h1 = $self->{h} * (1 - $ycut1); 2176 my $h1 = $self->{h} * (1 - $ycut1);
2112 my $h2 = $self->{h} * (1 - $ycut2); 2177 my $h2 = $self->{h} * (1 - $ycut2);
2113 2178
2114 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
2115 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;
2116 glEnable GL_TEXTURE_2D; 2182 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2183 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2184
2119 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2185 glBindTexture GL_TEXTURE_2D, $t1->{name};
2120 glBegin GL_QUADS; 2186 glBegin GL_QUADS;
… …
2281 2347
2282 $self->SUPER::button_down ($ev, $x, $y); 2348 $self->SUPER::button_down ($ev, $x, $y);
2283 2349
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2350 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285 2351
2286 $self->mouse_motion ($ev, $x, $y); 2352 $self->mouse_motion ($ev, $x, $y)
2287} 2353}
2288 2354
2289sub mouse_motion { 2355sub mouse_motion {
2290 my ($self, $ev, $x, $y) = @_; 2356 my ($self, $ev, $x, $y) = @_;
2291 2357
… …
2295 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2361 my (undef, $lo, $hi, $page) = @{$self->{range}};
2296 2362
2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2363 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298 2364
2299 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2365 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2366 } else {
2367 return 0;
2368 }
2369
2300 } 2370 1
2301} 2371}
2302 2372
2303sub update { 2373sub update {
2304 my ($self) = @_; 2374 my ($self) = @_;
2305 2375
2306 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2376 delete $self->{knob_w};
2377 $self->SUPER::update;
2378}
2379
2380sub _draw {
2381 my ($self) = @_;
2382
2383 unless ($self->{knob_w}) {
2307 $self->set_value ($self->{range}[0]); 2384 $self->set_value ($self->{range}[0]);
2308 2385
2309 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2386 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100; 2387 my $range = ($hi - $page - $lo) || 1e-100;
2311 2388
… …
2317 $value = ($value - $lo) / $range; 2394 $value = ($value - $lo) / $range;
2318 $value = $value * $self->{scale} + $self->{offset}; 2395 $value = $value * $self->{scale} + $self->{offset};
2319 2396
2320 $self->{knob_x} = $value - $knob_w * 0.5; 2397 $self->{knob_x} = $value - $knob_w * 0.5;
2321 $self->{knob_w} = $knob_w; 2398 $self->{knob_w} = $knob_w;
2322 }); 2399 }
2323
2324 $self->SUPER::update;
2325}
2326
2327sub _draw {
2328 my ($self) = @_;
2329 2400
2330 $self->SUPER::_draw (); 2401 $self->SUPER::_draw ();
2331 2402
2332 glScale $self->{w}, $self->{h}; 2403 glScale $self->{w}, $self->{h};
2333 2404
… …
2406 my $class = shift; 2477 my $class = shift;
2407 2478
2408 my $self = $class->SUPER::new ( 2479 my $self = $class->SUPER::new (
2409 fontsize => 1, 2480 fontsize => 1,
2410 can_events => 0, 2481 can_events => 0,
2482 indent => 0,
2411 #font => default_font 2483 #font => default_font
2412 @_, 2484 @_,
2413 2485
2414 layout => (new CFClient::Layout 1), 2486 layout => (new CFClient::Layout 1),
2415 par => [], 2487 par => [],
… …
2438 $self->SUPER::size_allocate ($w, $h); 2510 $self->SUPER::size_allocate ($w, $h);
2439 2511
2440 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2512 $self->{layout}->set_font ($self->{font}) if $self->{font};
2441 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2513 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2442 $self->{layout}->set_width ($self->{children}[0]{w}); 2514 $self->{layout}->set_width ($self->{children}[0]{w});
2515 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2443 2516
2444 $self->reflow; 2517 $self->reflow;
2445} 2518}
2446 2519
2447sub text_size { 2520sub text_size {
… …
2449 2522
2450 my $layout = $self->{layout}; 2523 my $layout = $self->{layout};
2451 2524
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2525 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453 $layout->set_width ($self->{children}[0]{w} - $indent); 2526 $layout->set_width ($self->{children}[0]{w} - $indent);
2527 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2454 $layout->set_markup ($text); 2528 $layout->set_markup ($text);
2455 2529
2456 $layout->size 2530 $layout->size
2457} 2531}
2458 2532
… …
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2584 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511 2585
2512 for (@{$self->{par}}) { 2586 for (@{$self->{par}}) {
2513 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2587 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2514 $layout->set_width ($W - $_->[3]); 2588 $layout->set_width ($W - $_->[3]);
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2515 $layout->set_markup ($_->[4]); 2590 $layout->set_markup ($_->[4]);
2516 my ($w, $h) = $layout->size; 2591 my ($w, $h) = $layout->size;
2517 $_->[0] = $w + $_->[3]; 2592 $_->[0] = $w + $_->[3];
2518 $_->[1] = $h; 2593 $_->[1] = $h;
2519 } 2594 }
… …
2527 2602
2528 delete $self->{texture}; 2603 delete $self->{texture};
2529 } 2604 }
2530 2605
2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2606 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2532 glClearColor 0.5, 0.5, 0.5, 0; 2607 glClearColor 0, 0, 0, 0;
2533 glClear GL_COLOR_BUFFER_BIT; 2608 glClear GL_COLOR_BUFFER_BIT;
2534 2609
2535 my $top = int $self->{children}[1]{range}[0]; 2610 my $top = int $self->{children}[1]{range}[0];
2536 2611
2537 my $y0 = $top; 2612 my $y0 = $top;
… …
2551 my $h = $par->[1]; 2626 my $h = $par->[1];
2552 2627
2553 if ($y0 < $y + $h && $y < $y1) { 2628 if ($y0 < $y + $h && $y < $y1) {
2554 $layout->set_foreground (@{ $par->[2] }); 2629 $layout->set_foreground (@{ $par->[2] });
2555 $layout->set_width ($W - $par->[3]); 2630 $layout->set_width ($W - $par->[3]);
2631 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2556 $layout->set_markup ($par->[4]); 2632 $layout->set_markup ($par->[4]);
2557 2633
2558 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2634 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2559 2635
2560 glRasterPos $par->[3], $y - $y0; 2636 glRasterPos $par->[3], $y - $y0;
… …
2572sub _draw { 2648sub _draw {
2573 my ($self) = @_; 2649 my ($self) = @_;
2574 2650
2575 glEnable GL_TEXTURE_2D; 2651 glEnable GL_TEXTURE_2D;
2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2577 glColor 1, 1, 1, 1; 2653 glColor 0, 0, 0, 1;
2578 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2654 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2579 glDisable GL_TEXTURE_2D; 2655 glDisable GL_TEXTURE_2D;
2580 2656
2581 $self->{children}[1]->draw; 2657 $self->{children}[1]->draw;
2582 2658
2583} 2659}
… …
2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2886 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2811 2887
2812 if ($tex) { 2888 if ($tex) {
2813 glEnable GL_TEXTURE_2D; 2889 glEnable GL_TEXTURE_2D;
2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2815 glColor 1, 1, 1, 1; 2891 glColor 0, 0, 0, 1;
2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2892 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2817 glDisable GL_TEXTURE_2D; 2893 glDisable GL_TEXTURE_2D;
2818 } 2894 }
2819} 2895}
2820 2896
… …
2824 $self->{timer}->cancel 2900 $self->{timer}->cancel
2825 if $self->{timer}; 2901 if $self->{timer};
2826 2902
2827 $self->SUPER::DESTROY; 2903 $self->SUPER::DESTROY;
2828} 2904}
2905
2906#############################################################################
2907
2908package CFClient::UI::Buttonbar;
2909
2910our @ISA = CFClient::UI::HBox::;
2911
2912# TODO: should actualyl wrap buttons and other goodies.
2829 2913
2830############################################################################# 2914#############################################################################
2831 2915
2832package CFClient::UI::Menu; 2916package CFClient::UI::Menu;
2833 2917
… …
2845 ); 2929 );
2846 2930
2847 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2931 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2848 2932
2849 for my $item (@{ $self->{items} }) { 2933 for my $item (@{ $self->{items} }) {
2850 my ($widget, $cb) = @$item; 2934 my ($widget, $cb, $tooltip) = @$item;
2851 2935
2852 # handle various types of items, only text for now 2936 # handle various types of items, only text for now
2853 if (!ref $widget) { 2937 if (!ref $widget) {
2854 $widget = new CFClient::UI::Label 2938 $widget = new CFClient::UI::Label
2855 can_hover => 1, 2939 can_hover => 1,
2856 can_events => 1, 2940 can_events => 1,
2857 text => $widget; 2941 text => $widget,
2942 tooltip => $tooltip
2858 } 2943 }
2859 2944
2860 $self->{item}{$widget} = $item; 2945 $self->{item}{$widget} = $item;
2861 2946
2862 $self->{vbox}->add ($widget); 2947 $self->{vbox}->add ($widget);
… …
2883 my ($self, $ev, $x, $y) = @_; 2968 my ($self, $ev, $x, $y) = @_;
2884 2969
2885 # TODO: should use vbox->find_widget or so 2970 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2971 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 2972 $self->{hover} = $self->{item}{$HOVER};
2973
2974 0
2888} 2975}
2889 2976
2890sub button_up { 2977sub button_up {
2891 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2892 2979
… …
2894 undef $GRAB; 2981 undef $GRAB;
2895 $self->hide; 2982 $self->hide;
2896 2983
2897 $self->_emit ("popdown"); 2984 $self->_emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 2985 $self->{hover}[1]->() if $self->{hover};
2986 } else {
2987 return 0
2988 }
2989
2899 } 2990 1
2900} 2991}
2901 2992
2902############################################################################# 2993#############################################################################
2903 2994
2904package CFClient::UI::Statusbox; 2995package CFClient::UI::Multiplexer;
2905 2996
2906our @ISA = CFClient::UI::VBox::; 2997our @ISA = CFClient::UI::Container::;
2907 2998
2908sub new { 2999sub new {
2909 my $class = shift; 3000 my $class = shift;
2910 3001
2911 $class->SUPER::new ( 3002 my $self = $class->SUPER::new (
3003 @_,
3004 );
3005
3006 $self->{current} = $self->{children}[0]
3007 if @{ $self->{children} };
3008
3009 $self
3010}
3011
3012sub add {
3013 my ($self, @widgets) = @_;
3014
3015 $self->SUPER::add (@widgets);
3016
3017 $self->{current} = $self->{children}[0]
3018 if @{ $self->{children} };
3019}
3020
3021sub set_current_page {
3022 my ($self, $page_or_widget) = @_;
3023
3024 my $widget = ref $page_or_widget
3025 ? $page_or_widget
3026 : $self->{children}[$page_or_widget];
3027
3028 $self->{current} = $widget;
3029 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3030
3031 $self->_emit (page_changed => $self->{current});
3032
3033 $self->realloc;
3034}
3035
3036sub visible_children {
3037 $_[0]{current}
3038}
3039
3040sub size_request {
3041 my ($self) = @_;
3042
3043 $self->{current}->size_request
3044}
3045
3046sub size_allocate {
3047 my ($self, $w, $h) = @_;
3048
3049 $self->{current}->configure (0, 0, $w, $h);
3050}
3051
3052sub _draw {
3053 my ($self) = @_;
3054
3055 $self->{current}->draw;
3056}
3057
3058#############################################################################
3059
3060package CFClient::UI::Notebook;
3061
3062our @ISA = CFClient::UI::VBox::;
3063
3064sub new {
3065 my $class = shift;
3066
3067 my $self = $class->SUPER::new (
3068 buttonbar => (new CFClient::UI::Buttonbar),
3069 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3070 # filter => # will be put between multiplexer and $self
3071 @_,
3072 );
3073
3074 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3075 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3076
3077 $self
3078}
3079
3080sub add {
3081 my ($self, $title, $widget, $tooltip) = @_;
3082
3083 Scalar::Util::weaken $self;
3084
3085 $self->{buttonbar}->add (new CFClient::UI::Button
3086 markup => $title,
3087 tooltip => $tooltip,
3088 on_activate => sub { $self->set_current_page ($widget) },
3089 );
3090
3091 $self->{multiplexer}->add ($widget);
3092}
3093
3094sub set_current_page {
3095 my ($self, $page) = @_;
3096
3097 $self->{multiplexer}->set_current_page ($page);
3098 $self->_emit (page_changed => $self->{multiplexer}{current});
3099}
3100
3101#############################################################################
3102
3103package CFClient::UI::Combobox;
3104
3105use utf8;
3106
3107our @ISA = CFClient::UI::Button::;
3108
3109sub new {
3110 my $class = shift;
3111
3112 my $self = $class->SUPER::new (
3113 options => [], # [title, value, tooltip], ...
3114 value => undef,
3115 @_,
3116 );
3117
3118 $self->_set_value ($self->{value});
3119
3120 $self
3121}
3122
3123sub button_down {
3124 my ($self, $ev) = @_;
3125
3126 my @menu_items;
3127
3128 for (@{ $self->{options} }) {
3129 my ($title, $value, $tooltip) = @$_;
3130
3131 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3132 }
3133
3134 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3135}
3136
3137sub _set_value {
3138 my ($self, $value) = @_;
3139
3140 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3141 or return;
3142
3143 $self->{value} = $item->[1];
3144 $self->set_markup ("$item->[0] ⇓");
3145 $self->set_tooltip ($item->[2]);
3146}
3147
3148sub set_value {
3149 my ($self, $value) = @_;
3150
3151 return unless $self->{value} ne $value;
3152
3153 $self->_set_value ($value);
3154 $self->_emit (changed => $value);
3155}
3156
3157#############################################################################
3158
3159package CFClient::UI::Statusbox;
3160
3161our @ISA = CFClient::UI::VBox::;
3162
3163sub new {
3164 my $class = shift;
3165
3166 my $self = $class->SUPER::new (
2912 fontsize => 0.8, 3167 fontsize => 0.8,
2913 @_, 3168 @_,
2914 ) 3169 );
3170
3171 Scalar::Util::weaken (my $this = $self);
3172
3173 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3174
3175 $self
2915} 3176}
2916 3177
2917sub reorder { 3178sub reorder {
2918 my ($self) = @_; 3179 my ($self) = @_;
2919 my $NOW = time; 3180 my $NOW = Time::HiRes::time;
3181
3182 # freeze display when hovering over any label
3183 return if $CFClient::UI::TOOLTIP->{owner}
3184 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3185 values %{ $self->{item} };
2920 3186
2921 while (my ($k, $v) = each %{ $self->{item} }) { 3187 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3188 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 3189 }
2924 3190
… …
2927 my @items = sort { 3193 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 3194 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 3195 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 3196 } values %{ $self->{item} };
2931 3197
3198 $self->{timer}->interval (1);
3199
2932 my $count = 10 + 1; 3200 my $count = 10 + 1;
2933 for my $item (@items) { 3201 for my $item (@items) {
2934 last unless --$count; 3202 last unless --$count;
2935 3203
2936 push @widgets, $item->{label} ||= do { 3204 my $label = $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all) 3205 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1 3206 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}" 3207 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text}; 3208 : $item->{text};
2941 3209
… …
2949 tooltip => $item->{tooltip}, 3217 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP, 3218 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 3219 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 3220 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 3221 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 3222 fg => [@{ $item->{fg} }],
2955 can_events => 1, 3223 can_events => 1,
2956 can_hover => 1 3224 can_hover => 1
2957 }; 3225 };
3226
3227 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3228 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3229 $label->update;
3230 $label->set_max_size (undef, $label->{req_h} * $diff)
3231 if $diff < 1;
3232 $self->{timer}->interval (1/30);
3233 } else {
3234 $label->{fg}[3] = $item->{fg}[3] || 1;
3235 }
3236
3237 push @widgets, $label;
2958 } 3238 }
2959 3239
2960 $self->clear; 3240 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 3241 $self->SUPER::add (reverse @widgets);
2962} 3242}
… …
2967 $text =~ s/^\s+//; 3247 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 3248 $text =~ s/\s+$//;
2969 3249
2970 return unless $text; 3250 return unless $text;
2971 3251
2972 my $timeout = time + ((delete $arg{timeout}) || 60); 3252 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2973 3253
2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3254 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975 3255
2976 if (my $item = $self->{item}{$group}) { 3256 if (my $item = $self->{item}{$group}) {
2977 if ($item->{text} eq $text) { 3257 if ($item->{text} eq $text) {
… …
3007 3287
3008 $self->reorder; 3288 $self->reorder;
3009 $self->SUPER::reconfigure; 3289 $self->SUPER::reconfigure;
3010} 3290}
3011 3291
3292sub DESTROY {
3293 my ($self) = @_;
3294
3295 $self->{timer}->cancel;
3296
3297 $self->SUPER::DESTROY;
3298}
3299
3012############################################################################# 3300#############################################################################
3013 3301
3014package CFClient::UI::Inventory; 3302package CFClient::UI::Inventory;
3015 3303
3016our @ISA = CFClient::UI::ScrolledWindow::; 3304our @ISA = CFClient::UI::ScrolledWindow::;
3017 3305
3018sub new { 3306sub new {
3019 my $class = shift; 3307 my $class = shift;
3020 3308
3021 my $self = $class->SUPER::new ( 3309 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3310 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3023 @_, 3311 @_,
3024 ); 3312 );
3025 3313
3026 $self 3314 $self
3027} 3315}
3028 3316
3029sub set_items { 3317sub set_items {
3030 my ($self, $items) = @_; 3318 my ($self, $items) = @_;
3031 3319
3032 $self->{scrolled}->clear; 3320 $self->{child}->clear;
3033 return unless $items; 3321 return unless $items;
3034 3322
3035 my @items = sort { 3323 my @items = sort {
3036 ($a->{type} <=> $b->{type}) 3324 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name}) 3325 or ($a->{name} cmp $b->{name})
… …
3041 3329
3042 my $row = 0; 3330 my $row = 0;
3043 for my $item (@items) { 3331 for my $item (@items) {
3044 CFClient::Item::update_widgets $item; 3332 CFClient::Item::update_widgets $item;
3045 3333
3046 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3334 $self->{child}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3335 $self->{child}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3336 $self->{child}->add (2, $row, $item->{weight_widget});
3049 3337
3050 $row++; 3338 $row++;
3051 } 3339 }
3052} 3340}
3053 3341
… …
3151 $rec = $::CONN->stop_record if $::CONN; 3439 $rec = $::CONN->stop_record if $::CONN;
3152 return unless ref $rec eq 'ARRAY'; 3440 return unless ref $rec eq 'ARRAY';
3153 $self->set_command_list ($rec); 3441 $self->set_command_list ($rec);
3154} 3442}
3155 3443
3156# if $commit is true, the binding will be set after the user entered a key combo 3444
3445sub ask_for_bind_and_commit {
3446 my ($self) = @_;
3447 $self->ask_for_bind (1);
3448}
3449
3157sub ask_for_bind { 3450sub ask_for_bind {
3158 my ($self, $commit) = @_; 3451 my ($self, $commit) = @_;
3159 3452
3160 CFClient::Binder::open_binding_dialog (sub { 3453 CFClient::Binder::open_binding_dialog (sub {
3161 my ($mod, $sym) = @_; 3454 my ($mod, $sym) = @_;
… …
3245 3538
3246############################################################################# 3539#############################################################################
3247 3540
3248package CFClient::UI::SpellList; 3541package CFClient::UI::SpellList;
3249 3542
3250our @ISA = CFClient::UI::FancyFrame::; 3543our @ISA = CFClient::UI::Table::;
3251 3544
3252sub new { 3545sub new {
3253 my $class = shift; 3546 my $class = shift;
3254 3547
3255 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3548 my $self = $class->SUPER::new (
3256 3549 binding => [],
3257 $self->add (new CFClient::UI::ScrolledWindow 3550 commands => [],
3258 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3551 @_,
3259 3552 )
3260 $self;
3261} 3553}
3262 3554
3263# XXX: Do sorting? Argl... 3555my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3556 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3557my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3559my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3561
3562sub rebuild_spell_list {
3563 my ($self) = @_;
3564
3565 $CFClient::UI::ROOT->on_refresh ($self => sub {
3566 $self->clear;
3567
3568 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3569 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3570 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3571 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3572
3573 my $row = 0;
3574
3575 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3576 my $spell = $self->{spell}{$_};
3577
3578 $row++;
3579
3580 $self->add (0, $row, new CFClient::UI::Face
3581 face => $spell->{face},
3582 can_hover => 1,
3583 can_events => 1,
3584 tooltip => $spell->{message},
3585 );
3586
3587 $self->add (1, $row, new CFClient::UI::Label
3588 expand => 1,
3589 text => $spell->{name},
3590 can_hover => 1,
3591 can_events => 1,
3592 tooltip => $spell->{message},
3593 );
3594
3595 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3596 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3597 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3598
3599 # TODO: should be done via popup
3600 $self->add (5, $row, new CFClient::UI::Button
3601 text => "bind",
3602 tooltip => "bind spell readying (cast command) to key",
3603 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3604 );
3605 }
3606 });
3607}
3608
3264sub add_spell { 3609sub add_spell {
3265 my ($self, $spell) = @_; 3610 my ($self, $spell) = @_;
3611
3266 $self->{spells}->{$spell->{name}} = $spell; 3612 $self->{spell}->{$spell->{name}} = $spell;
3267 3613 $self->rebuild_spell_list;
3268 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3269 face => $spell->{face},
3270 can_hover => 1,
3271 can_events => 1,
3272 tooltip => $spell->{message});
3273
3274 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3275 text => $spell->{name},
3276 can_hover => 1,
3277 can_events => 1,
3278 tooltip => $spell->{message},
3279 expand => 1);
3280
3281 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3282 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3283 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3284 expand => 1);
3285
3286 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3287 text => "bind to key",
3288 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3289}
3290
3291sub rebuild_spell_list {
3292 my ($self) = @_;
3293 $self->{tbl_idx} = 0;
3294 $self->add_spell ($_) for values %{$self->{spells}};
3295} 3614}
3296 3615
3297sub remove_spell { 3616sub remove_spell {
3298 my ($self, $spell) = @_; 3617 my ($self, $spell) = @_;
3618
3299 delete $self->{spells}->{$spell->{name}}; 3619 delete $self->{spell}->{$spell->{name}};
3300 $self->rebuild_spell_list; 3620 $self->rebuild_spell_list;
3301} 3621}
3302 3622
3303############################################################################# 3623#############################################################################
3304 3624
3305package CFClient::UI::Root; 3625package CFClient::UI::Root;
3306 3626
3307our @ISA = CFClient::UI::Container::; 3627our @ISA = CFClient::UI::Container::;
3628
3629use List::Util qw(min max);
3308 3630
3309use CFClient::OpenGL; 3631use CFClient::OpenGL;
3310 3632
3311sub new { 3633sub new {
3312 my $class = shift; 3634 my $class = shift;
… …
3447 3769
3448 delete $queue{$widget+0}; 3770 delete $queue{$widget+0};
3449 3771
3450 my ($w, $h) = $widget->size_request; 3772 my ($w, $h) = $widget->size_request;
3451 3773
3452 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3774 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3453 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3775 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3776
3777 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3778 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3454 3779
3455 $w = $widget->{force_w} if exists $widget->{force_w}; 3780 $w = $widget->{force_w} if exists $widget->{force_w};
3456 $h = $widget->{force_h} if exists $widget->{force_h}; 3781 $h = $widget->{force_h} if exists $widget->{force_h};
3457 3782
3458 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3783 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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