… | |
… | |
3 | use utf8; |
3 | use utf8; |
4 | use strict; |
4 | use strict; |
5 | |
5 | |
6 | use Scalar::Util (); |
6 | use Scalar::Util (); |
7 | use List::Util (); |
7 | use List::Util (); |
|
|
8 | use Event; |
8 | |
9 | |
9 | use CFClient; |
10 | use CFClient; |
10 | use CFClient::Texture; |
11 | use CFClient::Texture; |
11 | |
12 | |
12 | our ($FOCUS, $HOVER, $GRAB); # various widgets |
13 | our ($FOCUS, $HOVER, $GRAB); # various widgets |
… | |
… | |
15 | our $ROOT; |
16 | our $ROOT; |
16 | our $TOOLTIP; |
17 | our $TOOLTIP; |
17 | our $BUTTON_STATE; |
18 | our $BUTTON_STATE; |
18 | |
19 | |
19 | our %WIDGET; # all widgets, weak-referenced |
20 | our %WIDGET; # all widgets, weak-referenced |
|
|
21 | |
|
|
22 | our $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 | |
21 | sub get_layout { |
50 | sub 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 | |
44 | sub 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 |
73 | sub feed_sdl_key_down_event { |
74 | sub 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 | |
122 | sub feed_sdl_motion_event { |
123 | sub 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 | } |
… | |
… | |
271 | |
272 | |
272 | return unless $self->{visible}; |
273 | return unless $self->{visible}; |
273 | |
274 | |
274 | $_->set_invisible for $self->children; |
275 | $_->set_invisible for $self->children; |
275 | |
276 | |
|
|
277 | delete $self->{visible}; |
276 | delete $self->{root}; |
278 | delete $self->{root}; |
277 | 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); |
… | |
… | |
314 | } |
315 | } |
315 | |
316 | |
316 | sub move_abs { |
317 | sub move_abs { |
317 | my ($self, $x, $y, $z) = @_; |
318 | my ($self, $x, $y, $z) = @_; |
318 | |
319 | |
319 | $self->{x} = List::Util::max 0, int $x; |
320 | $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x; |
320 | $self->{y} = List::Util::max 0, int $y; |
321 | $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y; |
321 | $self->{z} = $z if defined $z; |
322 | $self->{z} = $z if defined $z; |
322 | |
323 | |
323 | $self->update; |
324 | $self->update; |
324 | } |
325 | } |
325 | |
326 | |
… | |
… | |
381 | } |
382 | } |
382 | |
383 | |
383 | sub set_max_size { |
384 | sub set_max_size { |
384 | my ($self, $w, $h) = @_; |
385 | my ($self, $w, $h) = @_; |
385 | |
386 | |
386 | delete $self->{max_w}; $self->{max_w} = $w if $w; |
387 | $self->{max_w} = int $w if defined $w; |
387 | delete $self->{max_h}; $self->{max_h} = $h if $h; |
388 | $self->{max_h} = int $h if defined $h; |
|
|
389 | |
|
|
390 | $self->realloc; |
388 | } |
391 | } |
389 | |
392 | |
390 | sub set_tooltip { |
393 | sub set_tooltip { |
391 | my ($self, $tooltip) = @_; |
394 | my ($self, $tooltip) = @_; |
392 | |
395 | |
… | |
… | |
397 | |
400 | |
398 | $self->{tooltip} = $tooltip; |
401 | $self->{tooltip} = $tooltip; |
399 | |
402 | |
400 | if ($CFClient::UI::TOOLTIP->{owner} == $self) { |
403 | if ($CFClient::UI::TOOLTIP->{owner} == $self) { |
401 | delete $CFClient::UI::TOOLTIP->{owner}; |
404 | delete $CFClient::UI::TOOLTIP->{owner}; |
402 | CFClient::UI::check_tooltip; |
405 | $CFClient::UI::TOOLTIP_WATCHER->cb->(); |
403 | } |
406 | } |
404 | } |
407 | } |
405 | |
408 | |
406 | # translate global coordinates to local coordinate system |
409 | # translate global coordinates to local coordinate system |
407 | sub coord2local { |
410 | sub coord2local { |
… | |
… | |
548 | return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) |
551 | return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) |
549 | || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); |
552 | || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); |
550 | |
553 | |
551 | glPushMatrix; |
554 | glPushMatrix; |
552 | glTranslate $self->{x}, $self->{y}, 0; |
555 | glTranslate $self->{x}, $self->{y}, 0; |
553 | $self->_draw; |
|
|
554 | glPopMatrix; |
|
|
555 | |
556 | |
556 | if ($self == $HOVER && $self->{can_hover}) { |
557 | if ($self == $HOVER && $self->{can_hover}) { |
557 | my ($x, $y) = @$self{qw(x y)}; |
|
|
558 | |
|
|
559 | glColor 1, 0.8, 0.5, 0.2; |
558 | glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2; |
560 | glEnable GL_BLEND; |
559 | glEnable GL_BLEND; |
561 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
560 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
562 | glBegin GL_QUADS; |
561 | glBegin GL_QUADS; |
563 | glVertex $x , $y; |
562 | glVertex 0 , 0; |
564 | glVertex $x + $self->{w}, $y; |
563 | glVertex $self->{w}, 0; |
565 | glVertex $x + $self->{w}, $y + $self->{h}; |
564 | glVertex $self->{w}, $self->{h}; |
566 | glVertex $x , $y + $self->{h}; |
565 | glVertex 0 , $self->{h}; |
567 | glEnd; |
566 | glEnd; |
568 | glDisable GL_BLEND; |
567 | glDisable GL_BLEND; |
569 | } |
568 | } |
570 | |
569 | |
571 | if ($ENV{CFPLUS_DEBUG} & 1) { |
570 | if ($ENV{CFPLUS_DEBUG} & 1) { |
572 | glPushMatrix; |
571 | glPushMatrix; |
573 | glColor 1, 1, 0, 1; |
572 | glColor 1, 1, 0, 1; |
574 | glTranslate $self->{x} + 0.375, $self->{y} + 0.375; |
573 | glTranslate 0.375, 0.375; |
575 | glBegin GL_LINE_LOOP; |
574 | glBegin GL_LINE_LOOP; |
576 | glVertex 0 , 0; |
575 | glVertex 0 , 0; |
577 | glVertex $self->{w} - 1, 0; |
576 | glVertex $self->{w} - 1, 0; |
578 | glVertex $self->{w} - 1, $self->{h} - 1; |
577 | glVertex $self->{w} - 1, $self->{h} - 1; |
579 | glVertex 0 , $self->{h} - 1; |
578 | glVertex 0 , $self->{h} - 1; |
580 | glEnd; |
579 | glEnd; |
581 | glPopMatrix; |
580 | glPopMatrix; |
582 | #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; |
583 | } |
582 | } |
|
|
583 | |
|
|
584 | $self->_draw; |
|
|
585 | glPopMatrix; |
584 | } |
586 | } |
585 | |
587 | |
586 | sub _draw { |
588 | sub _draw { |
587 | my ($self) = @_; |
589 | my ($self) = @_; |
588 | |
590 | |
… | |
… | |
591 | |
593 | |
592 | sub DESTROY { |
594 | sub DESTROY { |
593 | my ($self) = @_; |
595 | my ($self) = @_; |
594 | |
596 | |
595 | delete $WIDGET{$self+0}; |
597 | delete $WIDGET{$self+0}; |
596 | #$self->deactivate; |
598 | |
|
|
599 | eval { $self->destroy }; |
|
|
600 | warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; |
597 | } |
601 | } |
598 | |
602 | |
599 | ############################################################################# |
603 | ############################################################################# |
600 | |
604 | |
601 | package CFClient::UI::DrawBG; |
605 | package CFClient::UI::DrawBG; |
… | |
… | |
626 | |
630 | |
627 | if ($color && (@$color < 4 || $color->[3])) { |
631 | if ($color && (@$color < 4 || $color->[3])) { |
628 | my ($w, $h) = @$self{qw(w h)}; |
632 | my ($w, $h) = @$self{qw(w h)}; |
629 | |
633 | |
630 | glEnable GL_BLEND; |
634 | glEnable GL_BLEND; |
631 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
635 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
632 | glColor @$color; |
636 | glColor_premultiply @$color; |
633 | |
637 | |
634 | glBegin GL_QUADS; |
638 | glBegin GL_QUADS; |
635 | glVertex 0 , 0; |
639 | glVertex 0 , 0; |
636 | glVertex 0 , $h; |
640 | glVertex 0 , $h; |
637 | glVertex $w, $h; |
641 | glVertex $w, $h; |
… | |
… | |
766 | } |
770 | } |
767 | |
771 | |
768 | sub add { |
772 | sub add { |
769 | my ($self, $child) = @_; |
773 | my ($self, $child) = @_; |
770 | |
774 | |
771 | $self->{children} = []; |
775 | $self->SUPER::remove ($_) for @{ $self->{children} }; |
772 | |
|
|
773 | $self->SUPER::add ($child); |
776 | $self->SUPER::add ($child); |
774 | } |
777 | } |
775 | |
778 | |
776 | sub remove { |
779 | sub remove { |
777 | my ($self, $widget) = @_; |
780 | my ($self, $widget) = @_; |
… | |
… | |
856 | my $tex = $self->{texture} |
859 | my $tex = $self->{texture} |
857 | or return; |
860 | or return; |
858 | |
861 | |
859 | glEnable GL_TEXTURE_2D; |
862 | glEnable GL_TEXTURE_2D; |
860 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
863 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
861 | glColor 1, 1, 1, 1; |
864 | glColor 0, 0, 0, 1; |
862 | |
865 | |
863 | $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); |
866 | $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); |
864 | |
867 | |
865 | glDisable GL_TEXTURE_2D; |
868 | glDisable GL_TEXTURE_2D; |
866 | } |
869 | } |
… | |
… | |
1035 | |
1038 | |
1036 | if ($self->{bg}) { |
1039 | if ($self->{bg}) { |
1037 | my ($w, $h) = @$self{qw(w h)}; |
1040 | my ($w, $h) = @$self{qw(w h)}; |
1038 | |
1041 | |
1039 | glEnable GL_BLEND; |
1042 | glEnable GL_BLEND; |
1040 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
1043 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
1041 | glColor @{ $self->{bg} }; |
1044 | glColor_premultiply @{ $self->{bg} }; |
1042 | |
1045 | |
1043 | glBegin GL_QUADS; |
1046 | glBegin GL_QUADS; |
1044 | glVertex 0 , 0; |
1047 | glVertex 0 , 0; |
1045 | glVertex 0 , $h; |
1048 | glVertex 0 , $h; |
1046 | glVertex $w, $h; |
1049 | glVertex $w, $h; |
… | |
… | |
1069 | map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } |
1072 | map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } |
1070 | qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); |
1073 | qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); |
1071 | |
1074 | |
1072 | sub new { |
1075 | sub new { |
1073 | my ($class, %arg) = @_; |
1076 | my ($class, %arg) = @_; |
1074 | |
|
|
1075 | my $title = delete $arg{title}; |
|
|
1076 | |
1077 | |
1077 | my $self = $class->SUPER::new ( |
1078 | my $self = $class->SUPER::new ( |
1078 | bg => [1, 1, 1, 1], |
1079 | bg => [1, 1, 1, 1], |
1079 | border_bg => [1, 1, 1, 1], |
1080 | border_bg => [1, 1, 1, 1], |
1080 | border => 0.6, |
1081 | border => 0.6, |
… | |
… | |
1082 | min_w => 16, |
1083 | min_w => 16, |
1083 | min_h => 16, |
1084 | min_h => 16, |
1084 | %arg, |
1085 | %arg, |
1085 | ); |
1086 | ); |
1086 | |
1087 | |
1087 | $self->{title} = new CFClient::UI::Label |
1088 | $self->{title_widget} = new CFClient::UI::Label |
1088 | align => 0, |
1089 | align => 0, |
1089 | valign => 1, |
1090 | valign => 1, |
1090 | text => $title, |
1091 | text => $self->{title}, |
1091 | fontsize => $self->{border} |
1092 | fontsize => $self->{border}, |
1092 | if defined $title; |
1093 | if exists $self->{title}; |
1093 | |
1094 | |
1094 | $self |
1095 | $self |
1095 | } |
1096 | } |
1096 | |
1097 | |
1097 | sub add { |
1098 | sub add { |
1098 | my ($self, @widgets) = @_; |
1099 | my ($self, @widgets) = @_; |
1099 | |
1100 | |
1100 | $self->SUPER::add (@widgets); |
1101 | $self->SUPER::add (@widgets); |
1101 | $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; |
1102 | $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; |
1102 | } |
1103 | } |
1103 | |
1104 | |
1104 | sub border { |
1105 | sub border { |
1105 | int $_[0]{border} * $::FONTSIZE |
1106 | int $_[0]{border} * $::FONTSIZE |
1106 | } |
1107 | } |
1107 | |
1108 | |
1108 | sub size_request { |
1109 | sub size_request { |
1109 | my ($self) = @_; |
1110 | my ($self) = @_; |
1110 | |
1111 | |
1111 | $self->{title}->size_request |
1112 | $self->{title_widget}->size_request |
1112 | if $self->{title}; |
1113 | if $self->{title_widget}; |
1113 | |
1114 | |
1114 | my ($w, $h) = $self->SUPER::size_request; |
1115 | my ($w, $h) = $self->SUPER::size_request; |
1115 | |
1116 | |
1116 | ( |
1117 | ( |
1117 | $w + $self->border * 2, |
1118 | $w + $self->border * 2, |
… | |
… | |
1120 | } |
1121 | } |
1121 | |
1122 | |
1122 | sub size_allocate { |
1123 | sub size_allocate { |
1123 | my ($self, $w, $h) = @_; |
1124 | my ($self, $w, $h) = @_; |
1124 | |
1125 | |
1125 | if ($self->{title}) { |
1126 | if ($self->{title_widget}) { |
1126 | $self->{title}{w} = $w; |
1127 | $self->{title_widget}{w} = $w; |
1127 | $self->{title}{h} = $h; |
1128 | $self->{title_widget}{h} = $h; |
1128 | $self->{title}->size_allocate ($w, $h); |
1129 | $self->{title_widget}->size_allocate ($w, $h); |
1129 | } |
1130 | } |
1130 | |
1131 | |
1131 | my $border = $self->border; |
1132 | my $border = $self->border; |
1132 | |
1133 | |
1133 | $h -= List::Util::max 0, $border * 2; |
1134 | $h -= List::Util::max 0, $border * 2; |
… | |
… | |
1160 | my $dy = $ev->{y} - $oy; |
1161 | my $dy = $ev->{y} - $oy; |
1161 | |
1162 | |
1162 | $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); |
1163 | $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); |
1163 | $self->{force_h} = $bh + $dy * ($my ? -1 : 1); |
1164 | $self->{force_h} = $bh + $dy * ($my ? -1 : 1); |
1164 | |
1165 | |
|
|
1166 | $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my); |
1165 | $self->realloc; |
1167 | $self->realloc; |
1166 | $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my); |
|
|
1167 | }; |
1168 | }; |
1168 | |
1169 | |
1169 | } elsif ($lr ^ $td) { |
1170 | } elsif ($lr ^ $td) { |
1170 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
1171 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
1171 | my ($bx, $by) = ($self->{x}, $self->{y}); |
1172 | my ($bx, $by) = ($self->{x}, $self->{y}); |
… | |
… | |
1174 | my ($ev, $x, $y) = @_; |
1175 | my ($ev, $x, $y) = @_; |
1175 | |
1176 | |
1176 | ($x, $y) = ($ev->{x}, $ev->{y}); |
1177 | ($x, $y) = ($ev->{x}, $ev->{y}); |
1177 | |
1178 | |
1178 | $self->move_abs ($bx + $x - $ox, $by + $y - $oy); |
1179 | $self->move_abs ($bx + $x - $ox, $by + $y - $oy); |
|
|
1180 | # HACK: the next line is required to enforce placement |
|
|
1181 | $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); |
1179 | }; |
1182 | }; |
1180 | } else { |
1183 | } else { |
1181 | return 0; |
1184 | return 0; |
1182 | } |
1185 | } |
1183 | |
1186 | |
… | |
… | |
1229 | |
1232 | |
1230 | glDisable GL_TEXTURE_2D; |
1233 | glDisable GL_TEXTURE_2D; |
1231 | |
1234 | |
1232 | $child->draw; |
1235 | $child->draw; |
1233 | |
1236 | |
1234 | if ($self->{title}) { |
1237 | if ($self->{title_widget}) { |
1235 | glTranslate 0, $border - $self->{h}; |
1238 | glTranslate 0, $border - $self->{h}; |
1236 | $self->{title}->_draw; |
1239 | $self->{title_widget}->_draw; |
1237 | } |
1240 | } |
1238 | } |
1241 | } |
1239 | |
1242 | |
1240 | ############################################################################# |
1243 | ############################################################################# |
1241 | |
1244 | |
… | |
… | |
1265 | |
1268 | |
1266 | $child->set_parent ($self); |
1269 | $child->set_parent ($self); |
1267 | $self->{children}[$y][$x] = $child; |
1270 | $self->{children}[$y][$x] = $child; |
1268 | |
1271 | |
1269 | $self->realloc; |
1272 | $self->realloc; |
|
|
1273 | } |
|
|
1274 | |
|
|
1275 | sub remove { |
|
|
1276 | my ($self, $child) = @_; |
|
|
1277 | |
|
|
1278 | # TODO: not yet implemented |
1270 | } |
1279 | } |
1271 | |
1280 | |
1272 | # TODO: move to container class maybe? send children a signal on removal? |
1281 | # TODO: move to container class maybe? send children a signal on removal? |
1273 | sub clear { |
1282 | sub clear { |
1274 | my ($self) = @_; |
1283 | my ($self) = @_; |
… | |
… | |
1535 | |
1544 | |
1536 | delete $self->{texture}; |
1545 | delete $self->{texture}; |
1537 | $self->SUPER::update; |
1546 | $self->SUPER::update; |
1538 | } |
1547 | } |
1539 | |
1548 | |
|
|
1549 | sub realloc { |
|
|
1550 | my ($self) = @_; |
|
|
1551 | |
|
|
1552 | delete $self->{ox}; |
|
|
1553 | $self->SUPER::realloc; |
|
|
1554 | } |
|
|
1555 | |
1540 | sub set_text { |
1556 | sub set_text { |
1541 | my ($self, $text) = @_; |
1557 | my ($self, $text) = @_; |
1542 | |
1558 | |
1543 | return if $self->{text} eq "T$text"; |
1559 | return if $self->{text} eq "T$text"; |
1544 | $self->{text} = "T$text"; |
1560 | $self->{text} = "T$text"; |
1545 | |
1561 | |
1546 | $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; |
1562 | $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; |
1547 | $self->{layout}->set_text ($text); |
1563 | $self->{layout}->set_text ($text); |
1548 | |
1564 | |
|
|
1565 | delete $self->{size_req}; |
1549 | $self->realloc; |
1566 | $self->realloc; |
1550 | $self->update; |
1567 | $self->update; |
1551 | } |
1568 | } |
1552 | |
1569 | |
1553 | sub set_markup { |
1570 | sub set_markup { |
… | |
… | |
1559 | my $rgba = $markup =~ /span.*(?:foreground|background)/; |
1576 | my $rgba = $markup =~ /span.*(?:foreground|background)/; |
1560 | |
1577 | |
1561 | $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; |
1578 | $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; |
1562 | $self->{layout}->set_markup ($markup); |
1579 | $self->{layout}->set_markup ($markup); |
1563 | |
1580 | |
|
|
1581 | delete $self->{size_req}; |
1564 | $self->realloc; |
1582 | $self->realloc; |
1565 | $self->update; |
1583 | $self->update; |
1566 | } |
1584 | } |
1567 | |
1585 | |
1568 | sub size_request { |
1586 | sub size_request { |
1569 | my ($self) = @_; |
1587 | my ($self) = @_; |
1570 | |
1588 | |
|
|
1589 | $self->{size_req} ||= do { |
1571 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
1590 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
1572 | $self->{layout}->set_width ($self->{max_w} || -1); |
1591 | $self->{layout}->set_width ($self->{max_w} || -1); |
1573 | $self->{layout}->set_ellipsise ($self->{ellipsise}); |
1592 | $self->{layout}->set_ellipsise ($self->{ellipsise}); |
1574 | $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); |
1593 | $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); |
1575 | $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); |
1594 | $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); |
1576 | |
1595 | |
1577 | my ($w, $h) = $self->{layout}->size; |
1596 | my ($w, $h) = $self->{layout}->size; |
1578 | |
1597 | |
1579 | if (exists $self->{template}) { |
1598 | if (exists $self->{template}) { |
1580 | $self->{template}->set_font ($self->{font}) if $self->{font}; |
1599 | $self->{template}->set_font ($self->{font}) if $self->{font}; |
1581 | $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); |
1600 | $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); |
1582 | |
1601 | |
1583 | my ($w2, $h2) = $self->{template}->size; |
1602 | my ($w2, $h2) = $self->{template}->size; |
1584 | |
1603 | |
1585 | $w = List::Util::max $w, $w2; |
1604 | $w = List::Util::max $w, $w2; |
1586 | $h = List::Util::max $h, $h2; |
1605 | $h = List::Util::max $h, $h2; |
|
|
1606 | } |
|
|
1607 | |
|
|
1608 | [$w, $h] |
1587 | } |
1609 | }; |
1588 | |
1610 | |
1589 | ($w, $h) |
1611 | @{ $self->{size_req} } |
1590 | } |
1612 | } |
1591 | |
1613 | |
1592 | sub size_allocate { |
1614 | sub size_allocate { |
1593 | my ($self, $w, $h) = @_; |
1615 | my ($self, $w, $h) = @_; |
1594 | |
1616 | |
… | |
… | |
1603 | |
1625 | |
1604 | $self->{fontsize} = $fontsize; |
1626 | $self->{fontsize} = $fontsize; |
1605 | delete $self->{texture}; |
1627 | delete $self->{texture}; |
1606 | |
1628 | |
1607 | $self->realloc; |
1629 | $self->realloc; |
|
|
1630 | } |
|
|
1631 | |
|
|
1632 | sub reconfigure { |
|
|
1633 | my ($self) = @_; |
|
|
1634 | |
|
|
1635 | delete $self->{size_req}; |
|
|
1636 | |
|
|
1637 | $self->SUPER::reconfigure; |
1608 | } |
1638 | } |
1609 | |
1639 | |
1610 | sub _draw { |
1640 | sub _draw { |
1611 | my ($self) = @_; |
1641 | my ($self) = @_; |
1612 | |
1642 | |
… | |
… | |
1632 | : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} |
1662 | : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} |
1633 | : ($self->{h} - $tex->{h}) * 0.5); |
1663 | : ($self->{h} - $tex->{h}) * 0.5); |
1634 | }; |
1664 | }; |
1635 | |
1665 | |
1636 | glEnable GL_TEXTURE_2D; |
1666 | glEnable GL_TEXTURE_2D; |
1637 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
1667 | |
|
|
1668 | my $w = List::Util::min $self->{w} + 4, $tex->{w}; |
|
|
1669 | my $h = List::Util::min $self->{h} + 2, $tex->{h}; |
1638 | |
1670 | |
1639 | if ($tex->{format} == GL_ALPHA) { |
1671 | if ($tex->{format} == GL_ALPHA) { |
|
|
1672 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
1640 | glColor @{$self->{fg}}; |
1673 | glColor @{$self->{fg}}; |
1641 | $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); |
1674 | $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h); |
1642 | } else { |
1675 | } else { |
|
|
1676 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
1643 | $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); |
1677 | $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h); |
1644 | } |
1678 | } |
1645 | |
1679 | |
1646 | glDisable GL_TEXTURE_2D; |
1680 | glDisable GL_TEXTURE_2D; |
1647 | } |
1681 | } |
1648 | |
1682 | |
… | |
… | |
1665 | can_hover => 1, |
1699 | can_hover => 1, |
1666 | can_focus => 1, |
1700 | can_focus => 1, |
1667 | valign => 0, |
1701 | valign => 0, |
1668 | can_events => 1, |
1702 | can_events => 1, |
1669 | #text => ... |
1703 | #text => ... |
|
|
1704 | #hidden => "*", |
1670 | @_ |
1705 | @_ |
1671 | ) |
1706 | ) |
1672 | } |
1707 | } |
1673 | |
1708 | |
1674 | sub _set_text { |
1709 | sub _set_text { |
… | |
… | |
1681 | $self->{last_activity} = $::NOW; |
1716 | $self->{last_activity} = $::NOW; |
1682 | $self->{text} = $text; |
1717 | $self->{text} = $text; |
1683 | |
1718 | |
1684 | $text =~ s/./*/g if $self->{hidden}; |
1719 | $text =~ s/./*/g if $self->{hidden}; |
1685 | $self->{layout}->set_text ("$text "); |
1720 | $self->{layout}->set_text ("$text "); |
|
|
1721 | delete $self->{size_req}; |
1686 | |
1722 | |
1687 | $self->_emit (changed => $self->{text}); |
1723 | $self->_emit (changed => $self->{text}); |
|
|
1724 | |
|
|
1725 | $self->realloc; |
1688 | $self->update; |
1726 | $self->update; |
1689 | } |
1727 | } |
1690 | |
1728 | |
1691 | sub set_text { |
1729 | sub set_text { |
1692 | my ($self, $text) = @_; |
1730 | my ($self, $text) = @_; |
1693 | |
1731 | |
1694 | $self->{cursor} = length $text; |
1732 | $self->{cursor} = length $text; |
1695 | $self->_set_text ($text); |
1733 | $self->_set_text ($text); |
1696 | |
|
|
1697 | $self->realloc; |
|
|
1698 | } |
1734 | } |
1699 | |
1735 | |
1700 | sub get_text { |
1736 | sub get_text { |
1701 | $_[0]{text} |
1737 | $_[0]{text} |
1702 | } |
1738 | } |
… | |
… | |
1782 | my ($self) = @_; |
1818 | my ($self) = @_; |
1783 | |
1819 | |
1784 | local $self->{fg} = $self->{fg}; |
1820 | local $self->{fg} = $self->{fg}; |
1785 | |
1821 | |
1786 | if ($FOCUS == $self) { |
1822 | if ($FOCUS == $self) { |
1787 | glColor @{$self->{active_bg}}; |
1823 | glColor_premultiply @{$self->{active_bg}}; |
1788 | $self->{fg} = $self->{active_fg}; |
1824 | $self->{fg} = $self->{active_fg}; |
1789 | } else { |
1825 | } else { |
1790 | glColor @{$self->{bg}}; |
1826 | glColor_premultiply @{$self->{bg}}; |
1791 | } |
1827 | } |
1792 | |
1828 | |
1793 | glEnable GL_BLEND; |
1829 | glEnable GL_BLEND; |
1794 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
1830 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
1795 | glBegin GL_QUADS; |
1831 | glBegin GL_QUADS; |
1796 | glVertex 0 , 0; |
1832 | glVertex 0 , 0; |
1797 | glVertex 0 , $self->{h}; |
1833 | glVertex 0 , $self->{h}; |
1798 | glVertex $self->{w}, $self->{h}; |
1834 | glVertex $self->{w}, $self->{h}; |
1799 | glVertex $self->{w}, 0; |
1835 | glVertex $self->{w}, 0; |
… | |
… | |
1909 | } |
1945 | } |
1910 | |
1946 | |
1911 | sub _draw { |
1947 | sub _draw { |
1912 | my ($self) = @_; |
1948 | my ($self) = @_; |
1913 | |
1949 | |
1914 | local $self->{fg} = $self->{fg}; |
1950 | local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg}; |
1915 | |
|
|
1916 | if ($GRAB == $self) { |
|
|
1917 | $self->{fg} = $self->{active_fg}; |
|
|
1918 | } |
|
|
1919 | |
1951 | |
1920 | glEnable GL_TEXTURE_2D; |
1952 | glEnable GL_TEXTURE_2D; |
1921 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
1953 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
1922 | glColor 0, 0, 0, 1; |
1954 | glColor 0, 0, 0, 1; |
1923 | |
1955 | |
… | |
… | |
2148 | |
2180 | |
2149 | my $h1 = $self->{h} * (1 - $ycut1); |
2181 | my $h1 = $self->{h} * (1 - $ycut1); |
2150 | my $h2 = $self->{h} * (1 - $ycut2); |
2182 | my $h2 = $self->{h} * (1 - $ycut2); |
2151 | |
2183 | |
2152 | glEnable GL_BLEND; |
2184 | glEnable GL_BLEND; |
2153 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
2185 | glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, |
|
|
2186 | GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
2154 | glEnable GL_TEXTURE_2D; |
2187 | glEnable GL_TEXTURE_2D; |
2155 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2188 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2156 | |
2189 | |
2157 | glBindTexture GL_TEXTURE_2D, $t1->{name}; |
2190 | glBindTexture GL_TEXTURE_2D, $t1->{name}; |
2158 | glBegin GL_QUADS; |
2191 | glBegin GL_QUADS; |
… | |
… | |
2279 | sub set_range { |
2312 | sub set_range { |
2280 | my ($self, $range) = @_; |
2313 | my ($self, $range) = @_; |
2281 | |
2314 | |
2282 | ($range, $self->{range}) = ($self->{range}, $range); |
2315 | ($range, $self->{range}) = ($self->{range}, $range); |
2283 | |
2316 | |
2284 | $self->update |
|
|
2285 | if "@$range" ne "@{$self->{range}}"; |
2317 | if ("@$range" ne "@{$self->{range}}") { |
|
|
2318 | $self->update; |
|
|
2319 | $self->set_value ($self->{range}[0]); |
|
|
2320 | } |
2286 | } |
2321 | } |
2287 | |
2322 | |
2288 | sub set_value { |
2323 | sub set_value { |
2289 | my ($self, $value) = @_; |
2324 | my ($self, $value) = @_; |
2290 | |
2325 | |
… | |
… | |
2437 | sub set_range { shift->{slider}->set_range (@_) } |
2472 | sub set_range { shift->{slider}->set_range (@_) } |
2438 | sub set_value { shift->{slider}->set_value (@_) } |
2473 | sub set_value { shift->{slider}->set_value (@_) } |
2439 | |
2474 | |
2440 | ############################################################################# |
2475 | ############################################################################# |
2441 | |
2476 | |
2442 | package CFClient::UI::TextView; |
2477 | package CFClient::UI::TextScroller; |
2443 | |
2478 | |
2444 | our @ISA = CFClient::UI::HBox::; |
2479 | our @ISA = CFClient::UI::HBox::; |
2445 | |
2480 | |
2446 | use CFClient::OpenGL; |
2481 | use CFClient::OpenGL; |
2447 | |
2482 | |
… | |
… | |
2449 | my $class = shift; |
2484 | my $class = shift; |
2450 | |
2485 | |
2451 | my $self = $class->SUPER::new ( |
2486 | my $self = $class->SUPER::new ( |
2452 | fontsize => 1, |
2487 | fontsize => 1, |
2453 | can_events => 0, |
2488 | can_events => 0, |
|
|
2489 | indent => 0, |
2454 | #font => default_font |
2490 | #font => default_font |
2455 | @_, |
2491 | @_, |
2456 | |
2492 | |
2457 | layout => (new CFClient::Layout 1), |
2493 | layout => (new CFClient::Layout 1), |
2458 | par => [], |
2494 | par => [], |
… | |
… | |
2481 | $self->SUPER::size_allocate ($w, $h); |
2517 | $self->SUPER::size_allocate ($w, $h); |
2482 | |
2518 | |
2483 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
2519 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
2484 | $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); |
2520 | $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); |
2485 | $self->{layout}->set_width ($self->{children}[0]{w}); |
2521 | $self->{layout}->set_width ($self->{children}[0]{w}); |
|
|
2522 | $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); |
2486 | |
2523 | |
2487 | $self->reflow; |
2524 | $self->reflow; |
2488 | } |
2525 | } |
2489 | |
2526 | |
2490 | sub text_size { |
2527 | sub text_size { |
… | |
… | |
2492 | |
2529 | |
2493 | my $layout = $self->{layout}; |
2530 | my $layout = $self->{layout}; |
2494 | |
2531 | |
2495 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
2532 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
2496 | $layout->set_width ($self->{children}[0]{w} - $indent); |
2533 | $layout->set_width ($self->{children}[0]{w} - $indent); |
|
|
2534 | $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); |
2497 | $layout->set_markup ($text); |
2535 | $layout->set_markup ($text); |
2498 | |
2536 | |
2499 | $layout->size |
2537 | $layout->size |
2500 | } |
2538 | } |
2501 | |
2539 | |
… | |
… | |
2540 | |
2578 | |
2541 | return unless $self->{h} > 0; |
2579 | return unless $self->{h} > 0; |
2542 | |
2580 | |
2543 | delete $self->{texture}; |
2581 | delete $self->{texture}; |
2544 | |
2582 | |
2545 | $ROOT->on_post_alloc ($self, sub { |
2583 | $ROOT->on_post_alloc ($self => sub { |
2546 | my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; |
2584 | my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; |
2547 | |
2585 | |
2548 | if (delete $self->{need_reflow}) { |
2586 | if (delete $self->{need_reflow}) { |
2549 | my $height = 0; |
2587 | my $height = 0; |
2550 | |
2588 | |
… | |
… | |
2553 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
2591 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
2554 | |
2592 | |
2555 | for (@{$self->{par}}) { |
2593 | for (@{$self->{par}}) { |
2556 | if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support |
2594 | if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support |
2557 | $layout->set_width ($W - $_->[3]); |
2595 | $layout->set_width ($W - $_->[3]); |
|
|
2596 | $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); |
2558 | $layout->set_markup ($_->[4]); |
2597 | $layout->set_markup ($_->[4]); |
2559 | my ($w, $h) = $layout->size; |
2598 | my ($w, $h) = $layout->size; |
2560 | $_->[0] = $w + $_->[3]; |
2599 | $_->[0] = $w + $_->[3]; |
2561 | $_->[1] = $h; |
2600 | $_->[1] = $h; |
2562 | } |
2601 | } |
… | |
… | |
2565 | } |
2604 | } |
2566 | |
2605 | |
2567 | $self->{height} = $height; |
2606 | $self->{height} = $height; |
2568 | |
2607 | |
2569 | $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); |
2608 | $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); |
2570 | |
2609 | |
2571 | delete $self->{texture}; |
2610 | delete $self->{texture}; |
2572 | } |
2611 | } |
2573 | |
2612 | |
2574 | $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { |
2613 | $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { |
2575 | glClearColor 0.5, 0.5, 0.5, 0; |
2614 | glClearColor 0, 0, 0, 0; |
2576 | glClear GL_COLOR_BUFFER_BIT; |
2615 | glClear GL_COLOR_BUFFER_BIT; |
2577 | |
2616 | |
2578 | my $top = int $self->{children}[1]{range}[0]; |
2617 | my $top = int $self->{children}[1]{range}[0]; |
2579 | |
2618 | |
2580 | my $y0 = $top; |
2619 | my $y0 = $top; |
… | |
… | |
2594 | my $h = $par->[1]; |
2633 | my $h = $par->[1]; |
2595 | |
2634 | |
2596 | if ($y0 < $y + $h && $y < $y1) { |
2635 | if ($y0 < $y + $h && $y < $y1) { |
2597 | $layout->set_foreground (@{ $par->[2] }); |
2636 | $layout->set_foreground (@{ $par->[2] }); |
2598 | $layout->set_width ($W - $par->[3]); |
2637 | $layout->set_width ($W - $par->[3]); |
|
|
2638 | $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); |
2599 | $layout->set_markup ($par->[4]); |
2639 | $layout->set_markup ($par->[4]); |
2600 | |
2640 | |
2601 | my ($w, $h, $data, $format, $internalformat) = $layout->render; |
2641 | my ($w, $h, $data, $format, $internalformat) = $layout->render; |
2602 | |
2642 | |
2603 | glRasterPos $par->[3], $y - $y0; |
2643 | glRasterPos $par->[3], $y - $y0; |
… | |
… | |
2615 | sub _draw { |
2655 | sub _draw { |
2616 | my ($self) = @_; |
2656 | my ($self) = @_; |
2617 | |
2657 | |
2618 | glEnable GL_TEXTURE_2D; |
2658 | glEnable GL_TEXTURE_2D; |
2619 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2659 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2620 | glColor 1, 1, 1, 1; |
2660 | glColor 0, 0, 0, 1; |
2621 | $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); |
2661 | $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); |
2622 | glDisable GL_TEXTURE_2D; |
2662 | glDisable GL_TEXTURE_2D; |
2623 | |
2663 | |
2624 | $self->{children}[1]->draw; |
2664 | $self->{children}[1]->draw; |
2625 | |
2665 | |
2626 | } |
2666 | } |
… | |
… | |
2717 | $tooltip .= "\n\n" . (ref $widget) . "\n" |
2757 | $tooltip .= "\n\n" . (ref $widget) . "\n" |
2718 | . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" |
2758 | . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" |
2719 | . "req $widget->{req_w} $widget->{req_h}\n" |
2759 | . "req $widget->{req_w} $widget->{req_h}\n" |
2720 | . "visible $widget->{visible}"; |
2760 | . "visible $widget->{visible}"; |
2721 | } |
2761 | } |
|
|
2762 | |
|
|
2763 | $tooltip =~ s/^\n+//; |
|
|
2764 | $tooltip =~ s/\n+$//; |
2722 | |
2765 | |
2723 | $self->add (new CFClient::UI::Label |
2766 | $self->add (new CFClient::UI::Label |
2724 | markup => $tooltip, |
2767 | markup => $tooltip, |
2725 | max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, |
2768 | max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, |
2726 | fontsize => 0.8, |
2769 | fontsize => 0.8, |
… | |
… | |
2754 | or return; |
2797 | or return; |
2755 | |
2798 | |
2756 | my ($x, $y) = $widget->coord2global ($widget->{w}, 0); |
2799 | my ($x, $y) = $widget->coord2global ($widget->{w}, 0); |
2757 | |
2800 | |
2758 | ($x, $y) = $widget->coord2global (-$self->{w}, 0) |
2801 | ($x, $y) = $widget->coord2global (-$self->{w}, 0) |
2759 | if $x + $self->{w} > $::WIDTH; |
2802 | if $x + $self->{w} > $self->{root}{w}; |
2760 | |
2803 | |
2761 | $self->move_abs ($x, $y); |
2804 | $self->move_abs ($x, $y); |
2762 | }); |
2805 | }); |
2763 | } |
2806 | } |
2764 | |
2807 | |
… | |
… | |
2853 | my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; |
2896 | my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; |
2854 | |
2897 | |
2855 | if ($tex) { |
2898 | if ($tex) { |
2856 | glEnable GL_TEXTURE_2D; |
2899 | glEnable GL_TEXTURE_2D; |
2857 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2900 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2858 | glColor 1, 1, 1, 1; |
2901 | glColor 0, 0, 0, 1; |
2859 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2902 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2860 | glDisable GL_TEXTURE_2D; |
2903 | glDisable GL_TEXTURE_2D; |
2861 | } |
2904 | } |
2862 | } |
2905 | } |
2863 | |
2906 | |
2864 | sub DESTROY { |
2907 | sub destroy { |
2865 | my ($self) = @_; |
2908 | my ($self) = @_; |
2866 | |
2909 | |
2867 | $self->{timer}->cancel |
2910 | $self->{timer}->cancel |
2868 | if $self->{timer}; |
2911 | if $self->{timer}; |
2869 | |
2912 | |
2870 | $self->SUPER::DESTROY; |
2913 | $self->SUPER::destroy; |
2871 | } |
2914 | } |
2872 | |
2915 | |
2873 | ############################################################################# |
2916 | ############################################################################# |
2874 | |
2917 | |
2875 | package CFClient::UI::Buttonbar; |
2918 | package CFClient::UI::Buttonbar; |
… | |
… | |
2896 | ); |
2939 | ); |
2897 | |
2940 | |
2898 | $self->add ($self->{vbox} = new CFClient::UI::VBox); |
2941 | $self->add ($self->{vbox} = new CFClient::UI::VBox); |
2899 | |
2942 | |
2900 | for my $item (@{ $self->{items} }) { |
2943 | for my $item (@{ $self->{items} }) { |
2901 | my ($widget, $cb) = @$item; |
2944 | my ($widget, $cb, $tooltip) = @$item; |
2902 | |
2945 | |
2903 | # handle various types of items, only text for now |
2946 | # handle various types of items, only text for now |
2904 | if (!ref $widget) { |
2947 | if (!ref $widget) { |
2905 | $widget = new CFClient::UI::Label |
2948 | $widget = new CFClient::UI::Label |
2906 | can_hover => 1, |
2949 | can_hover => 1, |
2907 | can_events => 1, |
2950 | can_events => 1, |
2908 | text => $widget; |
2951 | markup => $widget, |
|
|
2952 | tooltip => $tooltip |
2909 | } |
2953 | } |
2910 | |
2954 | |
2911 | $self->{item}{$widget} = $item; |
2955 | $self->{item}{$widget} = $item; |
2912 | |
2956 | |
2913 | $self->{vbox}->add ($widget); |
2957 | $self->{vbox}->add ($widget); |
… | |
… | |
3064 | $self->_emit (page_changed => $self->{multiplexer}{current}); |
3108 | $self->_emit (page_changed => $self->{multiplexer}{current}); |
3065 | } |
3109 | } |
3066 | |
3110 | |
3067 | ############################################################################# |
3111 | ############################################################################# |
3068 | |
3112 | |
3069 | package CFClient::UI::Statusbox; |
3113 | package CFClient::UI::Combobox; |
3070 | |
3114 | |
|
|
3115 | use utf8; |
|
|
3116 | |
3071 | our @ISA = CFClient::UI::VBox::; |
3117 | our @ISA = CFClient::UI::Button::; |
3072 | |
3118 | |
3073 | sub new { |
3119 | sub new { |
3074 | my $class = shift; |
3120 | my $class = shift; |
3075 | |
3121 | |
3076 | $class->SUPER::new ( |
3122 | my $self = $class->SUPER::new ( |
|
|
3123 | options => [], # [value, title, longdesc], ... |
|
|
3124 | value => undef, |
|
|
3125 | @_, |
|
|
3126 | ); |
|
|
3127 | |
|
|
3128 | $self->_set_value ($self->{value}); |
|
|
3129 | |
|
|
3130 | $self |
|
|
3131 | } |
|
|
3132 | |
|
|
3133 | sub button_down { |
|
|
3134 | my ($self, $ev) = @_; |
|
|
3135 | |
|
|
3136 | my @menu_items; |
|
|
3137 | |
|
|
3138 | for (@{ $self->{options} }) { |
|
|
3139 | my ($value, $title, $tooltip) = @$_; |
|
|
3140 | |
|
|
3141 | push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; |
|
|
3142 | } |
|
|
3143 | |
|
|
3144 | CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); |
|
|
3145 | } |
|
|
3146 | |
|
|
3147 | sub _set_value { |
|
|
3148 | my ($self, $value) = @_; |
|
|
3149 | |
|
|
3150 | my ($item) = grep $_->[0] eq $value, @{ $self->{options} } |
|
|
3151 | or return; |
|
|
3152 | |
|
|
3153 | $self->{value} = $item->[0]; |
|
|
3154 | $self->set_markup ("$item->[1] ⇓"); |
|
|
3155 | $self->set_tooltip ($item->[2]); |
|
|
3156 | } |
|
|
3157 | |
|
|
3158 | sub set_value { |
|
|
3159 | my ($self, $value) = @_; |
|
|
3160 | |
|
|
3161 | return unless $self->{value} ne $value; |
|
|
3162 | |
|
|
3163 | $self->_set_value ($value); |
|
|
3164 | $self->_emit (changed => $value); |
|
|
3165 | } |
|
|
3166 | |
|
|
3167 | ############################################################################# |
|
|
3168 | |
|
|
3169 | package CFClient::UI::Statusbox; |
|
|
3170 | |
|
|
3171 | our @ISA = CFClient::UI::VBox::; |
|
|
3172 | |
|
|
3173 | sub new { |
|
|
3174 | my $class = shift; |
|
|
3175 | |
|
|
3176 | my $self = $class->SUPER::new ( |
3077 | fontsize => 0.8, |
3177 | fontsize => 0.8, |
3078 | @_, |
3178 | @_, |
3079 | ) |
3179 | ); |
|
|
3180 | |
|
|
3181 | Scalar::Util::weaken (my $this = $self); |
|
|
3182 | |
|
|
3183 | $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); |
|
|
3184 | |
|
|
3185 | $self |
3080 | } |
3186 | } |
3081 | |
3187 | |
3082 | sub reorder { |
3188 | sub reorder { |
3083 | my ($self) = @_; |
3189 | my ($self) = @_; |
3084 | my $NOW = time; |
3190 | my $NOW = Time::HiRes::time; |
|
|
3191 | |
|
|
3192 | # freeze display when hovering over any label |
|
|
3193 | return if $CFClient::UI::TOOLTIP->{owner} |
|
|
3194 | && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, |
|
|
3195 | values %{ $self->{item} }; |
3085 | |
3196 | |
3086 | while (my ($k, $v) = each %{ $self->{item} }) { |
3197 | while (my ($k, $v) = each %{ $self->{item} }) { |
3087 | delete $self->{item}{$k} if $v->{timeout} < $NOW; |
3198 | delete $self->{item}{$k} if $v->{timeout} < $NOW; |
3088 | } |
3199 | } |
3089 | |
3200 | |
… | |
… | |
3092 | my @items = sort { |
3203 | my @items = sort { |
3093 | $a->{pri} <=> $b->{pri} |
3204 | $a->{pri} <=> $b->{pri} |
3094 | or $b->{id} <=> $a->{id} |
3205 | or $b->{id} <=> $a->{id} |
3095 | } values %{ $self->{item} }; |
3206 | } values %{ $self->{item} }; |
3096 | |
3207 | |
|
|
3208 | $self->{timer}->interval (1); |
|
|
3209 | |
3097 | my $count = 10 + 1; |
3210 | my $count = 10 + 1; |
3098 | for my $item (@items) { |
3211 | for my $item (@items) { |
3099 | last unless --$count; |
3212 | last unless --$count; |
3100 | |
3213 | |
3101 | push @widgets, $item->{label} ||= do { |
3214 | my $label = $item->{label} ||= do { |
3102 | # TODO: doesn't handle markup well (read as: at all) |
3215 | # TODO: doesn't handle markup well (read as: at all) |
3103 | my $short = $item->{count} > 1 |
3216 | my $short = $item->{count} > 1 |
3104 | ? "<b>$item->{count} ×</b> $item->{text}" |
3217 | ? "<b>$item->{count} ×</b> $item->{text}" |
3105 | : $item->{text}; |
3218 | : $item->{text}; |
3106 | |
3219 | |
… | |
… | |
3114 | tooltip => $item->{tooltip}, |
3227 | tooltip => $item->{tooltip}, |
3115 | tooltip_font => $::FONT_PROP, |
3228 | tooltip_font => $::FONT_PROP, |
3116 | tooltip_width => 0.67, |
3229 | tooltip_width => 0.67, |
3117 | fontsize => $item->{fontsize} || $self->{fontsize}, |
3230 | fontsize => $item->{fontsize} || $self->{fontsize}, |
3118 | max_w => $::WIDTH * 0.44, |
3231 | max_w => $::WIDTH * 0.44, |
3119 | fg => $item->{fg}, |
3232 | fg => [@{ $item->{fg} }], |
3120 | can_events => 1, |
3233 | can_events => 1, |
3121 | can_hover => 1 |
3234 | can_hover => 1 |
3122 | }; |
3235 | }; |
|
|
3236 | |
|
|
3237 | if ((my $diff = $item->{timeout} - $NOW) < 2) { |
|
|
3238 | $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; |
|
|
3239 | $label->update; |
|
|
3240 | $label->set_max_size (undef, $label->{req_h} * $diff) |
|
|
3241 | if $diff < 1; |
|
|
3242 | $self->{timer}->interval (1/30); |
|
|
3243 | } else { |
|
|
3244 | $label->{fg}[3] = $item->{fg}[3] || 1; |
|
|
3245 | } |
|
|
3246 | |
|
|
3247 | push @widgets, $label; |
3123 | } |
3248 | } |
3124 | |
3249 | |
3125 | $self->clear; |
3250 | $self->clear; |
3126 | $self->SUPER::add (reverse @widgets); |
3251 | $self->SUPER::add (reverse @widgets); |
3127 | } |
3252 | } |
… | |
… | |
3132 | $text =~ s/^\s+//; |
3257 | $text =~ s/^\s+//; |
3133 | $text =~ s/\s+$//; |
3258 | $text =~ s/\s+$//; |
3134 | |
3259 | |
3135 | return unless $text; |
3260 | return unless $text; |
3136 | |
3261 | |
3137 | my $timeout = time + ((delete $arg{timeout}) || 60); |
3262 | my $timeout = (int time) + ((delete $arg{timeout}) || 60); |
3138 | |
3263 | |
3139 | my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; |
3264 | my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; |
3140 | |
3265 | |
3141 | if (my $item = $self->{item}{$group}) { |
3266 | if (my $item = $self->{item}{$group}) { |
3142 | if ($item->{text} eq $text) { |
3267 | if ($item->{text} eq $text) { |
3143 | $item->{count}++; |
3268 | $item->{count}++; |
3144 | } else { |
3269 | } else { |
3145 | $item->{count} = 1; |
3270 | $item->{count} = 1; |
3146 | $item->{text} = $item->{tooltip} = $text; |
3271 | $item->{text} = $item->{tooltip} = $text; |
3147 | } |
3272 | } |
3148 | $item->{id} = ++$self->{id}; |
3273 | $item->{id} += 0.2;#d# |
3149 | $item->{timeout} = $timeout; |
3274 | $item->{timeout} = $timeout; |
3150 | delete $item->{label}; |
3275 | delete $item->{label}; |
3151 | } else { |
3276 | } else { |
3152 | $self->{item}{$group} = { |
3277 | $self->{item}{$group} = { |
3153 | id => ++$self->{id}, |
3278 | id => ++$self->{id}, |
… | |
… | |
3172 | |
3297 | |
3173 | $self->reorder; |
3298 | $self->reorder; |
3174 | $self->SUPER::reconfigure; |
3299 | $self->SUPER::reconfigure; |
3175 | } |
3300 | } |
3176 | |
3301 | |
|
|
3302 | sub destroy { |
|
|
3303 | my ($self) = @_; |
|
|
3304 | |
|
|
3305 | $self->{timer}->cancel; |
|
|
3306 | |
|
|
3307 | $self->SUPER::destroy; |
|
|
3308 | } |
|
|
3309 | |
3177 | ############################################################################# |
3310 | ############################################################################# |
3178 | |
3311 | |
3179 | package CFClient::UI::Inventory; |
3312 | package CFClient::UI::Inventory; |
3180 | |
3313 | |
3181 | our @ISA = CFClient::UI::ScrolledWindow::; |
3314 | our @ISA = CFClient::UI::ScrolledWindow::; |
… | |
… | |
3427 | commands => [], |
3560 | commands => [], |
3428 | @_, |
3561 | @_, |
3429 | ) |
3562 | ) |
3430 | } |
3563 | } |
3431 | |
3564 | |
3432 | # XXX: Do sorting? Argl... |
3565 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>"; |
|
|
3566 | |
|
|
3567 | my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip => |
|
|
3568 | "<b>Name</b>. The name of the spell.$TOOLTIP_ALL"); |
|
|
3569 | my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip => |
|
|
3570 | "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL"); |
|
|
3571 | my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => |
|
|
3572 | "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL"); |
|
|
3573 | my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => |
|
|
3574 | "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL"); |
|
|
3575 | my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => |
|
|
3576 | "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL"); |
|
|
3577 | |
|
|
3578 | sub rebuild_spell_list { |
|
|
3579 | my ($self) = @_; |
|
|
3580 | |
|
|
3581 | $CFClient::UI::ROOT->on_refresh ($self => sub { |
|
|
3582 | $self->clear; |
|
|
3583 | |
|
|
3584 | return unless $::CONN; |
|
|
3585 | |
|
|
3586 | $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME); |
|
|
3587 | $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL); |
|
|
3588 | $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); |
|
|
3589 | $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); |
|
|
3590 | $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); |
|
|
3591 | |
|
|
3592 | my $row = 0; |
|
|
3593 | |
|
|
3594 | for (sort { $a cmp $b } keys %{ $self->{spell} }) { |
|
|
3595 | my $spell = $self->{spell}{$_}; |
|
|
3596 | |
|
|
3597 | $row++; |
|
|
3598 | |
|
|
3599 | my $spell_cb = sub { |
|
|
3600 | my ($widget, $ev) = @_; |
|
|
3601 | |
|
|
3602 | if ($ev->{button} == 1) { |
|
|
3603 | $::CONN->user_send ("cast $spell->{name}"); |
|
|
3604 | } elsif ($ev->{button} == 2) { |
|
|
3605 | $::CONN->user_send ("invoke $spell->{name}"); |
|
|
3606 | } elsif ($ev->{button} == 3) { |
|
|
3607 | (new CFClient::UI::Menu |
|
|
3608 | items => [ |
|
|
3609 | ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], |
|
|
3610 | ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], |
|
|
3611 | ], |
|
|
3612 | )->popup ($ev); |
|
|
3613 | } else { |
|
|
3614 | return 0; |
|
|
3615 | } |
|
|
3616 | |
|
|
3617 | 1 |
|
|
3618 | }; |
|
|
3619 | |
|
|
3620 | my $tooltip = "$spell->{message}$TOOLTIP_ALL"; |
|
|
3621 | |
|
|
3622 | #TODO: add path info to tooltip |
|
|
3623 | #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path}); |
|
|
3624 | |
|
|
3625 | $self->add (0, $row, new CFClient::UI::Face |
|
|
3626 | face => $spell->{face}, |
|
|
3627 | can_hover => 1, |
|
|
3628 | can_events => 1, |
|
|
3629 | tooltip => $tooltip, |
|
|
3630 | on_button_down => $spell_cb, |
|
|
3631 | ); |
|
|
3632 | |
|
|
3633 | $self->add (1, $row, new CFClient::UI::Label |
|
|
3634 | expand => 1, |
|
|
3635 | text => $spell->{name}, |
|
|
3636 | can_hover => 1, |
|
|
3637 | can_events => 1, |
|
|
3638 | tooltip => $tooltip, |
|
|
3639 | on_button_down => $spell_cb, |
|
|
3640 | ); |
|
|
3641 | |
|
|
3642 | $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL); |
|
|
3643 | $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); |
|
|
3644 | $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); |
|
|
3645 | $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); |
|
|
3646 | } |
|
|
3647 | }); |
|
|
3648 | } |
|
|
3649 | |
3433 | sub add_spell { |
3650 | sub add_spell { |
3434 | my ($self, $spell) = @_; |
3651 | my ($self, $spell) = @_; |
|
|
3652 | |
3435 | $self->{spells}->{$spell->{name}} = $spell; |
3653 | $self->{spell}->{$spell->{name}} = $spell; |
3436 | |
3654 | $self->rebuild_spell_list; |
3437 | $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face |
|
|
3438 | face => $spell->{face}, |
|
|
3439 | can_hover => 1, |
|
|
3440 | can_events => 1, |
|
|
3441 | tooltip => $spell->{message}); |
|
|
3442 | |
|
|
3443 | $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label |
|
|
3444 | text => $spell->{name}, |
|
|
3445 | can_hover => 1, |
|
|
3446 | can_events => 1, |
|
|
3447 | tooltip => $spell->{message}, |
|
|
3448 | expand => 1); |
|
|
3449 | |
|
|
3450 | $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label |
|
|
3451 | text => (sprintf "lvl: %2d sp: %2d dmg: %2d", |
|
|
3452 | $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}), |
|
|
3453 | expand => 1); |
|
|
3454 | |
|
|
3455 | $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button |
|
|
3456 | text => "bind to key", |
|
|
3457 | on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); |
|
|
3458 | } |
|
|
3459 | |
|
|
3460 | sub rebuild_spell_list { |
|
|
3461 | my ($self) = @_; |
|
|
3462 | $self->{tbl_idx} = 0; |
|
|
3463 | $self->add_spell ($_) for values %{$self->{spells}}; |
|
|
3464 | } |
3655 | } |
3465 | |
3656 | |
3466 | sub remove_spell { |
3657 | sub remove_spell { |
3467 | my ($self, $spell) = @_; |
3658 | my ($self, $spell) = @_; |
|
|
3659 | |
3468 | delete $self->{spells}->{$spell->{name}}; |
3660 | delete $self->{spell}->{$spell->{name}}; |
3469 | $self->rebuild_spell_list; |
3661 | $self->rebuild_spell_list; |
3470 | } |
3662 | } |
3471 | |
3663 | |
|
|
3664 | sub clear_spells { |
|
|
3665 | my ($self) = @_; |
|
|
3666 | |
|
|
3667 | $self->{spell} = {}; |
|
|
3668 | $self->rebuild_spell_list; |
|
|
3669 | } |
|
|
3670 | |
3472 | ############################################################################# |
3671 | ############################################################################# |
3473 | |
3672 | |
3474 | package CFClient::UI::Root; |
3673 | package CFClient::UI::Root; |
3475 | |
3674 | |
3476 | our @ISA = CFClient::UI::Container::; |
3675 | our @ISA = CFClient::UI::Container::; |
|
|
3676 | |
|
|
3677 | use List::Util qw(min max); |
3477 | |
3678 | |
3478 | use CFClient::OpenGL; |
3679 | use CFClient::OpenGL; |
3479 | |
3680 | |
3480 | sub new { |
3681 | sub new { |
3481 | my $class = shift; |
3682 | my $class = shift; |
… | |
… | |
3616 | |
3817 | |
3617 | delete $queue{$widget+0}; |
3818 | delete $queue{$widget+0}; |
3618 | |
3819 | |
3619 | my ($w, $h) = $widget->size_request; |
3820 | my ($w, $h) = $widget->size_request; |
3620 | |
3821 | |
3621 | $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; |
3822 | $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; |
3622 | $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; |
3823 | $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; |
|
|
3824 | |
|
|
3825 | $w = min $widget->{max_w}, $w if exists $widget->{max_w}; |
|
|
3826 | $h = min $widget->{max_h}, $h if exists $widget->{max_h}; |
3623 | |
3827 | |
3624 | $w = $widget->{force_w} if exists $widget->{force_w}; |
3828 | $w = $widget->{force_w} if exists $widget->{force_w}; |
3625 | $h = $widget->{force_h} if exists $widget->{force_h}; |
3829 | $h = $widget->{force_h} if exists $widget->{force_h}; |
3626 | |
3830 | |
3627 | if ($widget->{req_w} != $w || $widget->{req_h} != $h |
3831 | if ($widget->{req_w} != $w || $widget->{req_h} != $h |