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.267 by root, Thu Jun 1 04:10:29 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}
… …
171sub rescale_widgets { 172sub rescale_widgets {
172 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
173 174
174 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178 179
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185 186
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188 189
189 } 190 }
190 } 191 }
191 192
192 reconfigure_widgets; 193 reconfigure_widgets;
… …
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
… …
529sub draw { 539sub draw {
530 my ($self) = @_; 540 my ($self) = @_;
531 541
532 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
533 543
544 # update screen rectangle
534 local $draw_x = $draw_x + $self->{x}; 545 local $draw_x = $draw_x + $self->{x};
535 local $draw_y = $draw_y + $self->{y}; 546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
536 549
537 return if $draw_x + $self->{w} < 0; 550 # skip widgets that are entirely outside the drawing area
538 return if $draw_x >= $draw_w; 551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
539 return if $draw_y + $self->{h} < 0; 552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
540 return if $draw_y >= $draw_h;
541 553
542 glPushMatrix; 554 glPushMatrix;
543 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
544 $self->_draw;
545 glPopMatrix;
546 556
547 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
548 my ($x, $y) = @$self{qw(x y)};
549
550 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
551 glEnable GL_BLEND; 559 glEnable GL_BLEND;
552 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
553 glBegin GL_QUADS; 561 glBegin GL_QUADS;
554 glVertex $x , $y; 562 glVertex 0 , 0;
555 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
556 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
557 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
558 glEnd; 566 glEnd;
559 glDisable GL_BLEND; 567 glDisable GL_BLEND;
560 } 568 }
561 569
562 if ($ENV{CFPLUS_DEBUG} & 1) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
563 glPushMatrix; 571 glPushMatrix;
564 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
565 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
566 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
567 glVertex 0 , 0; 575 glVertex 0 , 0;
568 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
569 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
570 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
571 glEnd; 579 glEnd;
572 glPopMatrix; 580 glPopMatrix;
573 #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;
574 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
575} 586}
576 587
577sub _draw { 588sub _draw {
578 my ($self) = @_; 589 my ($self) = @_;
579 590
… …
617 628
618 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
619 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
620 631
621 glEnable GL_BLEND; 632 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623 glColor @$color; 634 glColor_premultiply @$color;
624 635
625 glBegin GL_QUADS; 636 glBegin GL_QUADS;
626 glVertex 0 , 0; 637 glVertex 0 , 0;
627 glVertex 0 , $h; 638 glVertex 0 , $h;
628 glVertex $w, $h; 639 glVertex $w, $h;
… …
659our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
660 671
661sub new { 672sub new {
662 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
663 674
664 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
665 676
666 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
667 children => [], 678 children => [],
668 can_events => 0, 679 can_events => 0,
669 %arg, 680 %arg,
670 ); 681 );
682
671 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
672 685
673 $self 686 $self
674} 687}
675 688
676sub add { 689sub add {
… …
724 $x -= $self->{x}; 737 $x -= $self->{x};
725 $y -= $self->{y}; 738 $y -= $self->{y};
726 739
727 my $res; 740 my $res;
728 741
729 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
730 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
731 and return $res; 744 and return $res;
732 } 745 }
733 746
734 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
783 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
784} 797}
785 798
786############################################################################# 799#############################################################################
787 800
801# back-buffered drawing area
802
788package CFClient::UI::Window; 803package CFClient::UI::Window;
789 804
790our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
791 806
792use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
843 my $tex = $self->{texture} 858 my $tex = $self->{texture}
844 or return; 859 or return;
845 860
846 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
848 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
849 864
850 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
851 866
852 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
853} 868}
… …
944package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
945 960
946our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
947 962
948sub new { 963sub new {
949 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
950 967
951 my $self; 968 my $self;
952 969
953 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
954 vertical => 1, 971 vertical => 1,
… …
959 ; 976 ;
960 977
961 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
962 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
963 slider => $slider, 980 slider => $slider,
964 @_, 981 %arg,
965 ); 982 );
966 983
967 $self->{vp}->add ($self->{scrolled});
968 $self->add ($self->{vp});
969 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
970 986
971 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
972} 994}
973 995
974sub update { 996sub update {
975 my ($self) = @_; 997 my ($self) = @_;
976 998
… …
1015 1037
1016 if ($self->{bg}) { 1038 if ($self->{bg}) {
1017 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
1018 1040
1019 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
1020 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1021 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
1022 1044
1023 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
1024 glVertex 0 , 0; 1046 glVertex 0 , 0;
1025 glVertex 0 , $h; 1047 glVertex 0 , $h;
1026 glVertex $w, $h; 1048 glVertex $w, $h;
… …
1048my @border = 1070my @border =
1049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1050 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);
1051 1073
1052sub new { 1074sub new {
1053 my $class = shift; 1075 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1054 1078
1055 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
1056 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
1057 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
1058 border => 0.6, 1082 border => 0.6,
1059 can_events => 1, 1083 can_events => 1,
1060 min_w => 16, 1084 min_w => 16,
1061 min_h => 16, 1085 min_h => 16,
1062 @_ 1086 %arg,
1063 ); 1087 );
1064 1088
1065 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
1066 align => 0, 1090 align => 0,
1067 valign => 1, 1091 valign => 1,
1068 text => $self->{title}, 1092 text => $title,
1069 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1070 1095
1071 $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};
1072} 1104}
1073 1105
1074sub border { 1106sub border {
1075 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1076} 1108}
1077 1109
1078sub size_request { 1110sub size_request {
1079 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1080 1115
1081 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1082 1117
1083 ( 1118 (
1084 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
1087} 1122}
1088 1123
1089sub size_allocate { 1124sub size_allocate {
1090 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
1091 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
1092 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1093 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1094 1137
1095 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1096 if $self->{title};
1097
1098 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1099} 1139}
1100 1140
1101sub button_down { 1141sub button_down {
1102 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1103 1143
… …
1122 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1123 1163
1124 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1125 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1126 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1127 $self->realloc; 1168 $self->realloc;
1128 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1129 }; 1169 };
1130 1170
1131 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1132 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1133 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1136 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1137 1177
1138 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1139 1179
1140 $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});
1141 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1142 } 1188 1
1143} 1189}
1144 1190
1145sub button_up { 1191sub button_up {
1146 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1147 1193
1148 delete $self->{motion}; 1194 !!delete $self->{motion}
1149} 1195}
1150 1196
1151sub mouse_motion { 1197sub mouse_motion {
1152 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1153 1199
1154 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1155} 1203}
1156 1204
1157sub _draw { 1205sub _draw {
1158 my ($self) = @_; 1206 my ($self) = @_;
1159 1207
1208 my $child = $self->{children}[0];
1209
1160 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1161 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1162 1212
1163 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1165 1215
1166 my $border = $self->border; 1216 my $border = $self->border;
… …
1181 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1182 } 1232 }
1183 1233
1184 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1185 1235
1186 $self->{title}->draw if $self->{title};
1187
1188 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1189} 1242}
1190 1243
1191############################################################################# 1244#############################################################################
1192 1245
1193package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1486 1539
1487 delete $self->{texture}; 1540 delete $self->{texture};
1488 $self->SUPER::update; 1541 $self->SUPER::update;
1489} 1542}
1490 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1491sub set_text { 1551sub set_text {
1492 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1493 1553
1494 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1495 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1496 1556
1497 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1498 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1499 1559
1560 delete $self->{size_req};
1500 $self->realloc; 1561 $self->realloc;
1501 $self->update; 1562 $self->update;
1502} 1563}
1503 1564
1504sub set_markup { 1565sub set_markup {
… …
1510 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1511 1572
1512 $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;
1513 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1514 1575
1576 delete $self->{size_req};
1515 $self->realloc; 1577 $self->realloc;
1516 $self->update; 1578 $self->update;
1517} 1579}
1518 1580
1519sub size_request { 1581sub size_request {
1520 my ($self) = @_; 1582 my ($self) = @_;
1521 1583
1584 $self->{size_req} ||= do {
1522 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1523 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1524 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1525 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1526 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1527 1590
1528 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1529 1592
1530 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1531 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1532 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1533 1596
1534 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1535 1598
1536 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1537 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1538 } 1604 };
1539 1605
1540 ($w, $h) 1606 @{ $self->{size_req} }
1541} 1607}
1542 1608
1543sub size_allocate { 1609sub size_allocate {
1544 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1545 1611
1612 delete $self->{ox};
1613
1546 delete $self->{texture} 1614 delete $self->{texture}
1547 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1548} 1616}
1549 1617
1550sub set_fontsize { 1618sub set_fontsize {
… …
1552 1620
1553 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1554 delete $self->{texture}; 1622 delete $self->{texture};
1555 1623
1556 $self->realloc; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1557} 1633}
1558 1634
1559sub _draw { 1635sub _draw {
1560 my ($self) = @_; 1636 my ($self) = @_;
1561 1637
… …
1567 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1568 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1569 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1571 1647
1572 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1573 1650
1651 unless (exists $self->{ox}) {
1574 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1575 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1576 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1577 1655
1578 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1579 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1580 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1581
1582 $tex
1583 }; 1659 };
1584 1660
1585 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1586 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1587 1662
1588 if ($tex->{format} == GL_ALPHA) { 1663 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1589 glColor @{$self->{fg}}; 1665 glColor @{$self->{fg}};
1590 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1591 } else { 1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1592 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1593 } 1670 }
1594 1671
1595 glDisable GL_TEXTURE_2D; 1672 glDisable GL_TEXTURE_2D;
1596} 1673}
… …
1625 1702
1626 delete $self->{cur_h}; 1703 delete $self->{cur_h};
1627 1704
1628 return if $self->{text} eq $text; 1705 return if $self->{text} eq $text;
1629 1706
1630 delete $self->{texture};
1631
1632 $self->{last_activity} = $::NOW; 1707 $self->{last_activity} = $::NOW;
1633 $self->{text} = $text; 1708 $self->{text} = $text;
1634 1709
1635 $text =~ s/./*/g if $self->{hidden}; 1710 $text =~ s/./*/g if $self->{hidden};
1636 $self->{layout}->set_text ("$text "); 1711 $self->{layout}->set_text ("$text ");
1712 delete $self->{size_req};
1637 1713
1638 $self->_emit (changed => $self->{text}); 1714 $self->_emit (changed => $self->{text});
1715
1716 $self->realloc;
1717 $self->update;
1639} 1718}
1640 1719
1641sub set_text { 1720sub set_text {
1642 my ($self, $text) = @_; 1721 my ($self, $text) = @_;
1643 1722
1644 $self->{cursor} = length $text; 1723 $self->{cursor} = length $text;
1645 $self->_set_text ($text); 1724 $self->_set_text ($text);
1646
1647 $self->realloc;
1648} 1725}
1649 1726
1650sub get_text { 1727sub get_text {
1651 $_[0]{text} 1728 $_[0]{text}
1652} 1729}
… …
1682 $self->{cursor} = length $text; 1759 $self->{cursor} = length $text;
1683 } elsif ($uni == 27) { 1760 } elsif ($uni == 27) {
1684 $self->_emit ('escape'); 1761 $self->_emit ('escape');
1685 } elsif ($uni) { 1762 } elsif ($uni) {
1686 substr $text, $self->{cursor}++, 0, chr $uni; 1763 substr $text, $self->{cursor}++, 0, chr $uni;
1764 } else {
1765 return 0;
1687 } 1766 }
1688 1767
1689 $self->_set_text ($text); 1768 $self->_set_text ($text);
1690 1769
1691 $self->realloc; 1770 $self->realloc;
1771
1772 1
1692} 1773}
1693 1774
1694sub focus_in { 1775sub focus_in {
1695 my ($self) = @_; 1776 my ($self) = @_;
1696 1777
… …
1711 utf8::encode $text; 1792 utf8::encode $text;
1712 $self->{cursor} = length substr $text, 0, $idx; 1793 $self->{cursor} = length substr $text, 0, $idx;
1713 1794
1714 $self->_set_text ($self->{text}); 1795 $self->_set_text ($self->{text});
1715 $self->update; 1796 $self->update;
1797
1798 1
1716} 1799}
1717 1800
1718sub mouse_motion { 1801sub mouse_motion {
1719 my ($self, $ev, $x, $y) = @_; 1802 my ($self, $ev, $x, $y) = @_;
1720# 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
1721} 1806}
1722 1807
1723sub _draw { 1808sub _draw {
1724 my ($self) = @_; 1809 my ($self) = @_;
1725 1810
1726 local $self->{fg} = $self->{fg}; 1811 local $self->{fg} = $self->{fg};
1727 1812
1728 if ($FOCUS == $self) { 1813 if ($FOCUS == $self) {
1729 glColor @{$self->{active_bg}}; 1814 glColor_premultiply @{$self->{active_bg}};
1730 $self->{fg} = $self->{active_fg}; 1815 $self->{fg} = $self->{active_fg};
1731 } else { 1816 } else {
1732 glColor @{$self->{bg}}; 1817 glColor_premultiply @{$self->{bg}};
1733 } 1818 }
1734 1819
1735 glEnable GL_BLEND; 1820 glEnable GL_BLEND;
1736 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1821 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1737 glBegin GL_QUADS; 1822 glBegin GL_QUADS;
1738 glVertex 0 , 0; 1823 glVertex 0 , 0;
1739 glVertex 0 , $self->{h}; 1824 glVertex 0 , $self->{h};
1740 glVertex $self->{w}, $self->{h}; 1825 glVertex $self->{w}, $self->{h};
1741 glVertex $self->{w}, 0; 1826 glVertex $self->{w}, 0;
… …
1802 } else { 1887 } else {
1803 $self->set_text ($self->{history_saveback}); 1888 $self->set_text ($self->{history_saveback});
1804 } 1889 }
1805 1890
1806 } else { 1891 } else {
1807 $self->SUPER::key_down ($ev); 1892 return $self->SUPER::key_down ($ev)
1893 }
1894
1808 } 1895 1
1809
1810} 1896}
1811 1897
1812############################################################################# 1898#############################################################################
1813 1899
1814package CFClient::UI::Button; 1900package CFClient::UI::Button;
… …
1843 my ($self, $ev, $x, $y) = @_; 1929 my ($self, $ev, $x, $y) = @_;
1844 1930
1845 $self->emit ("activate") 1931 $self->emit ("activate")
1846 if $x >= 0 && $x < $self->{w} 1932 if $x >= 0 && $x < $self->{w}
1847 && $y >= 0 && $y < $self->{h}; 1933 && $y >= 0 && $y < $self->{h};
1934
1935 1
1848} 1936}
1849 1937
1850sub _draw { 1938sub _draw {
1851 my ($self) = @_; 1939 my ($self) = @_;
1852 1940
1853 local $self->{fg} = $self->{fg}; 1941 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1854
1855 if ($GRAB == $self) {
1856 $self->{fg} = $self->{active_fg};
1857 }
1858 1942
1859 glEnable GL_TEXTURE_2D; 1943 glEnable GL_TEXTURE_2D;
1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1944 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861 glColor 0, 0, 0, 1; 1945 glColor 0, 0, 0, 1;
1862 1946
… …
1906 1990
1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1991 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1992 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1909 $self->{state} = !$self->{state}; 1993 $self->{state} = !$self->{state};
1910 $self->_emit (changed => $self->{state}); 1994 $self->_emit (changed => $self->{state});
1995 } else {
1996 return 0
1997 }
1998
1911 } 1999 1
1912} 2000}
1913 2001
1914sub _draw { 2002sub _draw {
1915 my ($self) = @_; 2003 my ($self) = @_;
1916 2004
… …
2083 2171
2084 my $h1 = $self->{h} * (1 - $ycut1); 2172 my $h1 = $self->{h} * (1 - $ycut1);
2085 my $h2 = $self->{h} * (1 - $ycut2); 2173 my $h2 = $self->{h} * (1 - $ycut2);
2086 2174
2087 glEnable GL_BLEND; 2175 glEnable GL_BLEND;
2088 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;
2089 glEnable GL_TEXTURE_2D; 2178 glEnable GL_TEXTURE_2D;
2090 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2179 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2091 2180
2092 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2181 glBindTexture GL_TEXTURE_2D, $t1->{name};
2093 glBegin GL_QUADS; 2182 glBegin GL_QUADS;
… …
2254 2343
2255 $self->SUPER::button_down ($ev, $x, $y); 2344 $self->SUPER::button_down ($ev, $x, $y);
2256 2345
2257 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2346 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2258 2347
2259 $self->mouse_motion ($ev, $x, $y); 2348 $self->mouse_motion ($ev, $x, $y)
2260} 2349}
2261 2350
2262sub mouse_motion { 2351sub mouse_motion {
2263 my ($self, $ev, $x, $y) = @_; 2352 my ($self, $ev, $x, $y) = @_;
2264 2353
… …
2268 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2357 my (undef, $lo, $hi, $page) = @{$self->{range}};
2269 2358
2270 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2359 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2271 2360
2272 $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
2273 } 2366 1
2274} 2367}
2275 2368
2276sub update { 2369sub update {
2277 my ($self) = @_; 2370 my ($self) = @_;
2278 2371
2279 $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}) {
2280 $self->set_value ($self->{range}[0]); 2380 $self->set_value ($self->{range}[0]);
2281 2381
2282 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2382 my ($value, $lo, $hi, $page) = @{$self->{range}};
2283 my $range = ($hi - $page - $lo) || 1e-100; 2383 my $range = ($hi - $page - $lo) || 1e-100;
2284 2384
… …
2290 $value = ($value - $lo) / $range; 2390 $value = ($value - $lo) / $range;
2291 $value = $value * $self->{scale} + $self->{offset}; 2391 $value = $value * $self->{scale} + $self->{offset};
2292 2392
2293 $self->{knob_x} = $value - $knob_w * 0.5; 2393 $self->{knob_x} = $value - $knob_w * 0.5;
2294 $self->{knob_w} = $knob_w; 2394 $self->{knob_w} = $knob_w;
2295 }); 2395 }
2296
2297 $self->SUPER::update;
2298}
2299
2300sub _draw {
2301 my ($self) = @_;
2302 2396
2303 $self->SUPER::_draw (); 2397 $self->SUPER::_draw ();
2304 2398
2305 glScale $self->{w}, $self->{h}; 2399 glScale $self->{w}, $self->{h};
2306 2400
… …
2500 2594
2501 delete $self->{texture}; 2595 delete $self->{texture};
2502 } 2596 }
2503 2597
2504 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2598 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2505 glClearColor 0.5, 0.5, 0.5, 0; 2599 glClearColor 0, 0, 0, 0;
2506 glClear GL_COLOR_BUFFER_BIT; 2600 glClear GL_COLOR_BUFFER_BIT;
2507 2601
2508 my $top = int $self->{children}[1]{range}[0]; 2602 my $top = int $self->{children}[1]{range}[0];
2509 2603
2510 my $y0 = $top; 2604 my $y0 = $top;
… …
2545sub _draw { 2639sub _draw {
2546 my ($self) = @_; 2640 my ($self) = @_;
2547 2641
2548 glEnable GL_TEXTURE_2D; 2642 glEnable GL_TEXTURE_2D;
2549 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2550 glColor 1, 1, 1, 1; 2644 glColor 0, 0, 0, 1;
2551 $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});
2552 glDisable GL_TEXTURE_2D; 2646 glDisable GL_TEXTURE_2D;
2553 2647
2554 $self->{children}[1]->draw; 2648 $self->{children}[1]->draw;
2555 2649
2556} 2650}
… …
2783 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2877 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2784 2878
2785 if ($tex) { 2879 if ($tex) {
2786 glEnable GL_TEXTURE_2D; 2880 glEnable GL_TEXTURE_2D;
2787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2881 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2788 glColor 1, 1, 1, 1; 2882 glColor 0, 0, 0, 1;
2789 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2883 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2790 glDisable GL_TEXTURE_2D; 2884 glDisable GL_TEXTURE_2D;
2791 } 2885 }
2792} 2886}
2793 2887
… …
2797 $self->{timer}->cancel 2891 $self->{timer}->cancel
2798 if $self->{timer}; 2892 if $self->{timer};
2799 2893
2800 $self->SUPER::DESTROY; 2894 $self->SUPER::DESTROY;
2801} 2895}
2896
2897#############################################################################
2898
2899package CFClient::UI::Buttonbar;
2900
2901our @ISA = CFClient::UI::HBox::;
2902
2903# TODO: should actualyl wrap buttons and other goodies.
2802 2904
2803############################################################################# 2905#############################################################################
2804 2906
2805package CFClient::UI::Menu; 2907package CFClient::UI::Menu;
2806 2908
… …
2856 my ($self, $ev, $x, $y) = @_; 2958 my ($self, $ev, $x, $y) = @_;
2857 2959
2858 # TODO: should use vbox->find_widget or so 2960 # TODO: should use vbox->find_widget or so
2859 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2961 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2860 $self->{hover} = $self->{item}{$HOVER}; 2962 $self->{hover} = $self->{item}{$HOVER};
2963
2964 0
2861} 2965}
2862 2966
2863sub button_up { 2967sub button_up {
2864 my ($self, $ev, $x, $y) = @_; 2968 my ($self, $ev, $x, $y) = @_;
2865 2969
… …
2867 undef $GRAB; 2971 undef $GRAB;
2868 $self->hide; 2972 $self->hide;
2869 2973
2870 $self->_emit ("popdown"); 2974 $self->_emit ("popdown");
2871 $self->{hover}[1]->() if $self->{hover}; 2975 $self->{hover}[1]->() if $self->{hover};
2976 } else {
2977 return 0
2978 }
2979
2872 } 2980 1
2873} 2981}
2874 2982
2875############################################################################# 2983#############################################################################
2876 2984
2877package CFClient::UI::Statusbox; 2985package CFClient::UI::Multiplexer;
2878 2986
2879our @ISA = CFClient::UI::VBox::; 2987our @ISA = CFClient::UI::Container::;
2880 2988
2881sub new { 2989sub new {
2882 my $class = shift; 2990 my $class = shift;
2883 2991
2884 $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 (
2885 fontsize => 0.8, 3101 fontsize => 0.8,
2886 @_, 3102 @_,
2887 ) 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
2888} 3110}
2889 3111
2890sub reorder { 3112sub reorder {
2891 my ($self) = @_; 3113 my ($self) = @_;
2892 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} };
2893 3120
2894 while (my ($k, $v) = each %{ $self->{item} }) { 3121 while (my ($k, $v) = each %{ $self->{item} }) {
2895 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3122 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2896 } 3123 }
2897 3124
… …
2900 my @items = sort { 3127 my @items = sort {
2901 $a->{pri} <=> $b->{pri} 3128 $a->{pri} <=> $b->{pri}
2902 or $b->{id} <=> $a->{id} 3129 or $b->{id} <=> $a->{id}
2903 } values %{ $self->{item} }; 3130 } values %{ $self->{item} };
2904 3131
3132 $self->{timer}->interval (1);
3133
2905 my $count = 10 + 1; 3134 my $count = 10 + 1;
2906 for my $item (@items) { 3135 for my $item (@items) {
2907 last unless --$count; 3136 last unless --$count;
2908 3137
2909 push @widgets, $item->{label} ||= do { 3138 my $label = $item->{label} ||= do {
2910 # TODO: doesn't handle markup well (read as: at all) 3139 # TODO: doesn't handle markup well (read as: at all)
2911 my $short = $item->{count} > 1 3140 my $short = $item->{count} > 1
2912 ? "<b>$item->{count} ×</b> $item->{text}" 3141 ? "<b>$item->{count} ×</b> $item->{text}"
2913 : $item->{text}; 3142 : $item->{text};
2914 3143
… …
2922 tooltip => $item->{tooltip}, 3151 tooltip => $item->{tooltip},
2923 tooltip_font => $::FONT_PROP, 3152 tooltip_font => $::FONT_PROP,
2924 tooltip_width => 0.67, 3153 tooltip_width => 0.67,
2925 fontsize => $item->{fontsize} || $self->{fontsize}, 3154 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44, 3155 max_w => $::WIDTH * 0.44,
2927 fg => $item->{fg}, 3156 fg => [@{ $item->{fg} }],
2928 can_events => 1, 3157 can_events => 1,
2929 can_hover => 1 3158 can_hover => 1
2930 }; 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;
2931 } 3172 }
2932 3173
2933 $self->clear; 3174 $self->clear;
2934 $self->SUPER::add (reverse @widgets); 3175 $self->SUPER::add (reverse @widgets);
2935} 3176}
… …
2940 $text =~ s/^\s+//; 3181 $text =~ s/^\s+//;
2941 $text =~ s/\s+$//; 3182 $text =~ s/\s+$//;
2942 3183
2943 return unless $text; 3184 return unless $text;
2944 3185
2945 my $timeout = time + ((delete $arg{timeout}) || 60); 3186 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2946 3187
2947 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3188 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2948 3189
2949 if (my $item = $self->{item}{$group}) { 3190 if (my $item = $self->{item}{$group}) {
2950 if ($item->{text} eq $text) { 3191 if ($item->{text} eq $text) {
… …
2980 3221
2981 $self->reorder; 3222 $self->reorder;
2982 $self->SUPER::reconfigure; 3223 $self->SUPER::reconfigure;
2983} 3224}
2984 3225
3226sub DESTROY {
3227 my ($self) = @_;
3228
3229 $self->{timer}->cancel;
3230
3231 $self->SUPER::DESTROY;
3232}
3233
2985############################################################################# 3234#############################################################################
2986 3235
2987package CFClient::UI::Inventory; 3236package CFClient::UI::Inventory;
2988 3237
2989our @ISA = CFClient::UI::ScrolledWindow::; 3238our @ISA = CFClient::UI::ScrolledWindow::;
2990 3239
2991sub new { 3240sub new {
2992 my $class = shift; 3241 my $class = shift;
2993 3242
2994 my $self = $class->SUPER::new ( 3243 my $self = $class->SUPER::new (
2995 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3244 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2996 @_, 3245 @_,
2997 ); 3246 );
2998 3247
2999 $self 3248 $self
3000} 3249}
3001 3250
3002sub set_items { 3251sub set_items {
3003 my ($self, $items) = @_; 3252 my ($self, $items) = @_;
3004 3253
3005 $self->{scrolled}->clear; 3254 $self->{child}->clear;
3006 return unless $items; 3255 return unless $items;
3007 3256
3008 my @items = sort { 3257 my @items = sort {
3009 ($a->{type} <=> $b->{type}) 3258 ($a->{type} <=> $b->{type})
3010 or ($a->{name} cmp $b->{name}) 3259 or ($a->{name} cmp $b->{name})
… …
3014 3263
3015 my $row = 0; 3264 my $row = 0;
3016 for my $item (@items) { 3265 for my $item (@items) {
3017 CFClient::Item::update_widgets $item; 3266 CFClient::Item::update_widgets $item;
3018 3267
3019 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3268 $self->{child}->add (0, $row, $item->{face_widget});
3020 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3269 $self->{child}->add (1, $row, $item->{desc_widget});
3021 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3270 $self->{child}->add (2, $row, $item->{weight_widget});
3022 3271
3023 $row++; 3272 $row++;
3024 } 3273 }
3025} 3274}
3026 3275
… …
3124 $rec = $::CONN->stop_record if $::CONN; 3373 $rec = $::CONN->stop_record if $::CONN;
3125 return unless ref $rec eq 'ARRAY'; 3374 return unless ref $rec eq 'ARRAY';
3126 $self->set_command_list ($rec); 3375 $self->set_command_list ($rec);
3127} 3376}
3128 3377
3129# 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
3130sub ask_for_bind { 3384sub ask_for_bind {
3131 my ($self, $commit) = @_; 3385 my ($self, $commit) = @_;
3132 3386
3133 CFClient::Binder::open_binding_dialog (sub { 3387 CFClient::Binder::open_binding_dialog (sub {
3134 my ($mod, $sym) = @_; 3388 my ($mod, $sym) = @_;
… …
3218 3472
3219############################################################################# 3473#############################################################################
3220 3474
3221package CFClient::UI::SpellList; 3475package CFClient::UI::SpellList;
3222 3476
3223our @ISA = CFClient::UI::FancyFrame::; 3477our @ISA = CFClient::UI::Table::;
3224 3478
3225sub new { 3479sub new {
3226 my $class = shift; 3480 my $class = shift;
3227 3481
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3482 my $self = $class->SUPER::new (
3229 3483 binding => [],
3230 $self->add (new CFClient::UI::ScrolledWindow 3484 commands => [],
3231 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3485 @_,
3232 3486 )
3233 $self;
3234} 3487}
3235 3488
3236# 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
3237sub add_spell { 3543sub add_spell {
3238 my ($self, $spell) = @_; 3544 my ($self, $spell) = @_;
3545
3239 $self->{spells}->{$spell->{name}} = $spell; 3546 $self->{spell}->{$spell->{name}} = $spell;
3240 3547 $self->rebuild_spell_list;
3241 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3242 face => $spell->{face},
3243 can_hover => 1,
3244 can_events => 1,
3245 tooltip => $spell->{message});
3246
3247 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3248 text => $spell->{name},
3249 can_hover => 1,
3250 can_events => 1,
3251 tooltip => $spell->{message},
3252 expand => 1);
3253
3254 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3255 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3256 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3257 expand => 1);
3258
3259 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3260 text => "bind to key",
3261 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3262}
3263
3264sub rebuild_spell_list {
3265 my ($self) = @_;
3266 $self->{tbl_idx} = 0;
3267 $self->add_spell ($_) for values %{$self->{spells}};
3268} 3548}
3269 3549
3270sub remove_spell { 3550sub remove_spell {
3271 my ($self, $spell) = @_; 3551 my ($self, $spell) = @_;
3552
3272 delete $self->{spells}->{$spell->{name}}; 3553 delete $self->{spell}->{$spell->{name}};
3273 $self->rebuild_spell_list; 3554 $self->rebuild_spell_list;
3274} 3555}
3275 3556
3276############################################################################# 3557#############################################################################
3277 3558
3278package CFClient::UI::Root; 3559package CFClient::UI::Root;
3279 3560
3280our @ISA = CFClient::UI::Container::; 3561our @ISA = CFClient::UI::Container::;
3562
3563use List::Util qw(min max);
3281 3564
3282use CFClient::OpenGL; 3565use CFClient::OpenGL;
3283 3566
3284sub new { 3567sub new {
3285 my $class = shift; 3568 my $class = shift;
… …
3420 3703
3421 delete $queue{$widget+0}; 3704 delete $queue{$widget+0};
3422 3705
3423 my ($w, $h) = $widget->size_request; 3706 my ($w, $h) = $widget->size_request;
3424 3707
3425 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3708 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3426 $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};
3427 3713
3428 $w = $widget->{force_w} if exists $widget->{force_w}; 3714 $w = $widget->{force_w} if exists $widget->{force_w};
3429 $h = $widget->{force_h} if exists $widget->{force_h}; 3715 $h = $widget->{force_h} if exists $widget->{force_h};
3430 3716
3431 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