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.268 by root, Thu Jun 1 05:04:41 2006 UTC vs.
Revision 1.290 by root, Mon Jun 5 22:30:35 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;
… …
1050my @border = 1070my @border =
1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1053 1073
1054sub new { 1074sub new {
1055 my $class = shift; 1075 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1056 1078
1057 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
1058 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
1059 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
1060 border => 0.6, 1082 border => 0.6,
1061 can_events => 1, 1083 can_events => 1,
1062 min_w => 16, 1084 min_w => 16,
1063 min_h => 16, 1085 min_h => 16,
1064 @_ 1086 %arg,
1065 ); 1087 );
1066 1088
1067 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
1068 align => 0, 1090 align => 0,
1069 valign => 1, 1091 valign => 1,
1070 text => $self->{title}, 1092 text => $title,
1071 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1072 1095
1073 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1074} 1104}
1075 1105
1076sub border { 1106sub border {
1077 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1078} 1108}
1079 1109
1080sub size_request { 1110sub size_request {
1081 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1082 1115
1083 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1084 1117
1085 ( 1118 (
1086 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
1089} 1122}
1090 1123
1091sub size_allocate { 1124sub size_allocate {
1092 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
1093 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
1094 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1095 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1096 1137
1097 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1098 if $self->{title};
1099
1100 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1101} 1139}
1102 1140
1103sub button_down { 1141sub button_down {
1104 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1105 1143
… …
1124 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1125 1163
1126 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1127 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1128 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1129 $self->realloc; 1168 $self->realloc;
1130 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1131 }; 1169 };
1132 1170
1133 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1134 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1135 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1138 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1139 1177
1140 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1141 1179
1142 $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});
1143 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1144 } 1188 1
1145} 1189}
1146 1190
1147sub button_up { 1191sub button_up {
1148 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1149 1193
1150 delete $self->{motion}; 1194 !!delete $self->{motion}
1151} 1195}
1152 1196
1153sub mouse_motion { 1197sub mouse_motion {
1154 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1155 1199
1156 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1157} 1203}
1158 1204
1159sub _draw { 1205sub _draw {
1160 my ($self) = @_; 1206 my ($self) = @_;
1161 1207
1208 my $child = $self->{children}[0];
1209
1162 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1163 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1164 1212
1165 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1167 1215
1168 my $border = $self->border; 1216 my $border = $self->border;
… …
1183 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1184 } 1232 }
1185 1233
1186 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1187 1235
1188 $self->{title}->draw if $self->{title};
1189
1190 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1191} 1242}
1192 1243
1193############################################################################# 1244#############################################################################
1194 1245
1195package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1488 1539
1489 delete $self->{texture}; 1540 delete $self->{texture};
1490 $self->SUPER::update; 1541 $self->SUPER::update;
1491} 1542}
1492 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1493sub set_text { 1551sub set_text {
1494 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1495 1553
1496 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1497 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1498 1556
1499 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1500 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1501 1559
1560 delete $self->{size_req};
1502 $self->realloc; 1561 $self->realloc;
1503 $self->update; 1562 $self->update;
1504} 1563}
1505 1564
1506sub set_markup { 1565sub set_markup {
… …
1512 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1513 1572
1514 $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;
1515 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1516 1575
1576 delete $self->{size_req};
1517 $self->realloc; 1577 $self->realloc;
1518 $self->update; 1578 $self->update;
1519} 1579}
1520 1580
1521sub size_request { 1581sub size_request {
1522 my ($self) = @_; 1582 my ($self) = @_;
1523 1583
1584 $self->{size_req} ||= do {
1524 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1525 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1526 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1527 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529 1590
1530 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1531 1592
1532 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1533 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1534 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1535 1596
1536 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1537 1598
1538 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1539 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1540 } 1604 };
1541 1605
1542 ($w, $h) 1606 @{ $self->{size_req} }
1543} 1607}
1544 1608
1545sub size_allocate { 1609sub size_allocate {
1546 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1547 1611
1612 delete $self->{ox};
1613
1548 delete $self->{texture} 1614 delete $self->{texture}
1549 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1550} 1616}
1551 1617
1552sub set_fontsize { 1618sub set_fontsize {
… …
1554 1620
1555 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1556 delete $self->{texture}; 1622 delete $self->{texture};
1557 1623
1558 $self->realloc; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1559} 1633}
1560 1634
1561sub _draw { 1635sub _draw {
1562 my ($self) = @_; 1636 my ($self) = @_;
1563 1637
… …
1569 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1570 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1571 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1572 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1647
1574 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1575 1650
1651 unless (exists $self->{ox}) {
1576 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1577 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1578 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1579 1655
1580 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1581 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1582 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1583
1584 $tex
1585 }; 1659 };
1586 1660
1587 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1588 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1589 1662
1590 if ($tex->{format} == GL_ALPHA) { 1663 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1591 glColor @{$self->{fg}}; 1665 glColor @{$self->{fg}};
1592 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1593 } else { 1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1594 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1595 } 1670 }
1596 1671
1597 glDisable GL_TEXTURE_2D; 1672 glDisable GL_TEXTURE_2D;
1598} 1673}
… …
1627 1702
1628 delete $self->{cur_h}; 1703 delete $self->{cur_h};
1629 1704
1630 return if $self->{text} eq $text; 1705 return if $self->{text} eq $text;
1631 1706
1632 delete $self->{texture};
1633
1634 $self->{last_activity} = $::NOW; 1707 $self->{last_activity} = $::NOW;
1635 $self->{text} = $text; 1708 $self->{text} = $text;
1636 1709
1637 $text =~ s/./*/g if $self->{hidden}; 1710 $text =~ s/./*/g if $self->{hidden};
1638 $self->{layout}->set_text ("$text "); 1711 $self->{layout}->set_text ("$text ");
1712 delete $self->{size_req};
1639 1713
1640 $self->_emit (changed => $self->{text}); 1714 $self->_emit (changed => $self->{text});
1715
1716 $self->realloc;
1717 $self->update;
1641} 1718}
1642 1719
1643sub set_text { 1720sub set_text {
1644 my ($self, $text) = @_; 1721 my ($self, $text) = @_;
1645 1722
1646 $self->{cursor} = length $text; 1723 $self->{cursor} = length $text;
1647 $self->_set_text ($text); 1724 $self->_set_text ($text);
1648
1649 $self->realloc;
1650} 1725}
1651 1726
1652sub get_text { 1727sub get_text {
1653 $_[0]{text} 1728 $_[0]{text}
1654} 1729}
… …
1684 $self->{cursor} = length $text; 1759 $self->{cursor} = length $text;
1685 } elsif ($uni == 27) { 1760 } elsif ($uni == 27) {
1686 $self->_emit ('escape'); 1761 $self->_emit ('escape');
1687 } elsif ($uni) { 1762 } elsif ($uni) {
1688 substr $text, $self->{cursor}++, 0, chr $uni; 1763 substr $text, $self->{cursor}++, 0, chr $uni;
1764 } else {
1765 return 0;
1689 } 1766 }
1690 1767
1691 $self->_set_text ($text); 1768 $self->_set_text ($text);
1692 1769
1693 $self->realloc; 1770 $self->realloc;
1771
1772 1
1694} 1773}
1695 1774
1696sub focus_in { 1775sub focus_in {
1697 my ($self) = @_; 1776 my ($self) = @_;
1698 1777
… …
1713 utf8::encode $text; 1792 utf8::encode $text;
1714 $self->{cursor} = length substr $text, 0, $idx; 1793 $self->{cursor} = length substr $text, 0, $idx;
1715 1794
1716 $self->_set_text ($self->{text}); 1795 $self->_set_text ($self->{text});
1717 $self->update; 1796 $self->update;
1797
1798 1
1718} 1799}
1719 1800
1720sub mouse_motion { 1801sub mouse_motion {
1721 my ($self, $ev, $x, $y) = @_; 1802 my ($self, $ev, $x, $y) = @_;
1722# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1803# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1804
1805 0
1723} 1806}
1724 1807
1725sub _draw { 1808sub _draw {
1726 my ($self) = @_; 1809 my ($self) = @_;
1727 1810
1728 local $self->{fg} = $self->{fg}; 1811 local $self->{fg} = $self->{fg};
1729 1812
1730 if ($FOCUS == $self) { 1813 if ($FOCUS == $self) {
1731 glColor @{$self->{active_bg}}; 1814 glColor_premultiply @{$self->{active_bg}};
1732 $self->{fg} = $self->{active_fg}; 1815 $self->{fg} = $self->{active_fg};
1733 } else { 1816 } else {
1734 glColor @{$self->{bg}}; 1817 glColor_premultiply @{$self->{bg}};
1735 } 1818 }
1736 1819
1737 glEnable GL_BLEND; 1820 glEnable GL_BLEND;
1738 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1821 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1739 glBegin GL_QUADS; 1822 glBegin GL_QUADS;
1740 glVertex 0 , 0; 1823 glVertex 0 , 0;
1741 glVertex 0 , $self->{h}; 1824 glVertex 0 , $self->{h};
1742 glVertex $self->{w}, $self->{h}; 1825 glVertex $self->{w}, $self->{h};
1743 glVertex $self->{w}, 0; 1826 glVertex $self->{w}, 0;
… …
1804 } else { 1887 } else {
1805 $self->set_text ($self->{history_saveback}); 1888 $self->set_text ($self->{history_saveback});
1806 } 1889 }
1807 1890
1808 } else { 1891 } else {
1809 $self->SUPER::key_down ($ev); 1892 return $self->SUPER::key_down ($ev)
1893 }
1894
1810 } 1895 1
1811
1812} 1896}
1813 1897
1814############################################################################# 1898#############################################################################
1815 1899
1816package CFClient::UI::Button; 1900package CFClient::UI::Button;
… …
1845 my ($self, $ev, $x, $y) = @_; 1929 my ($self, $ev, $x, $y) = @_;
1846 1930
1847 $self->emit ("activate") 1931 $self->emit ("activate")
1848 if $x >= 0 && $x < $self->{w} 1932 if $x >= 0 && $x < $self->{w}
1849 && $y >= 0 && $y < $self->{h}; 1933 && $y >= 0 && $y < $self->{h};
1934
1935 1
1850} 1936}
1851 1937
1852sub _draw { 1938sub _draw {
1853 my ($self) = @_; 1939 my ($self) = @_;
1854 1940
1855 local $self->{fg} = $self->{fg}; 1941 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1856
1857 if ($GRAB == $self) {
1858 $self->{fg} = $self->{active_fg};
1859 }
1860 1942
1861 glEnable GL_TEXTURE_2D; 1943 glEnable GL_TEXTURE_2D;
1862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1944 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1863 glColor 0, 0, 0, 1; 1945 glColor 0, 0, 0, 1;
1864 1946
… …
1908 1990
1909 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1991 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1910 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1992 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1911 $self->{state} = !$self->{state}; 1993 $self->{state} = !$self->{state};
1912 $self->_emit (changed => $self->{state}); 1994 $self->_emit (changed => $self->{state});
1995 } else {
1996 return 0
1997 }
1998
1913 } 1999 1
1914} 2000}
1915 2001
1916sub _draw { 2002sub _draw {
1917 my ($self) = @_; 2003 my ($self) = @_;
1918 2004
… …
2085 2171
2086 my $h1 = $self->{h} * (1 - $ycut1); 2172 my $h1 = $self->{h} * (1 - $ycut1);
2087 my $h2 = $self->{h} * (1 - $ycut2); 2173 my $h2 = $self->{h} * (1 - $ycut2);
2088 2174
2089 glEnable GL_BLEND; 2175 glEnable GL_BLEND;
2090 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2176 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2177 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2091 glEnable GL_TEXTURE_2D; 2178 glEnable GL_TEXTURE_2D;
2092 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2179 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2093 2180
2094 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2181 glBindTexture GL_TEXTURE_2D, $t1->{name};
2095 glBegin GL_QUADS; 2182 glBegin GL_QUADS;
… …
2256 2343
2257 $self->SUPER::button_down ($ev, $x, $y); 2344 $self->SUPER::button_down ($ev, $x, $y);
2258 2345
2259 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2346 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2260 2347
2261 $self->mouse_motion ($ev, $x, $y); 2348 $self->mouse_motion ($ev, $x, $y)
2262} 2349}
2263 2350
2264sub mouse_motion { 2351sub mouse_motion {
2265 my ($self, $ev, $x, $y) = @_; 2352 my ($self, $ev, $x, $y) = @_;
2266 2353
… …
2270 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2357 my (undef, $lo, $hi, $page) = @{$self->{range}};
2271 2358
2272 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2359 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2273 2360
2274 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2361 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2362 } else {
2363 return 0;
2364 }
2365
2275 } 2366 1
2276} 2367}
2277 2368
2278sub update { 2369sub update {
2279 my ($self) = @_; 2370 my ($self) = @_;
2280 2371
2281 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2372 delete $self->{knob_w};
2373 $self->SUPER::update;
2374}
2375
2376sub _draw {
2377 my ($self) = @_;
2378
2379 unless ($self->{knob_w}) {
2282 $self->set_value ($self->{range}[0]); 2380 $self->set_value ($self->{range}[0]);
2283 2381
2284 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2382 my ($value, $lo, $hi, $page) = @{$self->{range}};
2285 my $range = ($hi - $page - $lo) || 1e-100; 2383 my $range = ($hi - $page - $lo) || 1e-100;
2286 2384
… …
2292 $value = ($value - $lo) / $range; 2390 $value = ($value - $lo) / $range;
2293 $value = $value * $self->{scale} + $self->{offset}; 2391 $value = $value * $self->{scale} + $self->{offset};
2294 2392
2295 $self->{knob_x} = $value - $knob_w * 0.5; 2393 $self->{knob_x} = $value - $knob_w * 0.5;
2296 $self->{knob_w} = $knob_w; 2394 $self->{knob_w} = $knob_w;
2297 }); 2395 }
2298
2299 $self->SUPER::update;
2300}
2301
2302sub _draw {
2303 my ($self) = @_;
2304 2396
2305 $self->SUPER::_draw (); 2397 $self->SUPER::_draw ();
2306 2398
2307 glScale $self->{w}, $self->{h}; 2399 glScale $self->{w}, $self->{h};
2308 2400
… …
2502 2594
2503 delete $self->{texture}; 2595 delete $self->{texture};
2504 } 2596 }
2505 2597
2506 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2598 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2507 glClearColor 0.5, 0.5, 0.5, 0; 2599 glClearColor 0, 0, 0, 0;
2508 glClear GL_COLOR_BUFFER_BIT; 2600 glClear GL_COLOR_BUFFER_BIT;
2509 2601
2510 my $top = int $self->{children}[1]{range}[0]; 2602 my $top = int $self->{children}[1]{range}[0];
2511 2603
2512 my $y0 = $top; 2604 my $y0 = $top;
… …
2547sub _draw { 2639sub _draw {
2548 my ($self) = @_; 2640 my ($self) = @_;
2549 2641
2550 glEnable GL_TEXTURE_2D; 2642 glEnable GL_TEXTURE_2D;
2551 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2552 glColor 1, 1, 1, 1; 2644 glColor 0, 0, 0, 1;
2553 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2645 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2554 glDisable GL_TEXTURE_2D; 2646 glDisable GL_TEXTURE_2D;
2555 2647
2556 $self->{children}[1]->draw; 2648 $self->{children}[1]->draw;
2557 2649
2558} 2650}
… …
2785 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2877 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2786 2878
2787 if ($tex) { 2879 if ($tex) {
2788 glEnable GL_TEXTURE_2D; 2880 glEnable GL_TEXTURE_2D;
2789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2881 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2790 glColor 1, 1, 1, 1; 2882 glColor 0, 0, 0, 1;
2791 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2883 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2792 glDisable GL_TEXTURE_2D; 2884 glDisable GL_TEXTURE_2D;
2793 } 2885 }
2794} 2886}
2795 2887
… …
2799 $self->{timer}->cancel 2891 $self->{timer}->cancel
2800 if $self->{timer}; 2892 if $self->{timer};
2801 2893
2802 $self->SUPER::DESTROY; 2894 $self->SUPER::DESTROY;
2803} 2895}
2896
2897#############################################################################
2898
2899package CFClient::UI::Buttonbar;
2900
2901our @ISA = CFClient::UI::HBox::;
2902
2903# TODO: should actualyl wrap buttons and other goodies.
2804 2904
2805############################################################################# 2905#############################################################################
2806 2906
2807package CFClient::UI::Menu; 2907package CFClient::UI::Menu;
2808 2908
… …
2858 my ($self, $ev, $x, $y) = @_; 2958 my ($self, $ev, $x, $y) = @_;
2859 2959
2860 # TODO: should use vbox->find_widget or so 2960 # TODO: should use vbox->find_widget or so
2861 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2961 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2862 $self->{hover} = $self->{item}{$HOVER}; 2962 $self->{hover} = $self->{item}{$HOVER};
2963
2964 0
2863} 2965}
2864 2966
2865sub button_up { 2967sub button_up {
2866 my ($self, $ev, $x, $y) = @_; 2968 my ($self, $ev, $x, $y) = @_;
2867 2969
… …
2869 undef $GRAB; 2971 undef $GRAB;
2870 $self->hide; 2972 $self->hide;
2871 2973
2872 $self->_emit ("popdown"); 2974 $self->_emit ("popdown");
2873 $self->{hover}[1]->() if $self->{hover}; 2975 $self->{hover}[1]->() if $self->{hover};
2976 } else {
2977 return 0
2978 }
2979
2874 } 2980 1
2875} 2981}
2876 2982
2877############################################################################# 2983#############################################################################
2878 2984
2879package CFClient::UI::Statusbox; 2985package CFClient::UI::Multiplexer;
2880 2986
2881our @ISA = CFClient::UI::VBox::; 2987our @ISA = CFClient::UI::Container::;
2882 2988
2883sub new { 2989sub new {
2884 my $class = shift; 2990 my $class = shift;
2885 2991
2886 $class->SUPER::new ( 2992 my $self = $class->SUPER::new (
2993 @_,
2994 );
2995
2996 $self->{current} = $self->{children}[0]
2997 if @{ $self->{children} };
2998
2999 $self
3000}
3001
3002sub add {
3003 my ($self, @widgets) = @_;
3004
3005 $self->SUPER::add (@widgets);
3006
3007 $self->{current} = $self->{children}[0]
3008 if @{ $self->{children} };
3009}
3010
3011sub set_current_page {
3012 my ($self, $page_or_widget) = @_;
3013
3014 my $widget = ref $page_or_widget
3015 ? $page_or_widget
3016 : $self->{children}[$page_or_widget];
3017
3018 $self->{current} = $widget;
3019 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3020
3021 $self->_emit (page_changed => $self->{current});
3022
3023 $self->realloc;
3024}
3025
3026sub visible_children {
3027 $_[0]{current}
3028}
3029
3030sub size_request {
3031 my ($self) = @_;
3032
3033 $self->{current}->size_request
3034}
3035
3036sub size_allocate {
3037 my ($self, $w, $h) = @_;
3038
3039 $self->{current}->configure (0, 0, $w, $h);
3040}
3041
3042sub _draw {
3043 my ($self) = @_;
3044
3045 $self->{current}->draw;
3046}
3047
3048#############################################################################
3049
3050package CFClient::UI::Notebook;
3051
3052our @ISA = CFClient::UI::VBox::;
3053
3054sub new {
3055 my $class = shift;
3056
3057 my $self = $class->SUPER::new (
3058 buttonbar => (new CFClient::UI::Buttonbar),
3059 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3060 # filter => # will be put between multiplexer and $self
3061 @_,
3062 );
3063
3064 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3065 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3066
3067 $self
3068}
3069
3070sub add {
3071 my ($self, $title, $widget, $tooltip) = @_;
3072
3073 Scalar::Util::weaken $self;
3074
3075 $self->{buttonbar}->add (new CFClient::UI::Button
3076 markup => $title,
3077 tooltip => $tooltip,
3078 on_activate => sub { $self->set_current_page ($widget) },
3079 );
3080
3081 $self->{multiplexer}->add ($widget);
3082}
3083
3084sub set_current_page {
3085 my ($self, $page) = @_;
3086
3087 $self->{multiplexer}->set_current_page ($page);
3088 $self->_emit (page_changed => $self->{multiplexer}{current});
3089}
3090
3091#############################################################################
3092
3093package CFClient::UI::Statusbox;
3094
3095our @ISA = CFClient::UI::VBox::;
3096
3097sub new {
3098 my $class = shift;
3099
3100 my $self = $class->SUPER::new (
2887 fontsize => 0.8, 3101 fontsize => 0.8,
2888 @_, 3102 @_,
2889 ) 3103 );
3104
3105 Scalar::Util::weaken (my $this = $self);
3106
3107 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3108
3109 $self
2890} 3110}
2891 3111
2892sub reorder { 3112sub reorder {
2893 my ($self) = @_; 3113 my ($self) = @_;
2894 my $NOW = time; 3114 my $NOW = Time::HiRes::time;
3115
3116 # freeze display when hovering over any label
3117 return if $CFClient::UI::TOOLTIP->{owner}
3118 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3119 values %{ $self->{item} };
2895 3120
2896 while (my ($k, $v) = each %{ $self->{item} }) { 3121 while (my ($k, $v) = each %{ $self->{item} }) {
2897 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3122 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2898 } 3123 }
2899 3124
… …
2902 my @items = sort { 3127 my @items = sort {
2903 $a->{pri} <=> $b->{pri} 3128 $a->{pri} <=> $b->{pri}
2904 or $b->{id} <=> $a->{id} 3129 or $b->{id} <=> $a->{id}
2905 } values %{ $self->{item} }; 3130 } values %{ $self->{item} };
2906 3131
3132 $self->{timer}->interval (1);
3133
2907 my $count = 10 + 1; 3134 my $count = 10 + 1;
2908 for my $item (@items) { 3135 for my $item (@items) {
2909 last unless --$count; 3136 last unless --$count;
2910 3137
2911 push @widgets, $item->{label} ||= do { 3138 my $label = $item->{label} ||= do {
2912 # TODO: doesn't handle markup well (read as: at all) 3139 # TODO: doesn't handle markup well (read as: at all)
2913 my $short = $item->{count} > 1 3140 my $short = $item->{count} > 1
2914 ? "<b>$item->{count} ×</b> $item->{text}" 3141 ? "<b>$item->{count} ×</b> $item->{text}"
2915 : $item->{text}; 3142 : $item->{text};
2916 3143
… …
2924 tooltip => $item->{tooltip}, 3151 tooltip => $item->{tooltip},
2925 tooltip_font => $::FONT_PROP, 3152 tooltip_font => $::FONT_PROP,
2926 tooltip_width => 0.67, 3153 tooltip_width => 0.67,
2927 fontsize => $item->{fontsize} || $self->{fontsize}, 3154 fontsize => $item->{fontsize} || $self->{fontsize},
2928 max_w => $::WIDTH * 0.44, 3155 max_w => $::WIDTH * 0.44,
2929 fg => $item->{fg}, 3156 fg => [@{ $item->{fg} }],
2930 can_events => 1, 3157 can_events => 1,
2931 can_hover => 1 3158 can_hover => 1
2932 }; 3159 };
3160
3161 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3162 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3163 $label->update;
3164 $label->set_max_size (undef, $label->{req_h} * $diff)
3165 if $diff < 1;
3166 $self->{timer}->interval (1/30);
3167 } else {
3168 $label->{fg}[3] = $item->{fg}[3] || 1;
3169 }
3170
3171 push @widgets, $label;
2933 } 3172 }
2934 3173
2935 $self->clear; 3174 $self->clear;
2936 $self->SUPER::add (reverse @widgets); 3175 $self->SUPER::add (reverse @widgets);
2937} 3176}
… …
2942 $text =~ s/^\s+//; 3181 $text =~ s/^\s+//;
2943 $text =~ s/\s+$//; 3182 $text =~ s/\s+$//;
2944 3183
2945 return unless $text; 3184 return unless $text;
2946 3185
2947 my $timeout = time + ((delete $arg{timeout}) || 60); 3186 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2948 3187
2949 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3188 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2950 3189
2951 if (my $item = $self->{item}{$group}) { 3190 if (my $item = $self->{item}{$group}) {
2952 if ($item->{text} eq $text) { 3191 if ($item->{text} eq $text) {
… …
2982 3221
2983 $self->reorder; 3222 $self->reorder;
2984 $self->SUPER::reconfigure; 3223 $self->SUPER::reconfigure;
2985} 3224}
2986 3225
3226sub DESTROY {
3227 my ($self) = @_;
3228
3229 $self->{timer}->cancel;
3230
3231 $self->SUPER::DESTROY;
3232}
3233
2987############################################################################# 3234#############################################################################
2988 3235
2989package CFClient::UI::Inventory; 3236package CFClient::UI::Inventory;
2990 3237
2991our @ISA = CFClient::UI::ScrolledWindow::; 3238our @ISA = CFClient::UI::ScrolledWindow::;
2992 3239
2993sub new { 3240sub new {
2994 my $class = shift; 3241 my $class = shift;
2995 3242
2996 my $self = $class->SUPER::new ( 3243 my $self = $class->SUPER::new (
2997 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3244 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2998 @_, 3245 @_,
2999 ); 3246 );
3000 3247
3001 $self 3248 $self
3002} 3249}
3003 3250
3004sub set_items { 3251sub set_items {
3005 my ($self, $items) = @_; 3252 my ($self, $items) = @_;
3006 3253
3007 $self->{scrolled}->clear; 3254 $self->{child}->clear;
3008 return unless $items; 3255 return unless $items;
3009 3256
3010 my @items = sort { 3257 my @items = sort {
3011 ($a->{type} <=> $b->{type}) 3258 ($a->{type} <=> $b->{type})
3012 or ($a->{name} cmp $b->{name}) 3259 or ($a->{name} cmp $b->{name})
… …
3016 3263
3017 my $row = 0; 3264 my $row = 0;
3018 for my $item (@items) { 3265 for my $item (@items) {
3019 CFClient::Item::update_widgets $item; 3266 CFClient::Item::update_widgets $item;
3020 3267
3021 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3268 $self->{child}->add (0, $row, $item->{face_widget});
3022 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3269 $self->{child}->add (1, $row, $item->{desc_widget});
3023 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3270 $self->{child}->add (2, $row, $item->{weight_widget});
3024 3271
3025 $row++; 3272 $row++;
3026 } 3273 }
3027} 3274}
3028 3275
… …
3126 $rec = $::CONN->stop_record if $::CONN; 3373 $rec = $::CONN->stop_record if $::CONN;
3127 return unless ref $rec eq 'ARRAY'; 3374 return unless ref $rec eq 'ARRAY';
3128 $self->set_command_list ($rec); 3375 $self->set_command_list ($rec);
3129} 3376}
3130 3377
3131# if $commit is true, the binding will be set after the user entered a key combo 3378
3379sub ask_for_bind_and_commit {
3380 my ($self) = @_;
3381 $self->ask_for_bind (1);
3382}
3383
3132sub ask_for_bind { 3384sub ask_for_bind {
3133 my ($self, $commit) = @_; 3385 my ($self, $commit) = @_;
3134 3386
3135 CFClient::Binder::open_binding_dialog (sub { 3387 CFClient::Binder::open_binding_dialog (sub {
3136 my ($mod, $sym) = @_; 3388 my ($mod, $sym) = @_;
… …
3220 3472
3221############################################################################# 3473#############################################################################
3222 3474
3223package CFClient::UI::SpellList; 3475package CFClient::UI::SpellList;
3224 3476
3225our @ISA = CFClient::UI::FancyFrame::; 3477our @ISA = CFClient::UI::Table::;
3226 3478
3227sub new { 3479sub new {
3228 my $class = shift; 3480 my $class = shift;
3229 3481
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3482 my $self = $class->SUPER::new (
3231 3483 binding => [],
3232 $self->add (new CFClient::UI::ScrolledWindow 3484 commands => [],
3233 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3485 @_,
3234 3486 )
3235 $self;
3236} 3487}
3237 3488
3238# XXX: Do sorting? Argl... 3489my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3490 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3491my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3492 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3493my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3494 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3495
3496sub rebuild_spell_list {
3497 my ($self) = @_;
3498
3499 $CFClient::UI::ROOT->on_refresh ($self => sub {
3500 $self->clear;
3501
3502 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3503 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3504 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3505 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3506
3507 my $row = 0;
3508
3509 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3510 my $spell = $self->{spell}{$_};
3511
3512 $row++;
3513
3514 $self->add (0, $row, new CFClient::UI::Face
3515 face => $spell->{face},
3516 can_hover => 1,
3517 can_events => 1,
3518 tooltip => $spell->{message},
3519 );
3520
3521 $self->add (1, $row, new CFClient::UI::Label
3522 expand => 1,
3523 text => $spell->{name},
3524 can_hover => 1,
3525 can_events => 1,
3526 tooltip => $spell->{message},
3527 );
3528
3529 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3530 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3531 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3532
3533 # TODO: should be done via popup
3534 $self->add (5, $row, new CFClient::UI::Button
3535 text => "bind",
3536 tooltip => "bind spell readying (cast command) to key",
3537 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3538 );
3539 }
3540 });
3541}
3542
3239sub add_spell { 3543sub add_spell {
3240 my ($self, $spell) = @_; 3544 my ($self, $spell) = @_;
3545
3241 $self->{spells}->{$spell->{name}} = $spell; 3546 $self->{spell}->{$spell->{name}} = $spell;
3242 3547 $self->rebuild_spell_list;
3243 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3244 face => $spell->{face},
3245 can_hover => 1,
3246 can_events => 1,
3247 tooltip => $spell->{message});
3248
3249 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3250 text => $spell->{name},
3251 can_hover => 1,
3252 can_events => 1,
3253 tooltip => $spell->{message},
3254 expand => 1);
3255
3256 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3257 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3258 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3259 expand => 1);
3260
3261 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3262 text => "bind to key",
3263 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3264}
3265
3266sub rebuild_spell_list {
3267 my ($self) = @_;
3268 $self->{tbl_idx} = 0;
3269 $self->add_spell ($_) for values %{$self->{spells}};
3270} 3548}
3271 3549
3272sub remove_spell { 3550sub remove_spell {
3273 my ($self, $spell) = @_; 3551 my ($self, $spell) = @_;
3552
3274 delete $self->{spells}->{$spell->{name}}; 3553 delete $self->{spell}->{$spell->{name}};
3275 $self->rebuild_spell_list; 3554 $self->rebuild_spell_list;
3276} 3555}
3277 3556
3278############################################################################# 3557#############################################################################
3279 3558
3280package CFClient::UI::Root; 3559package CFClient::UI::Root;
3281 3560
3282our @ISA = CFClient::UI::Container::; 3561our @ISA = CFClient::UI::Container::;
3562
3563use List::Util qw(min max);
3283 3564
3284use CFClient::OpenGL; 3565use CFClient::OpenGL;
3285 3566
3286sub new { 3567sub new {
3287 my $class = shift; 3568 my $class = shift;
… …
3422 3703
3423 delete $queue{$widget+0}; 3704 delete $queue{$widget+0};
3424 3705
3425 my ($w, $h) = $widget->size_request; 3706 my ($w, $h) = $widget->size_request;
3426 3707
3427 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3708 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3428 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3709 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3710
3711 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3712 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3429 3713
3430 $w = $widget->{force_w} if exists $widget->{force_w}; 3714 $w = $widget->{force_w} if exists $widget->{force_w};
3431 $h = $widget->{force_h} if exists $widget->{force_h}; 3715 $h = $widget->{force_h} if exists $widget->{force_h};
3432 3716
3433 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3717 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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