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.222 by root, Mon May 22 03:59:51 2006 UTC vs.
Revision 1.241 by root, Fri May 26 20:50:35 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
13our $ROOT; 14our $ROOT;
14our $TOOLTIP; 15our $TOOLTIP;
… …
50 delete $TOOLTIP->{owner}; 51 delete $TOOLTIP->{owner};
51} 52}
52 53
53# class methods for events 54# class methods for events
54sub feed_sdl_key_down_event { 55sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 56 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 57 if $FOCUS;
57} 58}
58 59
59sub feed_sdl_key_up_event { 60sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 61 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 62 if $FOCUS;
62} 63}
63 64
64sub feed_sdl_button_down_event { 65sub feed_sdl_button_down_event {
65 my ($ev) = @_; 66 my ($ev) = @_;
… …
74 check_tooltip; 75 check_tooltip;
75 } 76 }
76 77
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 78 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 79
79 if ($GRAB) { 80 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 81 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 82}
84 83
85sub feed_sdl_button_up_event { 84sub feed_sdl_button_up_event {
86 my ($ev) = @_; 85 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
88 87
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 88 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 89
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 91
93 if ($GRAB) { 92 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 93 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 94
98 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 97 $grab->update if $grab;
101 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 115
119 check_tooltip; 116 check_tooltip;
120 } 117 }
121 118
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 119 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 120 if $HOVER;
126} 121}
127 122
128# convert position array to integers 123# convert position array to integers
129sub harmonize { 124sub harmonize {
130 my ($vals) = @_; 125 my ($vals) = @_;
… …
144 139
145 $_->update 140 $_->update
146 for @widgets; 141 for @widgets;
147} 142}
148 143
144sub reconfigure_widgets {
145 # make a copy, otherwise C<for> complains about freed values.
146 my @widgets = values %WIDGET;
147
148 $_->reconfigure
149 for @widgets;
150}
151
149# call when resolution changes etc. 152# call when resolution changes etc.
150sub rescale_widgets { 153sub rescale_widgets {
151 my ($sx, $sy) = @_; 154 my ($sx, $sy) = @_;
152 155
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 156 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 157 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; 161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 } 166 }
167
168 $widget->reconfigure;
169 } 167 }
168
169 reconfigure_widgets;
170} 170}
171 171
172############################################################################# 172#############################################################################
173 173
174package CFClient::UI::Base; 174package CFClient::UI::Base;
… …
211 return if $self->{parent}; 211 return if $self->{parent};
212 212
213 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
214} 214}
215 215
216sub hide { 216sub show_centered {
217 my ($self) = @_; 217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228
229sub set_invisible {
230 my ($self) = @_;
231
232 # broken show/hide model
233
234 delete $self->{root};
235 delete $self->{visible};
218 236
219 undef $GRAB if $GRAB == $self; 237 undef $GRAB if $GRAB == $self;
220 undef $HOVER if $HOVER == $self; 238 undef $HOVER if $HOVER == $self;
239
240 CFClient::UI::check_tooltip
241 if $CFClient::UI::TOOLTIP->{owner} == $self;
242
243 $self->focus_out;
244}
245
246sub hide {
247 my ($self) = @_;
248
249 $self->set_invisible;
221 250
222 $self->{parent}->remove ($self) 251 $self->{parent}->remove ($self)
223 if $self->{parent}; 252 if $self->{parent};
224} 253}
225 254
… …
295} 324}
296 325
297sub set_tooltip { 326sub set_tooltip {
298 my ($self, $tooltip) = @_; 327 my ($self, $tooltip) = @_;
299 328
329 $tooltip =~ s/^\s+//;
330 $tooltip =~ s/\s+$//;
331
332 return if $self->{tooltip} eq $tooltip;
333
300 $self->{tooltip} = $tooltip; 334 $self->{tooltip} = $tooltip;
301 335
302 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 336 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
303 delete $CFClient::UI::TOOLTIP->{owner}; 337 delete $CFClient::UI::TOOLTIP->{owner};
304 CFClient::UI::check_tooltip; 338 CFClient::UI::check_tooltip;
… …
325 return if $FOCUS == $self; 359 return if $FOCUS == $self;
326 return unless $self->{can_focus}; 360 return unless $self->{can_focus};
327 361
328 my $focus = $FOCUS; $FOCUS = $self; 362 my $focus = $FOCUS; $FOCUS = $self;
329 363
330 $self->emit (focus_in => $focus); 364 $self->_emit (focus_in => $focus);
331 365
332 $focus->update if $focus; 366 $focus->update if $focus;
333 $FOCUS->update; 367 $FOCUS->update;
334} 368}
335 369
… …
338 372
339 return unless $FOCUS == $self; 373 return unless $FOCUS == $self;
340 374
341 my $focus = $FOCUS; undef $FOCUS; 375 my $focus = $FOCUS; undef $FOCUS;
342 376
343 $self->emit (focus_out => $focus); 377 $self->_emit (focus_out => $focus);
344 378
345 $focus->update if $focus; #? 379 $focus->update if $focus; #?
380
381 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
382 unless $FOCUS;
346} 383}
347 384
348sub mouse_motion { } 385sub mouse_motion { }
349sub button_up { } 386sub button_up { }
350sub key_down { } 387sub key_down { }
351sub key_up { } 388sub key_up { }
352 389
353sub button_down { 390sub button_down {
354 my ($self, $ev, $x, $y) = @_; 391 my ($self, $ev, $x, $y) = @_;
355 392
356 $self->focus_in; 393 $self->focus_in;
… …
390 if ($ENV{PCLIENT_DEBUG}) { 427 if ($ENV{PCLIENT_DEBUG}) {
391 glPushMatrix; 428 glPushMatrix;
392 glColor 1, 1, 0, 1; 429 glColor 1, 1, 0, 1;
393 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 430 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
394 glBegin GL_LINE_LOOP; 431 glBegin GL_LINE_LOOP;
395 glVertex 0 , 0; 432 glVertex 0 , 0;
396 glVertex $self->{w}, 0; 433 glVertex $self->{w} - 1, 0;
397 glVertex $self->{w}, $self->{h}; 434 glVertex $self->{w} - 1, $self->{h} - 1;
398 glVertex 0 , $self->{h}; 435 glVertex 0 , $self->{h} - 1;
399 glEnd; 436 glEnd;
400 glPopMatrix; 437 glPopMatrix;
401 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 438 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
402 } 439 }
403} 440}
… …
423sub set_parent { 460sub set_parent {
424 my ($self, $parent) = @_; 461 my ($self, $parent) = @_;
425 462
426 Scalar::Util::weaken ($self->{parent} = $parent); 463 Scalar::Util::weaken ($self->{parent} = $parent);
427 464
465 $self->{root} = $parent->{root};
466 $self->{visible} = $parent->{visible} + 1;
467
428 # TODO: req_w _does_change after ->reconfigure 468 # TODO: req_w _does_change after ->reconfigure
429 $self->check_size 469 $self->check_size
430 unless exists $self->{req_w}; 470 unless exists $self->{req_w};
431 471
432 $self->show; 472 $self->show;
… …
450 my ($self, $signal, $cb) = @_; 490 my ($self, $signal, $cb) = @_;
451 491
452 push @{ $self->{signal_cb}{$signal} }, $cb; 492 push @{ $self->{signal_cb}{$signal} }, $cb;
453} 493}
454 494
495sub _emit {
496 my ($self, $signal, @args) = @_;
497
498 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
499}
500
455sub emit { 501sub emit {
456 my ($self, $signal, @args) = @_; 502 my ($self, $signal, @args) = @_;
457 503
458 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 504 $self->_emit ($signal, @args)
505 || $self->$signal (@args);
459} 506}
460 507
461sub DESTROY { 508sub DESTROY {
462 my ($self) = @_; 509 my ($self) = @_;
463 510
… …
576 delete $child->{parent}; 623 delete $child->{parent};
577 $child->hide; 624 $child->hide;
578 625
579 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 626 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
580 627
581 $self->check_size; 628 $self->check_size (1);
582 $self->update; 629 $self->update;
583} 630}
584 631
585sub clear { 632sub clear {
586 my ($self) = @_; 633 my ($self) = @_;
… …
726 773
727package CFClient::UI::ViewPort; 774package CFClient::UI::ViewPort;
728 775
729our @ISA = CFClient::UI::Window::; 776our @ISA = CFClient::UI::Window::;
730 777
778sub new {
779 my $class = shift;
780
781 $class->SUPER::new (
782 scroll_x => 0,
783 scroll_y => 1,
784 @_,
785 )
786}
787
731sub size_request { 788sub size_request {
732 my ($self) = @_; 789 my ($self) = @_;
733 790
734 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 791 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
735 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
736 792
737 @$self{qw(child_w child_h)} 793 @$self{qw(child_w child_h)}
738} 794}
739 795
740sub size_allocate { 796sub size_allocate {
741 my ($self, $w, $h) = @_; 797 my ($self, $w, $h) = @_;
742 798
799 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
800 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
801
802 $self->child->configure (0, 0, $w, $h);
743 $self->update; 803 $self->update;
744} 804}
745 805
746sub set_offset { 806sub set_offset {
747 my ($self, $x, $y) = @_; 807 my ($self, $x, $y) = @_;
… …
801 861
802 my $slider = new CFClient::UI::Slider 862 my $slider = new CFClient::UI::Slider
803 vertical => 1, 863 vertical => 1,
804 range => [0, 0, 1, 0.01], # HACK fix 864 range => [0, 0, 1, 0.01], # HACK fix
805 connect_changed => sub { 865 connect_changed => sub {
806 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 866 $self->{vp}->set_offset (0, $_[1]);
807 }, 867 },
808 ; 868 ;
809 869
810 $self = $class->SUPER::new ( 870 $self = $class->SUPER::new (
811 vp => (new CFClient::UI::ViewPort expand => 1), 871 vp => (new CFClient::UI::ViewPort expand => 1),
… …
816 $self->{vp}->add ($self->{scrolled}); 876 $self->{vp}->add ($self->{scrolled});
817 $self->add ($self->{vp}); 877 $self->add ($self->{vp});
818 $self->add ($self->{slider}); 878 $self->add ($self->{slider});
819 879
820 $self 880 $self
881}
882
883sub update {
884 my ($self) = @_;
885
886 $self->SUPER::update;
887
888 # todo: overwrite size_allocate of child
889 my $child = $self->{vp}->child;
890 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
891}
892
893sub size_allocate {
894 my ($self, $w, $h) = @_;
895
896 $self->SUPER::size_allocate ($w, $h);
897
898 my $child = $self->{vp}->child;
899 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
821} 900}
822 901
823#TODO# update range on size_allocate depending on child 902#TODO# update range on size_allocate depending on child
824# update viewport offset on scroll 903# update viewport offset on scroll
825 904
… …
879 my $class = shift; 958 my $class = shift;
880 959
881 # TODO: user_x, user_y, overwrite moveto? 960 # TODO: user_x, user_y, overwrite moveto?
882 961
883 my $self = $class->SUPER::new ( 962 my $self = $class->SUPER::new (
884 bg => [1, 1, 1, 1], 963 bg => [1, 1, 1, 1],
885 border_bg => [1, 1, 1, 1], 964 border_bg => [1, 1, 1, 1],
886 border => 0.6, 965 border => 0.6,
887 toplevel => 1, 966 is_toplevel => 1,
888 can_events => 1, 967 can_events => 1,
889 @_ 968 @_
890 ); 969 );
891 970
892 $self->{title} &&= new CFClient::UI::Label 971 $self->{title} &&= new CFClient::UI::Label
893 align => 0, 972 align => 0,
… …
1033sub new { 1112sub new {
1034 my $class = shift; 1113 my $class = shift;
1035 1114
1036 $class->SUPER::new ( 1115 $class->SUPER::new (
1037 col_expand => [], 1116 col_expand => [],
1038 @_ 1117 @_,
1039 ) 1118 )
1119}
1120
1121sub children {
1122 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040} 1123}
1041 1124
1042sub add { 1125sub add {
1043 my ($self, $x, $y, $child) = @_; 1126 my ($self, $x, $y, $child) = @_;
1044 1127
1045 $child->set_parent ($self); 1128 $child->set_parent ($self);
1046 $self->{children}[$y][$x] = $child; 1129 $self->{children}[$y][$x] = $child;
1047 1130
1048 $child->check_size; 1131 $self->check_size (1);
1049} 1132}
1050 1133
1051sub children {
1052 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053}
1054
1055# TODO: move to container class maybe? send childs a signal on removal? 1134# TODO: move to container class maybe? send children a signal on removal?
1056sub clear { 1135sub clear {
1057 my ($self) = @_; 1136 my ($self) = @_;
1058 1137
1059 my @children = $self->children; 1138 my @children = $self->children;
1060 delete $self->{children}; 1139 delete $self->{children};
… …
1062 for (@children) { 1141 for (@children) {
1063 delete $_->{parent}; 1142 delete $_->{parent};
1064 $_->hide; 1143 $_->hide;
1065 } 1144 }
1066 1145
1146 $self->check_size (1);
1067 $self->update; 1147 $self->update;
1068} 1148}
1069 1149
1070sub get_wh { 1150sub get_wh {
1071 my ($self) = @_; 1151 my ($self) = @_;
… …
1103sub size_allocate { 1183sub size_allocate {
1104 my ($self, $w, $h) = @_; 1184 my ($self, $w, $h) = @_;
1105 1185
1106 my ($ws, $hs) = $self->get_wh; 1186 my ($ws, $hs) = $self->get_wh;
1107 1187
1108 my $req_w = sum @$ws; 1188 my $req_w = (sum @$ws) || 1;
1109 my $req_h = sum @$hs; 1189 my $req_h = (sum @$hs) || 1;
1110 1190
1111 # TODO: nicer code && do row_expand 1191 # TODO: nicer code && do row_expand
1112 my @col_expand = @{$self->{col_expand}}; 1192 my @col_expand = @{$self->{col_expand}};
1113 @col_expand = (1) x @$ws unless @col_expand; 1193 @col_expand = (1) x @$ws unless @col_expand;
1114 my $col_expand = (sum @col_expand) || 1; 1194 my $col_expand = (sum @col_expand) || 1;
… …
1475 active_fg => [0, 0, 0], 1555 active_fg => [0, 0, 0],
1476 can_hover => 1, 1556 can_hover => 1,
1477 can_focus => 1, 1557 can_focus => 1,
1478 valign => 0, 1558 valign => 0,
1479 can_events => 1, 1559 can_events => 1,
1560 #text => ...
1480 @_ 1561 @_
1481 ) 1562 )
1482} 1563}
1483 1564
1484sub _set_text { 1565sub _set_text {
… …
1494 $self->{text} = $text; 1575 $self->{text} = $text;
1495 1576
1496 $text =~ s/./*/g if $self->{hidden}; 1577 $text =~ s/./*/g if $self->{hidden};
1497 $self->{layout}->set_text ("$text "); 1578 $self->{layout}->set_text ("$text ");
1498 1579
1499 $self->emit (changed => $self->{text}); 1580 $self->_emit (changed => $self->{text});
1500} 1581}
1501 1582
1502sub set_text { 1583sub set_text {
1503 my ($self, $text) = @_; 1584 my ($self, $text) = @_;
1504 1585
… …
1516 my ($self) = @_; 1597 my ($self) = @_;
1517 1598
1518 my ($w, $h) = $self->SUPER::size_request; 1599 my ($w, $h) = $self->SUPER::size_request;
1519 1600
1520 ($w + 1, $h) # add 1 for cursor 1601 ($w + 1, $h) # add 1 for cursor
1521}
1522
1523sub size_allocate {
1524 my ($self, $w, $h) = @_;
1525
1526 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1527} 1602}
1528 1603
1529sub key_down { 1604sub key_down {
1530 my ($self, $ev) = @_; 1605 my ($self, $ev) = @_;
1531 1606
… …
1546 } elsif ($sym == CFClient::SDLK_HOME) { 1621 } elsif ($sym == CFClient::SDLK_HOME) {
1547 $self->{cursor} = 0; 1622 $self->{cursor} = 0;
1548 } elsif ($sym == CFClient::SDLK_END) { 1623 } elsif ($sym == CFClient::SDLK_END) {
1549 $self->{cursor} = length $text; 1624 $self->{cursor} = length $text;
1550 } elsif ($uni == 27) { 1625 } elsif ($uni == 27) {
1551 $self->emit ('escape'); 1626 $self->_emit ('escape');
1552 } elsif ($uni) { 1627 } elsif ($uni) {
1553 substr $text, $self->{cursor}++, 0, chr $uni; 1628 substr $text, $self->{cursor}++, 0, chr $uni;
1554 } 1629 }
1555 1630
1556 $self->_set_text ($text); 1631 $self->_set_text ($text);
… …
1643 if ($sym == 13) { 1718 if ($sym == 13) {
1644 unshift @{$self->{history}}, 1719 unshift @{$self->{history}},
1645 my $txt = $self->get_text; 1720 my $txt = $self->get_text;
1646 $self->{history_pointer} = -1; 1721 $self->{history_pointer} = -1;
1647 $self->{history_saveback} = ''; 1722 $self->{history_saveback} = '';
1648 $self->emit (activate => $txt); 1723 $self->_emit (activate => $txt);
1649 $self->update; 1724 $self->update;
1650 1725
1651 } elsif ($sym == CFClient::SDLK_UP) { 1726 } elsif ($sym == CFClient::SDLK_UP) {
1652 if ($self->{history_pointer} < 0) { 1727 if ($self->{history_pointer} < 0) {
1653 $self->{history_saveback} = $self->get_text; 1728 $self->{history_saveback} = $self->get_text;
… …
1701 can_events => 1, 1776 can_events => 1,
1702 @_ 1777 @_
1703 ) 1778 )
1704} 1779}
1705 1780
1781sub activate { }
1782
1706sub button_up { 1783sub button_up {
1707 my ($self, $ev, $x, $y) = @_; 1784 my ($self, $ev, $x, $y) = @_;
1708 1785
1786 $self->emit ("activate")
1709 if ($x >= 0 && $x < $self->{w} 1787 if $x >= 0 && $x < $self->{w}
1710 && $y >= 0 && $y < $self->{h}) { 1788 && $y >= 0 && $y < $self->{h};
1711 $self->emit ("activate");
1712 }
1713} 1789}
1714 1790
1715sub _draw { 1791sub _draw {
1716 my ($self) = @_; 1792 my ($self) = @_;
1717 1793
… …
1769 my ($self, $ev, $x, $y) = @_; 1845 my ($self, $ev, $x, $y) = @_;
1770 1846
1771 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1847 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1772 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1848 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1773 $self->{state} = !$self->{state}; 1849 $self->{state} = !$self->{state};
1774 $self->emit (changed => $self->{state}); 1850 $self->_emit (changed => $self->{state});
1775 } 1851 }
1776} 1852}
1777 1853
1778sub _draw { 1854sub _draw {
1779 my ($self) = @_; 1855 my ($self) = @_;
… …
2054 my $self = $class->SUPER::new ( 2130 my $self = $class->SUPER::new (
2055 fg => [1, 1, 1], 2131 fg => [1, 1, 1],
2056 active_fg => [0, 0, 0], 2132 active_fg => [0, 0, 0],
2057 bg => [0, 0, 0, 0.2], 2133 bg => [0, 0, 0, 0.2],
2058 active_bg => [1, 1, 1, 0.5], 2134 active_bg => [1, 1, 1, 0.5],
2059 range => [0, 0, 100, 10], 2135 range => [0, 0, 100, 10, 0],
2060 req_w => $::WIDTH / 80, 2136 req_w => $::WIDTH / 80,
2061 req_h => $::WIDTH / 80, 2137 req_h => $::WIDTH / 80,
2062 vertical => 0, 2138 vertical => 0,
2063 can_hover => 1, 2139 can_hover => 1,
2064 inner_pad => 0.02, 2140 inner_pad => 0.02,
… …
2069 $self->update; 2145 $self->update;
2070 2146
2071 $self 2147 $self
2072} 2148}
2073 2149
2150sub set_range {
2151 my ($self, $range) = @_;
2152
2153 ($range, $self->{range}) = ($self->{range}, $range);
2154
2155 $self->update
2156 if "@$range" ne "@{$self->{range}}";
2157}
2158
2074sub set_value { 2159sub set_value {
2075 my ($self, $value) = @_; 2160 my ($self, $value) = @_;
2076 2161
2077 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2162 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2078 2163
2079 $hi = $lo + 1 if $hi <= $lo; 2164 $hi = $lo + 1 if $hi <= $lo;
2080 2165
2166 $page = $hi - $lo if $page > $hi - $lo;
2167
2081 $value = $lo if $value < $lo; 2168 $value = $lo if $value < $lo;
2082 $value = $hi if $value > $hi; 2169 $value = $hi - $page if $value > $hi - $page;
2083 2170
2084 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2171 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2085 if $unit; 2172 if $unit;
2086 2173
2087 $page = $hi - $lo if $page > $hi - $lo;
2088
2089 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2174 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2090 2175
2091 if ($value != $old_value) { 2176 if ($value != $old_value) {
2092 $self->emit (changed => $value); 2177 $self->_emit (changed => $value);
2093 $self->update; 2178 $self->update;
2094 } 2179 }
2095} 2180}
2096 2181
2097sub size_request { 2182sub size_request {
… …
2105 2190
2106sub button_down { 2191sub button_down {
2107 my ($self, $ev, $x, $y) = @_; 2192 my ($self, $ev, $x, $y) = @_;
2108 2193
2109 $self->SUPER::button_down ($ev, $x, $y); 2194 $self->SUPER::button_down ($ev, $x, $y);
2195
2196 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2197
2110 $self->mouse_motion ($ev, $x, $y); 2198 $self->mouse_motion ($ev, $x, $y);
2111} 2199}
2112 2200
2113sub mouse_motion { 2201sub mouse_motion {
2114 my ($self, $ev, $x, $y) = @_; 2202 my ($self, $ev, $x, $y) = @_;
… …
2116 if ($GRAB == $self) { 2204 if ($GRAB == $self) {
2117 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2205 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2118 2206
2119 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2207 my (undef, $lo, $hi, $page) = @{$self->{range}};
2120 2208
2121 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2209 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2122 2210
2123 $self->set_value ($x * ($hi - $lo) + $lo); 2211 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2124 } 2212 }
2125} 2213}
2126 2214
2127sub update { 2215sub update {
2128 my ($self) = @_; 2216 my ($self) = @_;
2129 2217
2130 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2218 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2131 $self->set_value ($self->{range}[0]); 2219 $self->set_value ($self->{range}[0]);
2132 2220
2133 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2221 my ($value, $lo, $hi, $page) = @{$self->{range}};
2222 my $range = ($hi - $page - $lo) || 1e-100;
2134 2223
2135 my $inner_w = 1 - 2 * $self->{inner_pad}; 2224 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2136 2225
2137 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2226 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2227 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2138 2228
2139 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2229 $value = ($value - $lo) / $range;
2140 $value = $self->{scale} * ($value - $lo); 2230 $value = $value * $self->{scale} + $self->{offset};
2141 2231
2142 $value = $self->{inner_pad} + ($value - $page * 0.5);
2143
2144 $value = 0 if $value < 0;
2145 $page = 1 - $value if $value + $page > 1;
2146
2147 $self->{knob_x} = $value; 2232 $self->{knob_x} = $value - $knob_w * 0.5;
2148 $self->{knob_w} = $page; 2233 $self->{knob_w} = $knob_w;
2149 }); 2234 });
2150 2235
2151 $self->SUPER::update; 2236 $self->SUPER::update;
2152} 2237}
2153 2238
… …
2177 # draw handle 2262 # draw handle
2178 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2263 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2179 2264
2180 glDisable GL_TEXTURE_2D; 2265 glDisable GL_TEXTURE_2D;
2181} 2266}
2267
2268#############################################################################
2269
2270package CFClient::UI::ValSlider;
2271
2272our @ISA = CFClient::UI::HBox::;
2273
2274sub new {
2275 my ($class, %arg) = @_;
2276
2277 my $range = delete $arg{range};
2278
2279 my $self = $class->SUPER::new (
2280 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2281 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2282 to_value => sub { shift },
2283 from_value => sub { shift },
2284 %arg,
2285 );
2286
2287 $self->{slider}->connect (changed => sub {
2288 my ($self, $value) = @_;
2289 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2290 $self->{parent}->emit (changed => $value);
2291 });
2292
2293# $self->{entry}->connect (changed => sub {
2294# my ($self, $value) = @_;
2295# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2296# $self->{parent}->emit (changed => $value);
2297# });
2298
2299 $self->add ($self->{slider}, $self->{entry});
2300
2301 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2302
2303 $self
2304}
2305
2306sub set_range { shift->{slider}->set_range (@_) }
2307sub set_value { shift->{slider}->set_value (@_) }
2182 2308
2183############################################################################# 2309#############################################################################
2184 2310
2185package CFClient::UI::TextView; 2311package CFClient::UI::TextView;
2186 2312
… …
2228 $self->{layout}->set_width ($self->{children}[0]{w}); 2354 $self->{layout}->set_width ($self->{children}[0]{w});
2229 2355
2230 $self->reflow; 2356 $self->reflow;
2231} 2357}
2232 2358
2233sub text_height { 2359sub text_size {
2234 my ($self, $text, $indent) = @_; 2360 my ($self, $text, $indent) = @_;
2235 2361
2236 my $layout = $self->{layout}; 2362 my $layout = $self->{layout};
2237 2363
2238 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2364 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2239 $layout->set_width ($self->{children}[0]{w} - $indent); 2365 $layout->set_width ($self->{children}[0]{w} - $indent);
2240 $layout->set_markup ($text); 2366 $layout->set_markup ($text);
2241 2367
2242 ($layout->size)[1] 2368 $layout->size
2243} 2369}
2244 2370
2245sub reflow { 2371sub reflow {
2246 my ($self) = @_; 2372 my ($self) = @_;
2247 2373
2248 $self->{need_reflow}++; 2374 $self->{need_reflow}++;
2249 $self->update; 2375 $self->update;
2250} 2376}
2251 2377
2378sub set_offset {
2379 my ($self, $offset) = @_;
2380
2381 # todo: base offset on lines or so, not on pixels
2382 $self->{children}[1]->set_value ($offset);
2383}
2384
2385sub clear {
2386 my ($self) = @_;
2387
2388 $self->{par} = [];
2389 $self->{height} = 0;
2390 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2391}
2392
2252sub add_paragraph { 2393sub add_paragraph {
2253 my ($self, $color, $text, $indent) = @_; 2394 my ($self, $color, $text, $indent) = @_;
2254 2395
2255 #TODO: intelligently "reformat" paragraph
2256
2257 for my $line (split /\n/, $text) { 2396 for my $line (split /\n/, $text) {
2258 my $height = $self->text_height ($line); 2397 my ($w, $h) = $self->text_size ($line);
2259 $self->{height} += $height; 2398 $self->{height} += $h;
2260 push @{$self->{par}}, [$height, $color, $indent, $line]; 2399 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2261 } 2400 }
2262 2401
2263 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2402 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2264 $self->{children}[1]->update;
2265} 2403}
2266 2404
2267sub update { 2405sub update {
2268 my ($self) = @_; 2406 my ($self) = @_;
2269 2407
… …
2272 return unless $self->{h} > 0; 2410 return unless $self->{h} > 0;
2273 2411
2274 delete $self->{texture}; 2412 delete $self->{texture};
2275 2413
2276 $ROOT->on_post_alloc ($self, sub { 2414 $ROOT->on_post_alloc ($self, sub {
2415 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2416
2277 if (delete $self->{need_reflow}) { 2417 if (delete $self->{need_reflow}) {
2278 my $height = 0; 2418 my $height = 0;
2279 2419
2280 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2420 my $layout = $self->{layout};
2421
2422 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2423
2281 for @{$self->{par}}; 2424 for (@{$self->{par}}) {
2425 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2426 $layout->set_width ($W - $_->[3]);
2427 $layout->set_markup ($_->[4]);
2428 my ($w, $h) = $layout->size;
2429 $_->[0] = $w + $_->[3];
2430 $_->[1] = $h;
2431 }
2432
2433 $height += $_->[1];
2434 }
2282 2435
2283 $self->{height} = $height; 2436 $self->{height} = $height;
2284 2437
2285 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2438 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2286 $self->{children}[1]->update;
2287 2439
2288 delete $self->{texture}; 2440 delete $self->{texture};
2289 } 2441 }
2290 2442
2291 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2443 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2292 glClearColor 0.5, 0.5, 0.5, 0; 2444 glClearColor 0.5, 0.5, 0.5, 0;
2293 glClear GL_COLOR_BUFFER_BIT; 2445 glClear GL_COLOR_BUFFER_BIT;
2294 2446
2295 my $top = int $self->{children}[1]{range}[0]; 2447 my $top = int $self->{children}[1]{range}[0];
2296 2448
2297 my $y0 = $top; 2449 my $y0 = $top;
2298 my $y1 = $top + $self->{h}; 2450 my $y1 = $top + $H;
2299 2451
2300 my $y = 0; 2452 my $y = 0;
2301 2453
2302 my $layout = $self->{layout}; 2454 my $layout = $self->{layout};
2303 2455
2304 $layout->set_font ($self->{font}) if $self->{font}; 2456 $layout->set_font ($self->{font}) if $self->{font};
2305 2457
2306 glEnable GL_BLEND; 2458 glEnable GL_BLEND;
2459 #TODO# not correct in windows where rgba is forced off
2307 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2460 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2308 2461
2309 for my $par (@{$self->{par}}) { 2462 for my $par (@{$self->{par}}) {
2310 my $h = $par->[0]; 2463 my $h = $par->[1];
2311 2464
2312 if ($y0 < $y + $h && $y < $y1) { 2465 if ($y0 < $y + $h && $y < $y1) {
2313 $layout->set_foreground (@{ $par->[1] }); 2466 $layout->set_foreground (@{ $par->[2] });
2314 $layout->set_width ($self->{w} - $par->[2]); 2467 $layout->set_width ($W - $par->[3]);
2315 $layout->set_markup ($par->[3]); 2468 $layout->set_markup ($par->[4]);
2316 2469
2317 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2470 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2318 2471
2319 glRasterPos $par->[2], $y - $y0; 2472 glRasterPos $par->[3], $y - $y0;
2320 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2473 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2321 } 2474 }
2322 2475
2323 $y += $h; 2476 $y += $h;
2324 } 2477 }
… …
2411 2564
2412 # TODO: use animation 2565 # TODO: use animation
2413 if ($self->{state} = !$self->{state}) { 2566 if ($self->{state} = !$self->{state}) {
2414 $CFClient::UI::ROOT->add ($self->{other}); 2567 $CFClient::UI::ROOT->add ($self->{other});
2415 $self->{other}->move ($self->coord2global (0, $self->{h})); 2568 $self->{other}->move ($self->coord2global (0, $self->{h}));
2416 $self->emit ("open"); 2569 $self->_emit ("open");
2417 } else { 2570 } else {
2418 $CFClient::UI::ROOT->remove ($self->{other}); 2571 $CFClient::UI::ROOT->remove ($self->{other});
2419 $self->emit ("close"); 2572 $self->_emit ("close");
2420 } 2573 }
2421 2574
2422 $self->emit (changed => $self->{state}); 2575 $self->_emit (changed => $self->{state});
2423} 2576}
2424 2577
2425############################################################################# 2578#############################################################################
2426 2579
2427package CFClient::UI::Tooltip; 2580package CFClient::UI::Tooltip;
… …
2503 2656
2504sub new { 2657sub new {
2505 my $class = shift; 2658 my $class = shift;
2506 2659
2507 my $self = $class->SUPER::new ( 2660 my $self = $class->SUPER::new (
2508 aspect => 1, 2661 aspect => 1,
2662 can_events => 0,
2509 @_, 2663 @_,
2510 ); 2664 );
2511 2665
2512 if ($self->{anim} && $self->{animspeed}) { 2666 if ($self->{anim} && $self->{animspeed}) {
2513 Scalar::Util::weaken (my $widget = $self); 2667 Scalar::Util::weaken (my $widget = $self);
… …
2539} 2693}
2540 2694
2541sub _draw { 2695sub _draw {
2542 my ($self) = @_; 2696 my ($self) = @_;
2543 2697
2544 return unless $::CONN;#d# manage and cache textures differently 2698 return unless $::CONN;
2545 2699
2546 my $face; 2700 my $face;
2547 2701
2548 if ($self->{frame}) { 2702 if ($self->{frame}) {
2549 my $anim = $::CONN->{anim}[$self->{anim}]; 2703 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2572 $self->SUPER::DESTROY; 2726 $self->SUPER::DESTROY;
2573} 2727}
2574 2728
2575############################################################################# 2729#############################################################################
2576 2730
2577package CFClient::UI::InventoryItem; 2731package CFClient::UI::Inventory;
2578 2732
2579our @ISA = CFClient::UI::HBox::; 2733our @ISA = CFClient::UI::ScrolledWindow::;
2580
2581sub _item_to_desc {
2582 my ($item) = @_;
2583
2584 my $desc =
2585 $item->{nrof} < 2
2586 ? $item->{name}
2587 : "$item->{nrof} × $item->{name_pl}";
2588
2589 $item->{flags} & Crossfire::Protocol::F_OPEN
2590 and $desc .= " (open)";
2591 $item->{flags} & Crossfire::Protocol::F_APPLIED
2592 and $desc .= " (applied)";
2593 $item->{flags} & Crossfire::Protocol::F_UNPAID
2594 and $desc .= " (unpaid)";
2595 $item->{flags} & Crossfire::Protocol::F_MAGIC
2596 and $desc .= " (magic)";
2597 $item->{flags} & Crossfire::Protocol::F_CURSED
2598 and $desc .= " (cursed)";
2599 $item->{flags} & Crossfire::Protocol::F_DAMNED
2600 and $desc .= " (damned)";
2601 $item->{flags} & Crossfire::Protocol::F_LOCKED
2602 and $desc .= " *";
2603
2604 $desc
2605}
2606 2734
2607sub new { 2735sub new {
2608 my $class = shift; 2736 my $class = shift;
2609 2737
2610 my %args = @_;
2611
2612 my $item = delete $args{item};
2613
2614 my $desc = _item_to_desc ($item);
2615
2616 my $self = $class->SUPER::new ( 2738 my $self = $class->SUPER::new (
2617 can_hover => 1, 2739 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2618 can_events => 1,
2619 tooltip => ((CFClient::UI::Label::escape $desc)
2620 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2621 connect_button_down => sub {
2622 my ($self, $ev, $x, $y) = @_;
2623
2624 # todo: maybe put examine on 1? but should just be a tooltip :(
2625 if ($ev->{button} == 1) {
2626 my $targ = $::CONN->{player}{tag};
2627
2628 if ($item->{container} == $::CONN->{player}{tag}) {
2629 $targ = $main::OPENCONT;
2630 }
2631
2632 $::CONN->send ("move $targ $item->{tag} 0");
2633 } elsif ($ev->{button} == 2) {
2634 $::CONN->send ("apply $item->{tag}");
2635 } elsif ($ev->{button} == 3) {
2636 my @menu_items = (
2637 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2638 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2639 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2640 (
2641 $item->{flags} & Crossfire::Protocol::F_LOCKED
2642 ? (
2643 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2644 )
2645 : (
2646 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2647 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2648 )
2649 ),
2650 );
2651
2652 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2653 }
2654
2655 1
2656 },
2657 %args
2658 );
2659
2660
2661 $self->add (new CFClient::UI::Face
2662 can_events => 0,
2663 face => $item->{face},
2664 anim => $item->{anim},
2665 animspeed => $item->{animspeed},
2666 );
2667
2668 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2669
2670 $self->{item} = $item;
2671
2672 $self->update_item;
2673
2674 $self
2675}
2676
2677sub update_item {
2678 my ($self) = @_;
2679
2680 my $desc = _item_to_desc ($self->{item});
2681
2682 $self->{name_lbl}->set_text ($desc);
2683}
2684
2685#############################################################################
2686
2687package CFClient::UI::Inventory;
2688
2689our @ISA = CFClient::UI::ScrolledWindow::;
2690
2691sub new {
2692 my $class = shift;
2693
2694 my $self = $class->SUPER::new (
2695 scrolled => (new CFClient::UI::VBox),
2696 @_, 2740 @_,
2697 ); 2741 );
2698 2742
2699 $self 2743 $self
2700} 2744}
… …
2710 or ($a->{name} cmp $b->{name}) 2754 or ($a->{name} cmp $b->{name})
2711 } @$items; 2755 } @$items;
2712 2756
2713 $self->{real_items} = \@items; 2757 $self->{real_items} = \@items;
2714 2758
2759 my $row = 0;
2715 for my $item (@items) { 2760 for my $item (@items) {
2716 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2761 CFClient::Item::update_widgets $item;
2717 $item->update_item ();
2718 }
2719 2762
2720 $self->{scrolled}->add (@items); 2763 $self->{scrolled}->add (0, $row, $item->{face_widget});
2764 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2765 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2721 2766
2722# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2767 $row++;
2768 }
2723} 2769}
2724 2770
2725sub size_request { 2771sub size_request {
2726 my ($self) = @_; 2772 my ($self) = @_;
2727 ($self->{req_w}, $self->{req_h}); 2773 ($self->{req_w}, $self->{req_h});
… …
2767 2813
2768# popup given the event (must be a mouse button down event currently) 2814# popup given the event (must be a mouse button down event currently)
2769sub popup { 2815sub popup {
2770 my ($self, $ev) = @_; 2816 my ($self, $ev) = @_;
2771 2817
2772 $self->emit ("popdown"); 2818 $self->_emit ("popdown");
2773 2819
2774 # maybe save $GRAB? must be careful about events... 2820 # maybe save $GRAB? must be careful about events...
2775 $GRAB = $self; 2821 $GRAB = $self;
2776 $self->{button} = $ev->{button}; 2822 $self->{button} = $ev->{button};
2777 2823
… …
2792 2838
2793 if ($ev->{button} == $self->{button}) { 2839 if ($ev->{button} == $self->{button}) {
2794 undef $GRAB; 2840 undef $GRAB;
2795 $self->hide; 2841 $self->hide;
2796 2842
2797 $self->emit ("popdown"); 2843 $self->_emit ("popdown");
2798 $self->{hover}[1]->() if $self->{hover}; 2844 $self->{hover}[1]->() if $self->{hover};
2799 } 2845 }
2800} 2846}
2801 2847
2802############################################################################# 2848#############################################################################
… …
2864sub add { 2910sub add {
2865 my ($self, $text, %arg) = @_; 2911 my ($self, $text, %arg) = @_;
2866 2912
2867 $text =~ s/^\s+//; 2913 $text =~ s/^\s+//;
2868 $text =~ s/\s+$//; 2914 $text =~ s/\s+$//;
2915
2916 return unless $text;
2869 2917
2870 my $timeout = time + ((delete $arg{timeout}) || 60); 2918 my $timeout = time + ((delete $arg{timeout}) || 60);
2871 2919
2872 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2920 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2873 2921
… …
2917 2965
2918sub new { 2966sub new {
2919 my $class = shift; 2967 my $class = shift;
2920 2968
2921 $class->SUPER::new ( 2969 $class->SUPER::new (
2970 visible => 1,
2922 @_, 2971 @_,
2923 ) 2972 )
2924} 2973}
2925 2974
2926sub configure { 2975sub configure {
… …
2944} 2993}
2945 2994
2946sub size_allocate { 2995sub size_allocate {
2947 my ($self, $w, $h) = @_; 2996 my ($self, $w, $h) = @_;
2948 2997
2949 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2950 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2951
2952 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2953 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2954
2955 for my $child ($self->children) { 2998 for my $child ($self->children) {
2956 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2999 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2957 3000
2958 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3001 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2959 if exists $child->{req_x}; 3002 if exists $child->{req_x};
… …
2988} 3031}
2989 3032
2990sub add { 3033sub add {
2991 my ($self, @children) = @_; 3034 my ($self, @children) = @_;
2992 3035
3036 for (my @widgets = @children; my $w = pop @widgets; ) {
3037 push @widgets, $w->children;
3038 $w->{root} = $self;
3039 $w->{visible} = $self->{visible} + 1;
3040 }
3041
2993 for my $child (@children) { 3042 for my $child (@children) {
2994 $child->{toplevel} = 1; 3043 $child->{is_toplevel} = 1;
2995 3044
2996 # integerise window positions 3045 # integerise window positions
2997 $child->{x} = int $child->{x}; 3046 $child->{x} = int $child->{x};
2998 $child->{y} = int $child->{y}; 3047 $child->{y} = int $child->{y};
2999 } 3048 }
3000 3049
3001 $self->SUPER::add (@children); 3050 $self->SUPER::add (@children);
3051}
3052
3053sub remove {
3054 my ($self, @children) = @_;
3055
3056 $self->SUPER::remove (@children);
3002 3057
3003 while (@children) { 3058 while (@children) {
3004 my $w = pop @children; 3059 my $w = pop @children;
3005 push @children, $w->children; 3060 push @children, $w->children;
3006 $w->{visible} = 1; 3061 $w->set_invisible;
3007 }
3008}
3009
3010sub remove {
3011 my ($self, @children) = @_;
3012
3013 $self->SUPER::remove (@children);
3014
3015 while (@children) {
3016 my $w = pop @children;
3017 push @children, $w->children;
3018 delete $w->{visible};
3019 } 3062 }
3020} 3063}
3021 3064
3022sub on_refresh { 3065sub on_refresh {
3023 my ($self, $id, $cb) = @_; 3066 my ($self, $id, $cb) = @_;
… …
3077 $w = 0 if $w < 0; 3120 $w = 0 if $w < 0;
3078 $h = 0 if $h < 0; 3121 $h = 0 if $h < 0;
3079 3122
3080 $widget->{w} = $w; 3123 $widget->{w} = $w;
3081 $widget->{h} = $h; 3124 $widget->{h} = $h;
3082 $widget->size_allocate ($w, $h);
3083 $widget->emit (size_allocate => $w, $h); 3125 $widget->emit (size_allocate => $w, $h);
3084 } 3126 }
3085 } 3127 }
3086 3128
3087 while ($self->{post_alloc_hook}) { 3129 while ($self->{post_alloc_hook}) {

Diff Legend

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