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.287 by root, Mon Jun 5 05:31:13 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);
1559 delete $self->{req_h};
1499 1560
1500 $self->realloc; 1561 $self->realloc;
1501 $self->update; 1562 $self->update;
1502} 1563}
1503 1564
… …
1509 1570
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);
1575 delete $self->{req_h};
1514 1576
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 if (exists $self->{req_h}) {
1585 @$self{qw(req_w req_h)}
1586 } else {
1522 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1587 $self->{layout}->set_font ($self->{font}) if $self->{font};
1523 $self->{layout}->set_width ($self->{max_w} || -1); 1588 $self->{layout}->set_width ($self->{max_w} || -1);
1524 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1589 $self->{layout}->set_ellipsise ($self->{ellipsise});
1525 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1526 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1527 1592
1528 my ($w, $h) = $self->{layout}->size; 1593 my ($w, $h) = $self->{layout}->size;
1529 1594
1530 if (exists $self->{template}) { 1595 if (exists $self->{template}) {
1531 $self->{template}->set_font ($self->{font}) if $self->{font}; 1596 $self->{template}->set_font ($self->{font}) if $self->{font};
1532 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1533 1598
1534 my ($w2, $h2) = $self->{template}->size; 1599 my ($w2, $h2) = $self->{template}->size;
1535 1600
1536 $w = List::Util::max $w, $w2; 1601 $w = List::Util::max $w, $w2;
1537 $h = List::Util::max $h, $h2; 1602 $h = List::Util::max $h, $h2;
1538 } 1603 }
1539 1604
1540 ($w, $h) 1605 ($w, $h)
1606 }
1541} 1607}
1542 1608
1543sub size_allocate { 1609sub size_allocate {
1544 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1611
1612 delete $self->{ox};
1545 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
… …
1567 $self->{layout}->set_width ($self->{w}); 1635 $self->{layout}->set_width ($self->{w});
1568 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1569 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1571 1639
1572 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1640 new_from_layout CFClient::Texture $self->{layout}
1641 };
1573 1642
1643 unless (exists $self->{ox}) {
1574 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1575 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1576 : ($self->{w} - $tex->{w}) * 0.5); 1646 : ($self->{w} - $tex->{w}) * 0.5);
1577 1647
1578 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1579 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1580 : ($self->{h} - $tex->{h}) * 0.5); 1650 : ($self->{h} - $tex->{h}) * 0.5);
1581
1582 $tex
1583 }; 1651 };
1584 1652
1585 glEnable GL_TEXTURE_2D; 1653 glEnable GL_TEXTURE_2D;
1586 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1587 1654
1588 if ($tex->{format} == GL_ALPHA) { 1655 if ($tex->{format} == GL_ALPHA) {
1656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1589 glColor @{$self->{fg}}; 1657 glColor @{$self->{fg}};
1590 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1591 } else { 1659 } else {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1592 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1661 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1593 } 1662 }
1594 1663
1595 glDisable GL_TEXTURE_2D; 1664 glDisable GL_TEXTURE_2D;
1596} 1665}
… …
1625 1694
1626 delete $self->{cur_h}; 1695 delete $self->{cur_h};
1627 1696
1628 return if $self->{text} eq $text; 1697 return if $self->{text} eq $text;
1629 1698
1630 delete $self->{texture};
1631
1632 $self->{last_activity} = $::NOW; 1699 $self->{last_activity} = $::NOW;
1633 $self->{text} = $text; 1700 $self->{text} = $text;
1634 1701
1635 $text =~ s/./*/g if $self->{hidden}; 1702 $text =~ s/./*/g if $self->{hidden};
1636 $self->{layout}->set_text ("$text "); 1703 $self->{layout}->set_text ("$text ");
1704 delete $self->{req_h};
1637 1705
1638 $self->_emit (changed => $self->{text}); 1706 $self->_emit (changed => $self->{text});
1707
1708 $self->realloc;
1709 $self->update;
1639} 1710}
1640 1711
1641sub set_text { 1712sub set_text {
1642 my ($self, $text) = @_; 1713 my ($self, $text) = @_;
1643 1714
1644 $self->{cursor} = length $text; 1715 $self->{cursor} = length $text;
1645 $self->_set_text ($text); 1716 $self->_set_text ($text);
1646
1647 $self->realloc;
1648} 1717}
1649 1718
1650sub get_text { 1719sub get_text {
1651 $_[0]{text} 1720 $_[0]{text}
1652} 1721}
… …
1682 $self->{cursor} = length $text; 1751 $self->{cursor} = length $text;
1683 } elsif ($uni == 27) { 1752 } elsif ($uni == 27) {
1684 $self->_emit ('escape'); 1753 $self->_emit ('escape');
1685 } elsif ($uni) { 1754 } elsif ($uni) {
1686 substr $text, $self->{cursor}++, 0, chr $uni; 1755 substr $text, $self->{cursor}++, 0, chr $uni;
1756 } else {
1757 return 0;
1687 } 1758 }
1688 1759
1689 $self->_set_text ($text); 1760 $self->_set_text ($text);
1690 1761
1691 $self->realloc; 1762 $self->realloc;
1763
1764 1
1692} 1765}
1693 1766
1694sub focus_in { 1767sub focus_in {
1695 my ($self) = @_; 1768 my ($self) = @_;
1696 1769
… …
1711 utf8::encode $text; 1784 utf8::encode $text;
1712 $self->{cursor} = length substr $text, 0, $idx; 1785 $self->{cursor} = length substr $text, 0, $idx;
1713 1786
1714 $self->_set_text ($self->{text}); 1787 $self->_set_text ($self->{text});
1715 $self->update; 1788 $self->update;
1789
1790 1
1716} 1791}
1717 1792
1718sub mouse_motion { 1793sub mouse_motion {
1719 my ($self, $ev, $x, $y) = @_; 1794 my ($self, $ev, $x, $y) = @_;
1720# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1795# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1796
1797 0
1721} 1798}
1722 1799
1723sub _draw { 1800sub _draw {
1724 my ($self) = @_; 1801 my ($self) = @_;
1725 1802
1726 local $self->{fg} = $self->{fg}; 1803 local $self->{fg} = $self->{fg};
1727 1804
1728 if ($FOCUS == $self) { 1805 if ($FOCUS == $self) {
1729 glColor @{$self->{active_bg}}; 1806 glColor_premultiply @{$self->{active_bg}};
1730 $self->{fg} = $self->{active_fg}; 1807 $self->{fg} = $self->{active_fg};
1731 } else { 1808 } else {
1732 glColor @{$self->{bg}}; 1809 glColor_premultiply @{$self->{bg}};
1733 } 1810 }
1734 1811
1735 glEnable GL_BLEND; 1812 glEnable GL_BLEND;
1736 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1813 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1737 glBegin GL_QUADS; 1814 glBegin GL_QUADS;
1738 glVertex 0 , 0; 1815 glVertex 0 , 0;
1739 glVertex 0 , $self->{h}; 1816 glVertex 0 , $self->{h};
1740 glVertex $self->{w}, $self->{h}; 1817 glVertex $self->{w}, $self->{h};
1741 glVertex $self->{w}, 0; 1818 glVertex $self->{w}, 0;
… …
1802 } else { 1879 } else {
1803 $self->set_text ($self->{history_saveback}); 1880 $self->set_text ($self->{history_saveback});
1804 } 1881 }
1805 1882
1806 } else { 1883 } else {
1807 $self->SUPER::key_down ($ev); 1884 return $self->SUPER::key_down ($ev)
1885 }
1886
1808 } 1887 1
1809
1810} 1888}
1811 1889
1812############################################################################# 1890#############################################################################
1813 1891
1814package CFClient::UI::Button; 1892package CFClient::UI::Button;
… …
1843 my ($self, $ev, $x, $y) = @_; 1921 my ($self, $ev, $x, $y) = @_;
1844 1922
1845 $self->emit ("activate") 1923 $self->emit ("activate")
1846 if $x >= 0 && $x < $self->{w} 1924 if $x >= 0 && $x < $self->{w}
1847 && $y >= 0 && $y < $self->{h}; 1925 && $y >= 0 && $y < $self->{h};
1926
1927 1
1848} 1928}
1849 1929
1850sub _draw { 1930sub _draw {
1851 my ($self) = @_; 1931 my ($self) = @_;
1852 1932
1853 local $self->{fg} = $self->{fg}; 1933 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1854
1855 if ($GRAB == $self) {
1856 $self->{fg} = $self->{active_fg};
1857 }
1858 1934
1859 glEnable GL_TEXTURE_2D; 1935 glEnable GL_TEXTURE_2D;
1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1936 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861 glColor 0, 0, 0, 1; 1937 glColor 0, 0, 0, 1;
1862 1938
… …
1906 1982
1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1983 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1984 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1909 $self->{state} = !$self->{state}; 1985 $self->{state} = !$self->{state};
1910 $self->_emit (changed => $self->{state}); 1986 $self->_emit (changed => $self->{state});
1987 } else {
1988 return 0
1989 }
1990
1911 } 1991 1
1912} 1992}
1913 1993
1914sub _draw { 1994sub _draw {
1915 my ($self) = @_; 1995 my ($self) = @_;
1916 1996
… …
2083 2163
2084 my $h1 = $self->{h} * (1 - $ycut1); 2164 my $h1 = $self->{h} * (1 - $ycut1);
2085 my $h2 = $self->{h} * (1 - $ycut2); 2165 my $h2 = $self->{h} * (1 - $ycut2);
2086 2166
2087 glEnable GL_BLEND; 2167 glEnable GL_BLEND;
2088 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2168 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2169 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2089 glEnable GL_TEXTURE_2D; 2170 glEnable GL_TEXTURE_2D;
2090 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2171 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2091 2172
2092 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2173 glBindTexture GL_TEXTURE_2D, $t1->{name};
2093 glBegin GL_QUADS; 2174 glBegin GL_QUADS;
… …
2254 2335
2255 $self->SUPER::button_down ($ev, $x, $y); 2336 $self->SUPER::button_down ($ev, $x, $y);
2256 2337
2257 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2338 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2258 2339
2259 $self->mouse_motion ($ev, $x, $y); 2340 $self->mouse_motion ($ev, $x, $y)
2260} 2341}
2261 2342
2262sub mouse_motion { 2343sub mouse_motion {
2263 my ($self, $ev, $x, $y) = @_; 2344 my ($self, $ev, $x, $y) = @_;
2264 2345
… …
2268 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2349 my (undef, $lo, $hi, $page) = @{$self->{range}};
2269 2350
2270 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2351 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2271 2352
2272 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2353 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2354 } else {
2355 return 0;
2356 }
2357
2273 } 2358 1
2274} 2359}
2275 2360
2276sub update { 2361sub update {
2277 my ($self) = @_; 2362 my ($self) = @_;
2278 2363
2279 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2364 delete $self->{knob_w};
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370
2371 unless ($self->{knob_w}) {
2280 $self->set_value ($self->{range}[0]); 2372 $self->set_value ($self->{range}[0]);
2281 2373
2282 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2374 my ($value, $lo, $hi, $page) = @{$self->{range}};
2283 my $range = ($hi - $page - $lo) || 1e-100; 2375 my $range = ($hi - $page - $lo) || 1e-100;
2284 2376
… …
2290 $value = ($value - $lo) / $range; 2382 $value = ($value - $lo) / $range;
2291 $value = $value * $self->{scale} + $self->{offset}; 2383 $value = $value * $self->{scale} + $self->{offset};
2292 2384
2293 $self->{knob_x} = $value - $knob_w * 0.5; 2385 $self->{knob_x} = $value - $knob_w * 0.5;
2294 $self->{knob_w} = $knob_w; 2386 $self->{knob_w} = $knob_w;
2295 }); 2387 }
2296
2297 $self->SUPER::update;
2298}
2299
2300sub _draw {
2301 my ($self) = @_;
2302 2388
2303 $self->SUPER::_draw (); 2389 $self->SUPER::_draw ();
2304 2390
2305 glScale $self->{w}, $self->{h}; 2391 glScale $self->{w}, $self->{h};
2306 2392
… …
2500 2586
2501 delete $self->{texture}; 2587 delete $self->{texture};
2502 } 2588 }
2503 2589
2504 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2590 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2505 glClearColor 0.5, 0.5, 0.5, 0; 2591 glClearColor 0, 0, 0, 0;
2506 glClear GL_COLOR_BUFFER_BIT; 2592 glClear GL_COLOR_BUFFER_BIT;
2507 2593
2508 my $top = int $self->{children}[1]{range}[0]; 2594 my $top = int $self->{children}[1]{range}[0];
2509 2595
2510 my $y0 = $top; 2596 my $y0 = $top;
… …
2545sub _draw { 2631sub _draw {
2546 my ($self) = @_; 2632 my ($self) = @_;
2547 2633
2548 glEnable GL_TEXTURE_2D; 2634 glEnable GL_TEXTURE_2D;
2549 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2550 glColor 1, 1, 1, 1; 2636 glColor 0, 0, 0, 1;
2551 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2637 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2552 glDisable GL_TEXTURE_2D; 2638 glDisable GL_TEXTURE_2D;
2553 2639
2554 $self->{children}[1]->draw; 2640 $self->{children}[1]->draw;
2555 2641
2556} 2642}
… …
2783 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2869 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2784 2870
2785 if ($tex) { 2871 if ($tex) {
2786 glEnable GL_TEXTURE_2D; 2872 glEnable GL_TEXTURE_2D;
2787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2873 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2788 glColor 1, 1, 1, 1; 2874 glColor 0, 0, 0, 1;
2789 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2875 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2790 glDisable GL_TEXTURE_2D; 2876 glDisable GL_TEXTURE_2D;
2791 } 2877 }
2792} 2878}
2793 2879
… …
2797 $self->{timer}->cancel 2883 $self->{timer}->cancel
2798 if $self->{timer}; 2884 if $self->{timer};
2799 2885
2800 $self->SUPER::DESTROY; 2886 $self->SUPER::DESTROY;
2801} 2887}
2888
2889#############################################################################
2890
2891package CFClient::UI::Buttonbar;
2892
2893our @ISA = CFClient::UI::HBox::;
2894
2895# TODO: should actualyl wrap buttons and other goodies.
2802 2896
2803############################################################################# 2897#############################################################################
2804 2898
2805package CFClient::UI::Menu; 2899package CFClient::UI::Menu;
2806 2900
… …
2856 my ($self, $ev, $x, $y) = @_; 2950 my ($self, $ev, $x, $y) = @_;
2857 2951
2858 # TODO: should use vbox->find_widget or so 2952 # TODO: should use vbox->find_widget or so
2859 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2953 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2860 $self->{hover} = $self->{item}{$HOVER}; 2954 $self->{hover} = $self->{item}{$HOVER};
2955
2956 0
2861} 2957}
2862 2958
2863sub button_up { 2959sub button_up {
2864 my ($self, $ev, $x, $y) = @_; 2960 my ($self, $ev, $x, $y) = @_;
2865 2961
… …
2867 undef $GRAB; 2963 undef $GRAB;
2868 $self->hide; 2964 $self->hide;
2869 2965
2870 $self->_emit ("popdown"); 2966 $self->_emit ("popdown");
2871 $self->{hover}[1]->() if $self->{hover}; 2967 $self->{hover}[1]->() if $self->{hover};
2968 } else {
2969 return 0
2970 }
2971
2872 } 2972 1
2873} 2973}
2874 2974
2875############################################################################# 2975#############################################################################
2876 2976
2877package CFClient::UI::Statusbox; 2977package CFClient::UI::Multiplexer;
2878 2978
2879our @ISA = CFClient::UI::VBox::; 2979our @ISA = CFClient::UI::Container::;
2880 2980
2881sub new { 2981sub new {
2882 my $class = shift; 2982 my $class = shift;
2883 2983
2884 $class->SUPER::new ( 2984 my $self = $class->SUPER::new (
2985 @_,
2986 );
2987
2988 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} };
2990
2991 $self
2992}
2993
2994sub add {
2995 my ($self, @widgets) = @_;
2996
2997 $self->SUPER::add (@widgets);
2998
2999 $self->{current} = $self->{children}[0]
3000 if @{ $self->{children} };
3001}
3002
3003sub set_current_page {
3004 my ($self, $page_or_widget) = @_;
3005
3006 my $widget = ref $page_or_widget
3007 ? $page_or_widget
3008 : $self->{children}[$page_or_widget];
3009
3010 $self->{current} = $widget;
3011 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3012
3013 $self->_emit (page_changed => $self->{current});
3014
3015 $self->realloc;
3016}
3017
3018sub visible_children {
3019 $_[0]{current}
3020}
3021
3022sub size_request {
3023 my ($self) = @_;
3024
3025 $self->{current}->size_request
3026}
3027
3028sub size_allocate {
3029 my ($self, $w, $h) = @_;
3030
3031 $self->{current}->configure (0, 0, $w, $h);
3032}
3033
3034sub _draw {
3035 my ($self) = @_;
3036
3037 $self->{current}->draw;
3038}
3039
3040#############################################################################
3041
3042package CFClient::UI::Notebook;
3043
3044our @ISA = CFClient::UI::VBox::;
3045
3046sub new {
3047 my $class = shift;
3048
3049 my $self = $class->SUPER::new (
3050 buttonbar => (new CFClient::UI::Buttonbar),
3051 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3052 # filter => # will be put between multiplexer and $self
3053 @_,
3054 );
3055
3056 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3057 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3058
3059 $self
3060}
3061
3062sub add {
3063 my ($self, $title, $widget, $tooltip) = @_;
3064
3065 Scalar::Util::weaken $self;
3066
3067 $self->{buttonbar}->add (new CFClient::UI::Button
3068 markup => $title,
3069 tooltip => $tooltip,
3070 on_activate => sub { $self->set_current_page ($widget) },
3071 );
3072
3073 $self->{multiplexer}->add ($widget);
3074}
3075
3076sub set_current_page {
3077 my ($self, $page) = @_;
3078
3079 $self->{multiplexer}->set_current_page ($page);
3080 $self->_emit (page_changed => $self->{multiplexer}{current});
3081}
3082
3083#############################################################################
3084
3085package CFClient::UI::Statusbox;
3086
3087our @ISA = CFClient::UI::VBox::;
3088
3089sub new {
3090 my $class = shift;
3091
3092 my $self = $class->SUPER::new (
2885 fontsize => 0.8, 3093 fontsize => 0.8,
2886 @_, 3094 @_,
2887 ) 3095 );
3096
3097 Scalar::Util::weaken (my $this = $self);
3098
3099 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3100
3101 $self
2888} 3102}
2889 3103
2890sub reorder { 3104sub reorder {
2891 my ($self) = @_; 3105 my ($self) = @_;
2892 my $NOW = time; 3106 my $NOW = Time::HiRes::time;
3107
3108 # freeze display when hovering over any label
3109 return if $CFClient::UI::TOOLTIP->{owner}
3110 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3111 values %{ $self->{item} };
2893 3112
2894 while (my ($k, $v) = each %{ $self->{item} }) { 3113 while (my ($k, $v) = each %{ $self->{item} }) {
2895 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3114 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2896 } 3115 }
2897 3116
… …
2900 my @items = sort { 3119 my @items = sort {
2901 $a->{pri} <=> $b->{pri} 3120 $a->{pri} <=> $b->{pri}
2902 or $b->{id} <=> $a->{id} 3121 or $b->{id} <=> $a->{id}
2903 } values %{ $self->{item} }; 3122 } values %{ $self->{item} };
2904 3123
3124 $self->{timer}->interval (1);
3125
2905 my $count = 10 + 1; 3126 my $count = 10 + 1;
2906 for my $item (@items) { 3127 for my $item (@items) {
2907 last unless --$count; 3128 last unless --$count;
2908 3129
2909 push @widgets, $item->{label} ||= do { 3130 my $label = $item->{label} ||= do {
2910 # TODO: doesn't handle markup well (read as: at all) 3131 # TODO: doesn't handle markup well (read as: at all)
2911 my $short = $item->{count} > 1 3132 my $short = $item->{count} > 1
2912 ? "<b>$item->{count} ×</b> $item->{text}" 3133 ? "<b>$item->{count} ×</b> $item->{text}"
2913 : $item->{text}; 3134 : $item->{text};
2914 3135
… …
2922 tooltip => $item->{tooltip}, 3143 tooltip => $item->{tooltip},
2923 tooltip_font => $::FONT_PROP, 3144 tooltip_font => $::FONT_PROP,
2924 tooltip_width => 0.67, 3145 tooltip_width => 0.67,
2925 fontsize => $item->{fontsize} || $self->{fontsize}, 3146 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44, 3147 max_w => $::WIDTH * 0.44,
2927 fg => $item->{fg}, 3148 fg => [@{ $item->{fg} }],
2928 can_events => 1, 3149 can_events => 1,
2929 can_hover => 1 3150 can_hover => 1
2930 }; 3151 };
3152
3153 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3154 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3155 $label->update;
3156 $label->set_max_size (undef, $label->{req_h} * $diff)
3157 if $diff < 1;
3158 $self->{timer}->interval (1/30);
3159 } else {
3160 $label->{fg}[3] = $item->{fg}[3] || 1;
3161 }
3162
3163 push @widgets, $label;
2931 } 3164 }
2932 3165
2933 $self->clear; 3166 $self->clear;
2934 $self->SUPER::add (reverse @widgets); 3167 $self->SUPER::add (reverse @widgets);
2935} 3168}
… …
2940 $text =~ s/^\s+//; 3173 $text =~ s/^\s+//;
2941 $text =~ s/\s+$//; 3174 $text =~ s/\s+$//;
2942 3175
2943 return unless $text; 3176 return unless $text;
2944 3177
2945 my $timeout = time + ((delete $arg{timeout}) || 60); 3178 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2946 3179
2947 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3180 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2948 3181
2949 if (my $item = $self->{item}{$group}) { 3182 if (my $item = $self->{item}{$group}) {
2950 if ($item->{text} eq $text) { 3183 if ($item->{text} eq $text) {
… …
2980 3213
2981 $self->reorder; 3214 $self->reorder;
2982 $self->SUPER::reconfigure; 3215 $self->SUPER::reconfigure;
2983} 3216}
2984 3217
3218sub DESTROY {
3219 my ($self) = @_;
3220
3221 $self->{timer}->cancel;
3222
3223 $self->SUPER::DESTROY;
3224}
3225
2985############################################################################# 3226#############################################################################
2986 3227
2987package CFClient::UI::Inventory; 3228package CFClient::UI::Inventory;
2988 3229
2989our @ISA = CFClient::UI::ScrolledWindow::; 3230our @ISA = CFClient::UI::ScrolledWindow::;
2990 3231
2991sub new { 3232sub new {
2992 my $class = shift; 3233 my $class = shift;
2993 3234
2994 my $self = $class->SUPER::new ( 3235 my $self = $class->SUPER::new (
2995 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3236 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2996 @_, 3237 @_,
2997 ); 3238 );
2998 3239
2999 $self 3240 $self
3000} 3241}
3001 3242
3002sub set_items { 3243sub set_items {
3003 my ($self, $items) = @_; 3244 my ($self, $items) = @_;
3004 3245
3005 $self->{scrolled}->clear; 3246 $self->{child}->clear;
3006 return unless $items; 3247 return unless $items;
3007 3248
3008 my @items = sort { 3249 my @items = sort {
3009 ($a->{type} <=> $b->{type}) 3250 ($a->{type} <=> $b->{type})
3010 or ($a->{name} cmp $b->{name}) 3251 or ($a->{name} cmp $b->{name})
… …
3014 3255
3015 my $row = 0; 3256 my $row = 0;
3016 for my $item (@items) { 3257 for my $item (@items) {
3017 CFClient::Item::update_widgets $item; 3258 CFClient::Item::update_widgets $item;
3018 3259
3019 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3260 $self->{child}->add (0, $row, $item->{face_widget});
3020 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3261 $self->{child}->add (1, $row, $item->{desc_widget});
3021 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3262 $self->{child}->add (2, $row, $item->{weight_widget});
3022 3263
3023 $row++; 3264 $row++;
3024 } 3265 }
3025} 3266}
3026 3267
… …
3124 $rec = $::CONN->stop_record if $::CONN; 3365 $rec = $::CONN->stop_record if $::CONN;
3125 return unless ref $rec eq 'ARRAY'; 3366 return unless ref $rec eq 'ARRAY';
3126 $self->set_command_list ($rec); 3367 $self->set_command_list ($rec);
3127} 3368}
3128 3369
3129# if $commit is true, the binding will be set after the user entered a key combo 3370
3371sub ask_for_bind_and_commit {
3372 my ($self) = @_;
3373 $self->ask_for_bind (1);
3374}
3375
3130sub ask_for_bind { 3376sub ask_for_bind {
3131 my ($self, $commit) = @_; 3377 my ($self, $commit) = @_;
3132 3378
3133 CFClient::Binder::open_binding_dialog (sub { 3379 CFClient::Binder::open_binding_dialog (sub {
3134 my ($mod, $sym) = @_; 3380 my ($mod, $sym) = @_;
… …
3218 3464
3219############################################################################# 3465#############################################################################
3220 3466
3221package CFClient::UI::SpellList; 3467package CFClient::UI::SpellList;
3222 3468
3223our @ISA = CFClient::UI::FancyFrame::; 3469our @ISA = CFClient::UI::Table::;
3224 3470
3225sub new { 3471sub new {
3226 my $class = shift; 3472 my $class = shift;
3227 3473
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3474 my $self = $class->SUPER::new (
3229 3475 binding => [],
3230 $self->add (new CFClient::UI::ScrolledWindow 3476 commands => [],
3231 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3477 @_,
3232 3478 )
3233 $self;
3234} 3479}
3235 3480
3236# XXX: Do sorting? Argl... 3481# XXX: Do sorting? Argl...
3237sub add_spell { 3482sub add_spell {
3238 my ($self, $spell) = @_; 3483 my ($self, $spell) = @_;
3239 $self->{spells}->{$spell->{name}} = $spell; 3484 $self->{spells}->{$spell->{name}} = $spell;
3240 3485
3241 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face 3486 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3242 face => $spell->{face}, 3487 face => $spell->{face},
3243 can_hover => 1, 3488 can_hover => 1,
3244 can_events => 1, 3489 can_events => 1,
3245 tooltip => $spell->{message}); 3490 tooltip => $spell->{message});
3246 3491
3247 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label 3492 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3248 text => $spell->{name}, 3493 text => $spell->{name},
3249 can_hover => 1, 3494 can_hover => 1,
3250 can_events => 1, 3495 can_events => 1,
3251 tooltip => $spell->{message}, 3496 tooltip => $spell->{message},
3252 expand => 1); 3497 expand => 1);
3253 3498
3254 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label 3499 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3255 text => (sprintf "lvl: %2d sp: %2d dmg: %2d", 3500 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3256 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}), 3501 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3257 expand => 1); 3502 expand => 1);
3258 3503
3259 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button 3504 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3260 text => "bind to key", 3505 text => "bind to key",
3261 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); 3506 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3262} 3507}
3263 3508
3264sub rebuild_spell_list { 3509sub rebuild_spell_list {
… …
3276############################################################################# 3521#############################################################################
3277 3522
3278package CFClient::UI::Root; 3523package CFClient::UI::Root;
3279 3524
3280our @ISA = CFClient::UI::Container::; 3525our @ISA = CFClient::UI::Container::;
3526
3527use List::Util qw(min max);
3281 3528
3282use CFClient::OpenGL; 3529use CFClient::OpenGL;
3283 3530
3284sub new { 3531sub new {
3285 my $class = shift; 3532 my $class = shift;
… …
3420 3667
3421 delete $queue{$widget+0}; 3668 delete $queue{$widget+0};
3422 3669
3423 my ($w, $h) = $widget->size_request; 3670 my ($w, $h) = $widget->size_request;
3424 3671
3425 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3672 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3426 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3673 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3674
3675 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3676 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3427 3677
3428 $w = $widget->{force_w} if exists $widget->{force_w}; 3678 $w = $widget->{force_w} if exists $widget->{force_w};
3429 $h = $widget->{force_h} if exists $widget->{force_h}; 3679 $h = $widget->{force_h} if exists $widget->{force_h};
3430 3680
3431 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3681 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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