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.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.243 by root, Sat May 27 20:46:54 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
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
18 38
19sub check_tooltip { 39sub check_tooltip {
20 if (!$GRAB) { 40 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
50 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
74 check_tooltip; 94 check_tooltip;
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 check_tooltip;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
136 $rem += $_ - $i; 150 $rem += $_ - $i;
137 $_ = $i; 151 $_ = $i;
138 } 152 }
139} 153}
140 154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
141# call when resolution changes etc. 171# call when resolution changes etc.
142sub rescale_widgets { 172sub rescale_widgets {
143 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
144 174
145 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) { 176 if ($widget->{is_toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; 180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 181 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 183 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155 } 185 }
156
157 $widget->reconfigure;
158 } 186 }
187
188 reconfigure_widgets;
159} 189}
160 190
161############################################################################# 191#############################################################################
162 192
163package CFClient::UI::Base; 193package CFClient::UI::Base;
… …
176 can_events => 1, 206 can_events => 1,
177 @_ 207 @_
178 }, $class; 208 }, $class;
179 209
180 for (keys %$self) { 210 for (keys %$self) {
181 if (/^connect_(.*)$/) { 211 if (/^on_(.*)$/) {
182 $self->connect ($1 => delete $self->{$_}); 212 $self->connect ($1 => delete $self->{$_});
183 } 213 }
184 } 214 }
185 215
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187 217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 }
224
188 $self 225 $self
189} 226}
190 227
191sub destroy { 228sub destroy {
192 my ($self) = @_; 229 my ($self) = @_;
… …
195 %$self = (); 232 %$self = ();
196} 233}
197 234
198sub show { 235sub show {
199 my ($self) = @_; 236 my ($self) = @_;
200
201 return if $self->{parent}; 237 return if $self->{parent};
202 238
203 $CFClient::UI::ROOT->add ($self); 239 $CFClient::UI::ROOT->add ($self);
204} 240}
205 241
206sub hide { 242sub show_centered {
207 my ($self) = @_; 243 my ($self) = @_;
244 return if $self->{parent};
245
246 $self->show;
247
248 $CFClient::UI::ROOT->on_post_alloc (
249 "centered $self" => sub {
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
251 },
252 );
253}
254
255sub set_invisible {
256 my ($self) = @_;
257
258 # broken show/hide model
259
260 delete $self->{root};
261 delete $self->{visible};
208 262
209 undef $GRAB if $GRAB == $self; 263 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self; 264 undef $HOVER if $HOVER == $self;
265
266 CFClient::UI::check_tooltip
267 if $CFClient::UI::TOOLTIP->{owner} == $self;
268
269 $self->focus_out;
270}
271
272sub hide {
273 my ($self) = @_;
274
275 $self->set_invisible;
211 276
212 $self->{parent}->remove ($self) 277 $self->{parent}->remove ($self)
213 if $self->{parent}; 278 if $self->{parent};
214} 279}
215 280
… …
282 347
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 348 delete $self->{max_w}; $self->{max_w} = $w if $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 349 delete $self->{max_h}; $self->{max_h} = $h if $h;
285} 350}
286 351
352sub set_tooltip {
353 my ($self, $tooltip) = @_;
354
355 $tooltip =~ s/^\s+//;
356 $tooltip =~ s/\s+$//;
357
358 return if $self->{tooltip} eq $tooltip;
359
360 $self->{tooltip} = $tooltip;
361
362 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
363 delete $CFClient::UI::TOOLTIP->{owner};
364 CFClient::UI::check_tooltip;
365 }
366}
367
287# translate global coordinates to local coordinate system 368# translate global coordinates to local coordinate system
288sub coord2local { 369sub coord2local {
289 my ($self, $x, $y) = @_; 370 my ($self, $x, $y) = @_;
290 371
291 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 372 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
… …
304 return if $FOCUS == $self; 385 return if $FOCUS == $self;
305 return unless $self->{can_focus}; 386 return unless $self->{can_focus};
306 387
307 my $focus = $FOCUS; $FOCUS = $self; 388 my $focus = $FOCUS; $FOCUS = $self;
308 389
309 $self->emit (focus_in => $focus); 390 $self->_emit (focus_in => $focus);
310 391
311 $focus->update if $focus; 392 $focus->update if $focus;
312 $FOCUS->update; 393 $FOCUS->update;
313} 394}
314 395
… …
317 398
318 return unless $FOCUS == $self; 399 return unless $FOCUS == $self;
319 400
320 my $focus = $FOCUS; undef $FOCUS; 401 my $focus = $FOCUS; undef $FOCUS;
321 402
322 $self->emit (focus_out => $focus); 403 $self->_emit (focus_out => $focus);
323 404
324 $focus->update if $focus; #? 405 $focus->update if $focus; #?
406
407 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
408 unless $FOCUS;
325} 409}
326 410
327sub mouse_motion { } 411sub mouse_motion { }
328sub button_up { } 412sub button_up { }
329sub key_down { } 413sub key_down { }
330sub key_up { } 414sub key_up { }
331 415
332sub button_down { 416sub button_down {
333 my ($self, $ev, $x, $y) = @_; 417 my ($self, $ev, $x, $y) = @_;
334 418
335 $self->focus_in; 419 $self->focus_in;
… …
369 if ($ENV{PCLIENT_DEBUG}) { 453 if ($ENV{PCLIENT_DEBUG}) {
370 glPushMatrix; 454 glPushMatrix;
371 glColor 1, 1, 0, 1; 455 glColor 1, 1, 0, 1;
372 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373 glBegin GL_LINE_LOOP; 457 glBegin GL_LINE_LOOP;
374 glVertex 0 , 0; 458 glVertex 0 , 0;
375 glVertex $self->{w}, 0; 459 glVertex $self->{w} - 1, 0;
376 glVertex $self->{w}, $self->{h}; 460 glVertex $self->{w} - 1, $self->{h} - 1;
377 glVertex 0 , $self->{h}; 461 glVertex 0 , $self->{h} - 1;
378 glEnd; 462 glEnd;
379 glPopMatrix; 463 glPopMatrix;
380 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 464 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
381 } 465 }
382} 466}
… …
402sub set_parent { 486sub set_parent {
403 my ($self, $parent) = @_; 487 my ($self, $parent) = @_;
404 488
405 Scalar::Util::weaken ($self->{parent} = $parent); 489 Scalar::Util::weaken ($self->{parent} = $parent);
406 490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
407 # TODO: req_w _does_change after ->reconfigure 494 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size 495 $self->check_size
409 unless exists $self->{req_w}; 496 unless exists $self->{req_w};
497
498 $self->show;
410} 499}
411 500
412sub check_size { 501sub check_size {
413 my ($self, $forced) = @_; 502 my ($self, $forced) = @_;
414 503
… …
427 my ($self, $signal, $cb) = @_; 516 my ($self, $signal, $cb) = @_;
428 517
429 push @{ $self->{signal_cb}{$signal} }, $cb; 518 push @{ $self->{signal_cb}{$signal} }, $cb;
430} 519}
431 520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
432sub emit { 527sub emit {
433 my ($self, $signal, @args) = @_; 528 my ($self, $signal, @args) = @_;
434 529
435 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
436} 532}
437 533
438sub DESTROY { 534sub DESTROY {
439 my ($self) = @_; 535 my ($self) = @_;
440 536
… …
455 my $class = shift; 551 my $class = shift;
456 552
457 # range [value, low, high, page] 553 # range [value, low, high, page]
458 554
459 $class->SUPER::new ( 555 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 556 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 557 #active_bg => [1, 1, 1, 0.5],
462 @_ 558 @_
463 ) 559 )
464} 560}
465 561
466sub _draw { 562sub _draw {
467 my ($self) = @_; 563 my ($self) = @_;
468 564
565 my $color = $FOCUS == $self && $self->{active_bg}
566 ? $self->{active_bg}
567 : $self->{bg};
568
569 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 570 my ($w, $h) = @$self{qw(w h)};
470 571
471 glEnable GL_BLEND; 572 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 574 glColor @$color;
474 575
475 glBegin GL_QUADS; 576 glBegin GL_QUADS;
476 glVertex 0 , 0; 577 glVertex 0 , 0;
477 glVertex 0 , $h; 578 glVertex 0 , $h;
478 glVertex $w, $h; 579 glVertex $w, $h;
479 glVertex $w, 0; 580 glVertex $w, 0;
480 glEnd; 581 glEnd;
481 582
482 glDisable GL_BLEND; 583 glDisable GL_BLEND;
584 }
483} 585}
484 586
485############################################################################# 587#############################################################################
486 588
487package CFClient::UI::Empty; 589package CFClient::UI::Empty;
… …
547 delete $child->{parent}; 649 delete $child->{parent};
548 $child->hide; 650 $child->hide;
549 651
550 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
551 653
552 $self->check_size; 654 $self->check_size (1);
553 $self->update; 655 $self->update;
554} 656}
555 657
556sub clear { 658sub clear {
557 my ($self) = @_; 659 my ($self) = @_;
… …
671 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 773 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672 glClearColor 0, 0, 0, 0; 774 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT; 775 glClear GL_COLOR_BUFFER_BIT;
674 776
675 $self->_render; 777 $self->_render;
676# glColorMask 1, 1, 1, 0;
677# glEnable GL_BLEND;
678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679# glRasterPos 0, 0;
680# glCopyPixels 0, 0, $self->{w}, $self->{h};
681# glDisable GL_BLEND;
682# glColorMask 1, 1, 1, 1;
683 }; 778 };
684} 779}
685 780
686sub _draw { 781sub _draw {
687 my ($self) = @_; 782 my ($self) = @_;
… …
691 my $tex = $self->{texture} 786 my $tex = $self->{texture}
692 or return; 787 or return;
693 788
694 glEnable GL_TEXTURE_2D; 789 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 790 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 791 glColor 1, 1, 1, 1;
697 792
698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 793 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 794
700 glDisable GL_TEXTURE_2D; 795 glDisable GL_TEXTURE_2D;
701} 796}
… …
704 799
705package CFClient::UI::ViewPort; 800package CFClient::UI::ViewPort;
706 801
707our @ISA = CFClient::UI::Window::; 802our @ISA = CFClient::UI::Window::;
708 803
804sub new {
805 my $class = shift;
806
807 $class->SUPER::new (
808 scroll_x => 0,
809 scroll_y => 1,
810 @_,
811 )
812}
813
709sub size_request { 814sub size_request {
710 my ($self) = @_; 815 my ($self) = @_;
711 816
712 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
714 818
715 @$self{qw(child_w child_h)} 819 @$self{qw(child_w child_h)}
716} 820}
717 821
718sub size_allocate { 822sub size_allocate {
719 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
720 824
825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
827
828 $self->child->configure (0, 0, $w, $h);
721 $self->update; 829 $self->update;
722} 830}
723 831
724sub set_offset { 832sub set_offset {
725 my ($self, $x, $y) = @_; 833 my ($self, $x, $y) = @_;
… …
776 my $class = shift; 884 my $class = shift;
777 885
778 my $self; 886 my $self;
779 887
780 my $slider = new CFClient::UI::Slider 888 my $slider = new CFClient::UI::Slider
781 vertical => 1, 889 vertical => 1,
782 range => [0, 0, 1, 0.01], # HACK fix 890 range => [0, 0, 1, 0.01], # HACK fix
783 connect_changed => sub { 891 on_changed => sub {
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 892 $self->{vp}->set_offset (0, $_[1]);
785 }, 893 },
786 ; 894 ;
787 895
788 $self = $class->SUPER::new ( 896 $self = $class->SUPER::new (
789 vp => (new CFClient::UI::ViewPort), 897 vp => (new CFClient::UI::ViewPort expand => 1),
790 slider => $slider, 898 slider => $slider,
791 @_, 899 @_,
792 ); 900 );
793 901
794 $self->{vp}->add ($self->{scrolled}); 902 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp}); 903 $self->add ($self->{vp});
796 $self->add ($self->{slider}); 904 $self->add ($self->{slider});
797 905
798 $self 906 $self
907}
908
909sub update {
910 my ($self) = @_;
911
912 $self->SUPER::update;
913
914 # todo: overwrite size_allocate of child
915 my $child = $self->{vp}->child;
916 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
917}
918
919sub size_allocate {
920 my ($self, $w, $h) = @_;
921
922 $self->SUPER::size_allocate ($w, $h);
923
924 my $child = $self->{vp}->child;
925 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
799} 926}
800 927
801#TODO# update range on size_allocate depending on child 928#TODO# update range on size_allocate depending on child
802# update viewport offset on scroll 929# update viewport offset on scroll
803 930
… …
857 my $class = shift; 984 my $class = shift;
858 985
859 # TODO: user_x, user_y, overwrite moveto? 986 # TODO: user_x, user_y, overwrite moveto?
860 987
861 my $self = $class->SUPER::new ( 988 my $self = $class->SUPER::new (
862 bg => [1, 1, 1, 1], 989 bg => [1, 1, 1, 1],
863 border_bg => [1, 1, 1, 1], 990 border_bg => [1, 1, 1, 1],
864 border => 0.6, 991 border => 0.6,
865 toplevel => 1, 992 is_toplevel => 1,
866 can_events => 1, 993 can_events => 1,
867 @_ 994 @_
868 ); 995 );
869 996
870 $self->{title} &&= new CFClient::UI::Label 997 $self->{title} &&= new CFClient::UI::Label
871 align => 0, 998 align => 0,
… …
924 my ($ev, $x, $y) = @_; 1051 my ($ev, $x, $y) = @_;
925 1052
926 my $dx = $ev->{x} - $ox; 1053 my $dx = $ev->{x} - $ox;
927 my $dy = $ev->{y} - $oy; 1054 my $dy = $ev->{y} - $oy;
928 1055
1056 $self->{user_x} = $wx + $dx * $mx;
1057 $self->{user_y} = $wy + $dy * $my;
929 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
930 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
931 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1060 $self->move ($self->{user_x}, $self->{user_y});
932 $self->check_size; 1061 $self->check_size;
933 }; 1062 };
934 1063
935 } elsif ($lr ^ $td) { 1064 } elsif ($lr ^ $td) {
936 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1065 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
939 $self->{motion} = sub { 1068 $self->{motion} = sub {
940 my ($ev, $x, $y) = @_; 1069 my ($ev, $x, $y) = @_;
941 1070
942 ($x, $y) = ($ev->{x}, $ev->{y}); 1071 ($x, $y) = ($ev->{x}, $ev->{y});
943 1072
944 $self->move ($bx + $x - $ox, $by + $y - $oy); 1073 $self->{user_x} = $bx + $x - $ox;
1074 $self->{user_y} = $by + $y - $oy;
1075 $self->move ($self->{user_x}, $self->{user_y});
945 $self->update; 1076 $self->update;
946 }; 1077 };
947 } 1078 }
948} 1079}
949 1080
… …
1011sub new { 1142sub new {
1012 my $class = shift; 1143 my $class = shift;
1013 1144
1014 $class->SUPER::new ( 1145 $class->SUPER::new (
1015 col_expand => [], 1146 col_expand => [],
1016 @_ 1147 @_,
1017 ) 1148 )
1149}
1150
1151sub children {
1152 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018} 1153}
1019 1154
1020sub add { 1155sub add {
1021 my ($self, $x, $y, $child) = @_; 1156 my ($self, $x, $y, $child) = @_;
1022 1157
1023 $child->set_parent ($self); 1158 $child->set_parent ($self);
1024 $self->{children}[$y][$x] = $child; 1159 $self->{children}[$y][$x] = $child;
1025 1160
1026 $child->check_size; 1161 $self->check_size (1);
1027} 1162}
1028 1163
1029sub children {
1030 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031}
1032
1033# TODO: move to container class maybe? send childs a signal on removal? 1164# TODO: move to container class maybe? send children a signal on removal?
1034sub clear { 1165sub clear {
1035 my ($self) = @_; 1166 my ($self) = @_;
1036 1167
1037 my @children = $self->children; 1168 my @children = $self->children;
1038 delete $self->{children}; 1169 delete $self->{children};
… …
1040 for (@children) { 1171 for (@children) {
1041 delete $_->{parent}; 1172 delete $_->{parent};
1042 $_->hide; 1173 $_->hide;
1043 } 1174 }
1044 1175
1176 $self->check_size (1);
1045 $self->update; 1177 $self->update;
1046} 1178}
1047 1179
1048sub get_wh { 1180sub get_wh {
1049 my ($self) = @_; 1181 my ($self) = @_;
… …
1081sub size_allocate { 1213sub size_allocate {
1082 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1083 1215
1084 my ($ws, $hs) = $self->get_wh; 1216 my ($ws, $hs) = $self->get_wh;
1085 1217
1086 my $req_w = sum @$ws; 1218 my $req_w = (sum @$ws) || 1;
1087 my $req_h = sum @$hs; 1219 my $req_h = (sum @$hs) || 1;
1088 1220
1089 # TODO: nicer code && do row_expand 1221 # TODO: nicer code && do row_expand
1090 my @col_expand = @{$self->{col_expand}}; 1222 my @col_expand = @{$self->{col_expand}};
1091 @col_expand = (1) x @$ws unless @col_expand; 1223 @col_expand = (1) x @$ws unless @col_expand;
1092 my $col_expand = (sum @col_expand) || 1; 1224 my $col_expand = (sum @col_expand) || 1;
… …
1266 1398
1267############################################################################# 1399#############################################################################
1268 1400
1269package CFClient::UI::Label; 1401package CFClient::UI::Label;
1270 1402
1271our @ISA = CFClient::UI::Base::; 1403our @ISA = CFClient::UI::DrawBG::;
1272 1404
1273use CFClient::OpenGL; 1405use CFClient::OpenGL;
1274 1406
1275sub new { 1407sub new {
1276 my ($class, %arg) = @_; 1408 my ($class, %arg) = @_;
1277 1409
1278 my $self = $class->SUPER::new ( 1410 my $self = $class->SUPER::new (
1279 fg => [1, 1, 1], 1411 fg => [1, 1, 1],
1412 #bg => none
1413 #active_bg => none
1280 #font => default_font 1414 #font => default_font
1281 #text => initial text 1415 #text => initial text
1282 #markup => initial narkup 1416 #markup => initial narkup
1417 #max_w => maximum pixel width
1418 ellipsise => 3, # end
1283 layout => (new CFClient::Layout), 1419 layout => (new CFClient::Layout),
1284 fontsize => 1, 1420 fontsize => 1,
1285 align => -1, 1421 align => -1,
1286 valign => -1, 1422 valign => -1,
1287 padding => 2, 1423 padding => 2,
… …
1302 } 1438 }
1303 1439
1304 $self 1440 $self
1305} 1441}
1306 1442
1307sub escape { 1443sub escape($) {
1308 local $_ = $_[1]; 1444 local $_ = $_[0];
1309 1445
1310 s/&/&amp;/g; 1446 s/&/&amp;/g;
1311 s/>/&gt;/g; 1447 s/>/&gt;/g;
1312 s/</&lt;/g; 1448 s/</&lt;/g;
1313 1449
1314 $_[1] 1450 $_
1315} 1451}
1316 1452
1317sub update { 1453sub update {
1318 my ($self) = @_; 1454 my ($self) = @_;
1319 1455
… …
1352sub size_request { 1488sub size_request {
1353 my ($self) = @_; 1489 my ($self) = @_;
1354 1490
1355 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1491 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $self->{layout}->set_width ($self->{max_w} || -1); 1492 $self->{layout}->set_width ($self->{max_w} || -1);
1493 $self->{layout}->set_ellipsise ($self->{ellipsise});
1494 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1495 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358 1496
1359 my ($w, $h) = $self->{layout}->size; 1497 my ($w, $h) = $self->{layout}->size;
1360 1498
1361 if (exists $self->{template}) { 1499 if (exists $self->{template}) {
… …
1391} 1529}
1392 1530
1393sub _draw { 1531sub _draw {
1394 my ($self) = @_; 1532 my ($self) = @_;
1395 1533
1534 $self->SUPER::_draw; # draw background, if applicable
1535
1396 my $tex = $self->{texture} ||= do { 1536 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}}); 1537 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1538 $self->{layout}->set_font ($self->{font}) if $self->{font};
1399 $self->{layout}->set_width ($self->{w}); 1539 $self->{layout}->set_width ($self->{w});
1540 $self->{layout}->set_ellipsise ($self->{ellipsise});
1541 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1542 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1543
1402 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1544 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403 1545
1404 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1546 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1547 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
… …
1443 active_fg => [0, 0, 0], 1585 active_fg => [0, 0, 0],
1444 can_hover => 1, 1586 can_hover => 1,
1445 can_focus => 1, 1587 can_focus => 1,
1446 valign => 0, 1588 valign => 0,
1447 can_events => 1, 1589 can_events => 1,
1590 #text => ...
1448 @_ 1591 @_
1449 ) 1592 )
1450} 1593}
1451 1594
1452sub _set_text { 1595sub _set_text {
… …
1462 $self->{text} = $text; 1605 $self->{text} = $text;
1463 1606
1464 $text =~ s/./*/g if $self->{hidden}; 1607 $text =~ s/./*/g if $self->{hidden};
1465 $self->{layout}->set_text ("$text "); 1608 $self->{layout}->set_text ("$text ");
1466 1609
1467 $self->emit (changed => $self->{text}); 1610 $self->_emit (changed => $self->{text});
1468} 1611}
1469 1612
1470sub set_text { 1613sub set_text {
1471 my ($self, $text) = @_; 1614 my ($self, $text) = @_;
1472 1615
… …
1484 my ($self) = @_; 1627 my ($self) = @_;
1485 1628
1486 my ($w, $h) = $self->SUPER::size_request; 1629 my ($w, $h) = $self->SUPER::size_request;
1487 1630
1488 ($w + 1, $h) # add 1 for cursor 1631 ($w + 1, $h) # add 1 for cursor
1489}
1490
1491sub size_allocate {
1492 my ($self, $w, $h) = @_;
1493
1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1495} 1632}
1496 1633
1497sub key_down { 1634sub key_down {
1498 my ($self, $ev) = @_; 1635 my ($self, $ev) = @_;
1499 1636
… …
1514 } elsif ($sym == CFClient::SDLK_HOME) { 1651 } elsif ($sym == CFClient::SDLK_HOME) {
1515 $self->{cursor} = 0; 1652 $self->{cursor} = 0;
1516 } elsif ($sym == CFClient::SDLK_END) { 1653 } elsif ($sym == CFClient::SDLK_END) {
1517 $self->{cursor} = length $text; 1654 $self->{cursor} = length $text;
1518 } elsif ($uni == 27) { 1655 } elsif ($uni == 27) {
1519 $self->emit ('escape'); 1656 $self->_emit ('escape');
1520 } elsif ($uni) { 1657 } elsif ($uni) {
1521 substr $text, $self->{cursor}++, 0, chr $uni; 1658 substr $text, $self->{cursor}++, 0, chr $uni;
1522 } 1659 }
1523 1660
1524 $self->_set_text ($text); 1661 $self->_set_text ($text);
… …
1611 if ($sym == 13) { 1748 if ($sym == 13) {
1612 unshift @{$self->{history}}, 1749 unshift @{$self->{history}},
1613 my $txt = $self->get_text; 1750 my $txt = $self->get_text;
1614 $self->{history_pointer} = -1; 1751 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = ''; 1752 $self->{history_saveback} = '';
1616 $self->emit (activate => $txt); 1753 $self->_emit (activate => $txt);
1617 $self->update; 1754 $self->update;
1618 1755
1619 } elsif ($sym == CFClient::SDLK_UP) { 1756 } elsif ($sym == CFClient::SDLK_UP) {
1620 if ($self->{history_pointer} < 0) { 1757 if ($self->{history_pointer} < 0) {
1621 $self->{history_saveback} = $self->get_text; 1758 $self->{history_saveback} = $self->get_text;
… …
1660 my $class = shift; 1797 my $class = shift;
1661 1798
1662 $class->SUPER::new ( 1799 $class->SUPER::new (
1663 padding => 4, 1800 padding => 4,
1664 fg => [1, 1, 1], 1801 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 1802 active_fg => [0, 0, 1],
1667 can_hover => 1, 1803 can_hover => 1,
1668 align => 0, 1804 align => 0,
1669 valign => 0, 1805 valign => 0,
1670 can_events => 1, 1806 can_events => 1,
1671 @_ 1807 @_
1672 ) 1808 )
1673} 1809}
1674 1810
1811sub activate { }
1812
1675sub button_up { 1813sub button_up {
1676 my ($self, $ev, $x, $y) = @_; 1814 my ($self, $ev, $x, $y) = @_;
1677 1815
1816 $self->emit ("activate")
1678 if ($x >= 0 && $x < $self->{w} 1817 if $x >= 0 && $x < $self->{w}
1679 && $y >= 0 && $y < $self->{h}) { 1818 && $y >= 0 && $y < $self->{h};
1680 $self->emit ("activate");
1681 }
1682} 1819}
1683 1820
1684sub _draw { 1821sub _draw {
1685 my ($self) = @_; 1822 my ($self) = @_;
1686 1823
… …
1718 1855
1719 $class->SUPER::new ( 1856 $class->SUPER::new (
1720 padding => 2, 1857 padding => 2,
1721 fg => [1, 1, 1], 1858 fg => [1, 1, 1],
1722 active_fg => [1, 1, 0], 1859 active_fg => [1, 1, 0],
1860 bg => [0, 0, 0, 0.2],
1861 active_bg => [1, 1, 1, 0.5],
1723 state => 0, 1862 state => 0,
1724 can_hover => 1, 1863 can_hover => 1,
1725 @_ 1864 @_
1726 ) 1865 )
1727} 1866}
… …
1736 my ($self, $ev, $x, $y) = @_; 1875 my ($self, $ev, $x, $y) = @_;
1737 1876
1738 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1877 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1739 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1878 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1740 $self->{state} = !$self->{state}; 1879 $self->{state} = !$self->{state};
1741 $self->emit (changed => $self->{state}); 1880 $self->_emit (changed => $self->{state});
1742 } 1881 }
1743} 1882}
1744 1883
1745sub _draw { 1884sub _draw {
1746 my ($self) = @_; 1885 my ($self) = @_;
… …
2019 # TODO: req_w/h are wrong with vertical 2158 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2159 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2160 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2161 fg => [1, 1, 1],
2023 active_fg => [0, 0, 0], 2162 active_fg => [0, 0, 0],
2163 bg => [0, 0, 0, 0.2],
2164 active_bg => [1, 1, 1, 0.5],
2024 range => [0, 0, 100, 10], 2165 range => [0, 0, 100, 10, 0],
2025 req_w => $::WIDTH / 80, 2166 req_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2167 req_h => $::WIDTH / 80,
2027 vertical => 0, 2168 vertical => 0,
2028 can_hover => 1, 2169 can_hover => 1,
2029 inner_pad => .05, 2170 inner_pad => 0.02,
2030 @_ 2171 @_
2031 ); 2172 );
2032 2173
2033 $self->set_value ($self->{range}[0]); 2174 $self->set_value ($self->{range}[0]);
2034 $self->update; 2175 $self->update;
2035 2176
2036 $self 2177 $self
2037} 2178}
2038 2179
2180sub set_range {
2181 my ($self, $range) = @_;
2182
2183 ($range, $self->{range}) = ($self->{range}, $range);
2184
2185 $self->update
2186 if "@$range" ne "@{$self->{range}}";
2187}
2188
2039sub set_value { 2189sub set_value {
2040 my ($self, $value) = @_; 2190 my ($self, $value) = @_;
2041 2191
2042 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2192 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2043 2193
2044 $hi = $lo + 1 if $hi <= $lo; 2194 $hi = $lo + 1 if $hi <= $lo;
2045 2195
2196 $page = $hi - $lo if $page > $hi - $lo;
2197
2046 $value = $lo if $value < $lo; 2198 $value = $lo if $value < $lo;
2047 $value = $hi if $value > $hi; 2199 $value = $hi - $page if $value > $hi - $page;
2048 2200
2049 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2201 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2050 if $unit; 2202 if $unit;
2051 2203
2052 $page = $hi - $lo if $page > $hi - $lo;
2053
2054 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2204 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2055 2205
2056 if ($value != $old_value) { 2206 if ($value != $old_value) {
2057 $self->emit (changed => $value); 2207 $self->_emit (changed => $value);
2058 $self->update; 2208 $self->update;
2059 } 2209 }
2060} 2210}
2061 2211
2062sub size_request { 2212sub size_request {
… …
2070 2220
2071sub button_down { 2221sub button_down {
2072 my ($self, $ev, $x, $y) = @_; 2222 my ($self, $ev, $x, $y) = @_;
2073 2223
2074 $self->SUPER::button_down ($ev, $x, $y); 2224 $self->SUPER::button_down ($ev, $x, $y);
2225
2226 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227
2075 $self->mouse_motion ($ev, $x, $y); 2228 $self->mouse_motion ($ev, $x, $y);
2076} 2229}
2077 2230
2078sub mouse_motion { 2231sub mouse_motion {
2079 my ($self, $ev, $x, $y) = @_; 2232 my ($self, $ev, $x, $y) = @_;
… …
2081 if ($GRAB == $self) { 2234 if ($GRAB == $self) {
2082 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2235 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2083 2236
2084 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2237 my (undef, $lo, $hi, $page) = @{$self->{range}};
2085 2238
2086 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2087 2240
2088 $self->set_value ($x * ($hi - $lo) + $lo); 2241 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2089 } 2242 }
2090} 2243}
2091 2244
2092sub update { 2245sub update {
2093 my ($self) = @_; 2246 my ($self) = @_;
2094 2247
2095 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2248 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2096 $self->set_value ($self->{range}[0]); 2249 $self->set_value ($self->{range}[0]);
2097 2250
2098 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2251 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100;
2099 2253
2100 my $inner_w = 1 - 2 * $self->{inner_pad}; 2254 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2101 2255
2102 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2256 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2257 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2103 2258
2104 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2259 $value = ($value - $lo) / $range;
2105 $value = $self->{scale} * ($value - $lo); 2260 $value = $value * $self->{scale} + $self->{offset};
2106 2261
2107 $value = $self->{inner_pad} + ($value - $page * 0.5);
2108
2109 $value = 0 if $value < 0;
2110 $page = 1 - $value if $value + $page > 1;
2111
2112 $self->{knob_x} = $value; 2262 $self->{knob_x} = $value - $knob_w * 0.5;
2113 $self->{knob_w} = $page; 2263 $self->{knob_w} = $knob_w;
2114 }); 2264 });
2115 2265
2116 $self->SUPER::update; 2266 $self->SUPER::update;
2117} 2267}
2118 2268
… …
2124 glScale $self->{w}, $self->{h}; 2274 glScale $self->{w}, $self->{h};
2125 2275
2126 if ($self->{vertical}) { 2276 if ($self->{vertical}) {
2127 # draw a vertical slider like a rotated horizontal slider 2277 # draw a vertical slider like a rotated horizontal slider
2128 2278
2279 glTranslate 1, 0, 0;
2129 glRotate 90, 0, 0, 1; 2280 glRotate 90, 0, 0, 1;
2130 glTranslate 0, 1, 0;
2131 } 2281 }
2132 2282
2133 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2283 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2134 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2284 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2135 2285
… …
2142 # draw handle 2292 # draw handle
2143 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2293 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2144 2294
2145 glDisable GL_TEXTURE_2D; 2295 glDisable GL_TEXTURE_2D;
2146} 2296}
2297
2298#############################################################################
2299
2300package CFClient::UI::ValSlider;
2301
2302our @ISA = CFClient::UI::HBox::;
2303
2304sub new {
2305 my ($class, %arg) = @_;
2306
2307 my $range = delete $arg{range};
2308
2309 my $self = $class->SUPER::new (
2310 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2311 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2312 to_value => sub { shift },
2313 from_value => sub { shift },
2314 %arg,
2315 );
2316
2317 $self->{slider}->connect (changed => sub {
2318 my ($self, $value) = @_;
2319 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2320 $self->{parent}->emit (changed => $value);
2321 });
2322
2323# $self->{entry}->connect (changed => sub {
2324# my ($self, $value) = @_;
2325# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2326# $self->{parent}->emit (changed => $value);
2327# });
2328
2329 $self->add ($self->{slider}, $self->{entry});
2330
2331 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2332
2333 $self
2334}
2335
2336sub set_range { shift->{slider}->set_range (@_) }
2337sub set_value { shift->{slider}->set_value (@_) }
2147 2338
2148############################################################################# 2339#############################################################################
2149 2340
2150package CFClient::UI::TextView; 2341package CFClient::UI::TextView;
2151 2342
… …
2181 2372
2182 $self->{fontsize} = $fontsize; 2373 $self->{fontsize} = $fontsize;
2183 $self->reflow; 2374 $self->reflow;
2184} 2375}
2185 2376
2186sub text_height {
2187 my ($self, $text) = @_;
2188
2189 my $layout = $self->{layout};
2190
2191 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2192 $layout->set_width ($self->{children}[0]{w});
2193 $layout->set_markup ($text);
2194
2195 ($layout->size)[1]
2196}
2197
2198sub reflow {
2199 my ($self) = @_;
2200
2201 $self->{need_reflow}++;
2202 $self->update;
2203}
2204
2205sub size_allocate { 2377sub size_allocate {
2206 my ($self, $w, $h) = @_; 2378 my ($self, $w, $h) = @_;
2207 2379
2208 $self->SUPER::size_allocate ($w, $h); 2380 $self->SUPER::size_allocate ($w, $h);
2209 2381
… …
2212 $self->{layout}->set_width ($self->{children}[0]{w}); 2384 $self->{layout}->set_width ($self->{children}[0]{w});
2213 2385
2214 $self->reflow; 2386 $self->reflow;
2215} 2387}
2216 2388
2389sub text_size {
2390 my ($self, $text, $indent) = @_;
2391
2392 my $layout = $self->{layout};
2393
2394 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $layout->set_width ($self->{children}[0]{w} - $indent);
2396 $layout->set_markup ($text);
2397
2398 $layout->size
2399}
2400
2401sub reflow {
2402 my ($self) = @_;
2403
2404 $self->{need_reflow}++;
2405 $self->update;
2406}
2407
2408sub set_offset {
2409 my ($self, $offset) = @_;
2410
2411 # todo: base offset on lines or so, not on pixels
2412 $self->{children}[1]->set_value ($offset);
2413}
2414
2415sub clear {
2416 my ($self) = @_;
2417
2418 $self->{par} = [];
2419 $self->{height} = 0;
2420 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2421}
2422
2217sub add_paragraph { 2423sub add_paragraph {
2218 my ($self, $color, $text) = @_; 2424 my ($self, $color, $text, $indent) = @_;
2219 2425
2220 #TODO: intelligently "reformat" paragraph 2426 for my $line (split /\n/, $text) {
2221 2427 my ($w, $h) = $self->text_size ($line);
2222 my $height = $self->text_height ($text);
2223
2224 $self->{height} += $height; 2428 $self->{height} += $h;
2429 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2430 }
2225 2431
2226 push @{$self->{par}}, [$height, $color, $text];
2227
2228 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2432 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2229 $self->{children}[1]->update;
2230} 2433}
2231 2434
2232sub update { 2435sub update {
2233 my ($self) = @_; 2436 my ($self) = @_;
2234 2437
… …
2237 return unless $self->{h} > 0; 2440 return unless $self->{h} > 0;
2238 2441
2239 delete $self->{texture}; 2442 delete $self->{texture};
2240 2443
2241 $ROOT->on_post_alloc ($self, sub { 2444 $ROOT->on_post_alloc ($self, sub {
2445 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2446
2242 if (delete $self->{need_reflow}) { 2447 if (delete $self->{need_reflow}) {
2243 my $height = 0; 2448 my $height = 0;
2244 2449
2245 $height += $_->[0] = $self->text_height ($_->[2]) 2450 my $layout = $self->{layout};
2451
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453
2246 for @{$self->{par}}; 2454 for (@{$self->{par}}) {
2455 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2456 $layout->set_width ($W - $_->[3]);
2457 $layout->set_markup ($_->[4]);
2458 my ($w, $h) = $layout->size;
2459 $_->[0] = $w + $_->[3];
2460 $_->[1] = $h;
2461 }
2462
2463 $height += $_->[1];
2464 }
2247 2465
2248 $self->{height} = $height; 2466 $self->{height} = $height;
2249 2467
2250 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2468 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2251 2469
2252 delete $self->{texture}; 2470 delete $self->{texture};
2253 } 2471 }
2254 2472
2255 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2473 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2256 glClearColor 0, 0, 0, 0; 2474 glClearColor 0.5, 0.5, 0.5, 0;
2257 glClear GL_COLOR_BUFFER_BIT; 2475 glClear GL_COLOR_BUFFER_BIT;
2258 2476
2259 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261
2262 my $top = int $self->{children}[1]{range}[0]; 2477 my $top = int $self->{children}[1]{range}[0];
2263 2478
2264 my $y0 = $top; 2479 my $y0 = $top;
2265 my $y1 = $top + $self->{h}; 2480 my $y1 = $top + $H;
2266 2481
2267 my $y = 0; 2482 my $y = 0;
2268 2483
2269 my $layout = $self->{layout}; 2484 my $layout = $self->{layout};
2270 2485
2271 $layout->set_font ($self->{font}) if $self->{font}; 2486 $layout->set_font ($self->{font}) if $self->{font};
2272 2487
2488 glEnable GL_BLEND;
2489 #TODO# not correct in windows where rgba is forced off
2490 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2491
2273 for my $par (@{$self->{par}}) { 2492 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2493 my $h = $par->[1];
2275 2494
2276 if ($y0 < $y + $h && $y < $y1) { 2495 if ($y0 < $y + $h && $y < $y1) {
2277 $layout->set_foreground (@{ $par->[1] }); 2496 $layout->set_foreground (@{ $par->[2] });
2497 $layout->set_width ($W - $par->[3]);
2278 $layout->set_markup ($par->[2]); 2498 $layout->set_markup ($par->[4]);
2279 2499
2280 my ($W, $H) = $layout->size; 2500 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2281 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2501
2502 glRasterPos $par->[3], $y - $y0;
2503 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2282 } 2504 }
2283 2505
2284 $y += $h; 2506 $y += $h;
2285 } 2507 }
2286 2508
2287 glDisable GL_TEXTURE_2D; 2509 glDisable GL_BLEND;
2288 }; 2510 };
2289 }); 2511 });
2290} 2512}
2291 2513
2292sub _draw { 2514sub _draw {
2293 my ($self) = @_; 2515 my ($self) = @_;
2294 2516
2295 glEnable GL_TEXTURE_2D; 2517 glEnable GL_TEXTURE_2D;
2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2518 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2297 glColor 1, 1, 1, 1; 2519 glColor 1, 1, 1, 1;
2298 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2520 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2299 glDisable GL_TEXTURE_2D; 2521 glDisable GL_TEXTURE_2D;
2300 2522
2301 $self->{children}[1]->draw; 2523 $self->{children}[1]->draw;
2302 2524
2303} 2525}
… …
2352 2574
2353sub new { 2575sub new {
2354 my $class = shift; 2576 my $class = shift;
2355 2577
2356 my $self = $class->SUPER::new ( 2578 my $self = $class->SUPER::new (
2357 state => 0, 2579 state => 0,
2358 connect_activate => \&toggle_flopper, 2580 on_activate => \&toggle_flopper,
2359 @_ 2581 @_
2360 ); 2582 );
2361 2583
2362 if ($self->{state}) { 2584 if ($self->{state}) {
2363 $self->{state} = 0; 2585 $self->{state} = 0;
… …
2372 2594
2373 # TODO: use animation 2595 # TODO: use animation
2374 if ($self->{state} = !$self->{state}) { 2596 if ($self->{state} = !$self->{state}) {
2375 $CFClient::UI::ROOT->add ($self->{other}); 2597 $CFClient::UI::ROOT->add ($self->{other});
2376 $self->{other}->move ($self->coord2global (0, $self->{h})); 2598 $self->{other}->move ($self->coord2global (0, $self->{h}));
2377 $self->emit ("open"); 2599 $self->_emit ("open");
2378 } else { 2600 } else {
2379 $CFClient::UI::ROOT->remove ($self->{other}); 2601 $CFClient::UI::ROOT->remove ($self->{other});
2380 $self->emit ("close"); 2602 $self->_emit ("close");
2381 } 2603 }
2382 2604
2383 $self->emit (changed => $self->{state}); 2605 $self->_emit (changed => $self->{state});
2384} 2606}
2385 2607
2386############################################################################# 2608#############################################################################
2387 2609
2388package CFClient::UI::Tooltip; 2610package CFClient::UI::Tooltip;
… …
2402 2624
2403sub set_tooltip_from { 2625sub set_tooltip_from {
2404 my ($self, $widget) = @_; 2626 my ($self, $widget) = @_;
2405 2627
2406 $self->add (new CFClient::UI::Label 2628 $self->add (new CFClient::UI::Label
2407 markup => $widget->{tooltip}, 2629 markup => $widget->{tooltip},
2408 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2630 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2409 fontsize => 0.8, 2631 fontsize => 0.8,
2410 fg => [0, 0, 0, 1], 2632 fg => [0, 0, 0, 1],
2633 ellipsise => 0,
2411 font => ($widget->{tooltip_font} || $::FONT_PROP), 2634 font => ($widget->{tooltip_font} || $::FONT_PROP),
2412 ); 2635 );
2413} 2636}
2414 2637
2415sub size_request { 2638sub size_request {
2416 my ($self) = @_; 2639 my ($self) = @_;
… …
2462use CFClient::OpenGL; 2685use CFClient::OpenGL;
2463 2686
2464sub new { 2687sub new {
2465 my $class = shift; 2688 my $class = shift;
2466 2689
2467 $class->SUPER::new ( 2690 my $self = $class->SUPER::new (
2468 aspect => 1, 2691 aspect => 1,
2692 can_events => 0,
2469 @_, 2693 @_,
2470 ) 2694 );
2695
2696 if ($self->{anim} && $self->{animspeed}) {
2697 Scalar::Util::weaken (my $widget = $self);
2698
2699 $self->{timer} = Event->timer (
2700 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2701 hard => 1,
2702 interval => $self->{animspeed},
2703 cb => sub {
2704 ++$widget->{frame};
2705 $widget->update;
2706 },
2707 );
2708 }
2709
2710 $self
2471} 2711}
2472 2712
2473sub size_request { 2713sub size_request {
2474 (32, 8) 2714 (32, 8)
2475} 2715}
2476 2716
2717sub update {
2718 my ($self) = @_;
2719
2720 return unless $self->{visible};
2721
2722 $self->SUPER::update;
2723}
2724
2477sub _draw { 2725sub _draw {
2478 my ($self) = @_; 2726 my ($self) = @_;
2479 2727
2480 return unless $::CONN;#d# manage and cache textures differently 2728 return unless $::CONN;
2729
2730 my $face;
2731
2732 if ($self->{frame}) {
2733 my $anim = $::CONN->{anim}[$self->{anim}];
2734
2735 $face = $anim->[ $self->{frame} % @$anim ]
2736 if $anim && @$anim;
2737 }
2738
2481 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2739 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2482 2740
2483 # TODO animation
2484 if ($tex) { 2741 if ($tex) {
2485 glEnable GL_TEXTURE_2D; 2742 glEnable GL_TEXTURE_2D;
2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2487 glColor 1, 1, 1, 1; 2744 glColor 1, 1, 1, 1;
2488 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2745 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2489 glDisable GL_TEXTURE_2D; 2746 glDisable GL_TEXTURE_2D;
2490 } 2747 }
2491} 2748}
2492 2749
2750sub DESTROY {
2751 my ($self) = @_;
2752
2753 $self->{timer}->cancel
2754 if $self->{timer};
2755
2756 $self->SUPER::DESTROY;
2757}
2758
2493############################################################################# 2759#############################################################################
2494 2760
2495package CFClient::UI::InventoryItem; 2761package CFClient::UI::Inventory;
2496 2762
2497our @ISA = CFClient::UI::HBox::; 2763our @ISA = CFClient::UI::ScrolledWindow::;
2498 2764
2499sub new { 2765sub new {
2500 my $class = shift; 2766 my $class = shift;
2501 2767
2502 my %args = @_;
2503
2504 my $item = delete $args{item};
2505
2506 my $desc = $item->{nrof} < 2
2507 ? $item->{name}
2508 : "$item->{nrof} $item->{name_pl}";
2509
2510 $item->{flags} & Crossfire::Protocol::F_OPEN
2511 and $desc .= " (open)";
2512 $item->{flags} & Crossfire::Protocol::F_APPLIED
2513 and $desc .= " (applied)";
2514 $item->{flags} & Crossfire::Protocol::F_UNPAID
2515 and $desc .= " (unpaid)";
2516 $item->{flags} & Crossfire::Protocol::F_MAGIC
2517 and $desc .= " (magic)";
2518 $item->{flags} & Crossfire::Protocol::F_CURSED
2519 and $desc .= " (cursed)";
2520 $item->{flags} & Crossfire::Protocol::F_DAMNED
2521 and $desc .= " (damned)";
2522 $item->{flags} & Crossfire::Protocol::F_LOCKED
2523 and $desc .= " *";
2524
2525 my $self = $class->SUPER::new ( 2768 my $self = $class->SUPER::new (
2526 can_hover => 1, 2769 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2527 can_events => 1,
2528 tooltip => (CFClient::UI::Label->escape ($desc)
2529 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2530 connect_button_down => sub {
2531 my ($self, $ev, $x, $y) = @_;
2532
2533 # todo: maybe put examine on 1? but should just be a tooltip :(
2534 if ($ev->{button} == 1) {
2535 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2536 } elsif ($ev->{button} == 2) {
2537 $::CONN->send ("apply $item->{tag}");
2538 } elsif ($ev->{button} == 3) {
2539 my @menu_items = (
2540 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2541 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2542 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2543 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2544 [
2545 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2546 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2547 ],
2548 );
2549
2550 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2551 }
2552
2553 1
2554 },
2555 %args
2556 );
2557
2558 $self->add (new CFClient::UI::Face
2559 can_events => 0,
2560 face => $item->{face},
2561 anim => $item->{anim},
2562 animspeed => $item->{animspeed},
2563 );
2564
2565 $self->add (new CFClient::UI::Label
2566 can_events => 0,
2567 text => $desc,
2568 );
2569
2570 $self
2571}
2572
2573#############################################################################
2574
2575package CFClient::UI::Inventory;
2576
2577our @ISA = CFClient::UI::ScrolledWindow::;
2578
2579sub new {
2580 my $class = shift;
2581
2582 my $self = $class->SUPER::new (
2583 scrolled => (new CFClient::UI::VBox),
2584 @_, 2770 @_,
2585 ); 2771 );
2586 2772
2587 $self 2773 $self
2588} 2774}
… …
2598 or ($a->{name} cmp $b->{name}) 2784 or ($a->{name} cmp $b->{name})
2599 } @$items; 2785 } @$items;
2600 2786
2601 $self->{real_items} = \@items; 2787 $self->{real_items} = \@items;
2602 2788
2789 my $row = 0;
2603 for my $item (@items) { 2790 for my $item (@items) {
2604 my $desc = $item->{nrof} < 2 2791 CFClient::Item::update_widgets $item;
2605 ? $item->{name}
2606 : "$item->{nrof} $item->{name_pl}";
2607 2792
2608 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2793 $self->{scrolled}->add (0, $row, $item->{face_widget});
2609 } 2794 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2795 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2610 2796
2611 $self->{scrolled}->add (@items); 2797 $row++;
2612 2798 }
2613# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2614} 2799}
2615 2800
2616sub size_request { 2801sub size_request {
2617 my ($self) = @_; 2802 my ($self) = @_;
2618 ($self->{req_w}, $self->{req_h}); 2803 ($self->{req_w}, $self->{req_h});
… …
2658 2843
2659# popup given the event (must be a mouse button down event currently) 2844# popup given the event (must be a mouse button down event currently)
2660sub popup { 2845sub popup {
2661 my ($self, $ev) = @_; 2846 my ($self, $ev) = @_;
2662 2847
2663 $self->emit ("popdown"); 2848 $self->_emit ("popdown");
2664 2849
2665 # maybe save $GRAB? must be careful about events... 2850 # maybe save $GRAB? must be careful about events...
2666 $GRAB = $self; 2851 $GRAB = $self;
2667 $self->{button} = $ev->{button}; 2852 $self->{button} = $ev->{button};
2668 2853
… …
2683 2868
2684 if ($ev->{button} == $self->{button}) { 2869 if ($ev->{button} == $self->{button}) {
2685 undef $GRAB; 2870 undef $GRAB;
2686 $self->hide; 2871 $self->hide;
2687 2872
2688 $self->emit ("popdown"); 2873 $self->_emit ("popdown");
2689 $self->{hover}[1]->() if $self->{hover}; 2874 $self->{hover}[1]->() if $self->{hover};
2690 } 2875 }
2691} 2876}
2692 2877
2693############################################################################# 2878#############################################################################
2694 2879
2695package CFClient::UI::Statusbox; 2880package CFClient::UI::Statusbox;
2696 2881
2697our @ISA = CFClient::UI::VBox::; 2882our @ISA = CFClient::UI::VBox::;
2883
2884sub new {
2885 my $class = shift;
2886
2887 $class->SUPER::new (
2888 fontsize => 0.8,
2889 @_,
2890 )
2891}
2698 2892
2699sub reorder { 2893sub reorder {
2700 my ($self) = @_; 2894 my ($self) = @_;
2701 my $NOW = time; 2895 my $NOW = time;
2702 2896
… …
2722 : $item->{text}; 2916 : $item->{text};
2723 2917
2724 for ($short) { 2918 for ($short) {
2725 s/^\s+//; 2919 s/^\s+//;
2726 s/\s+/ /g; 2920 s/\s+/ /g;
2727 my $len = int 40 / $item->{fontsize};
2728 substr $_, $len, length, "…" if $len < length;
2729 } 2921 }
2730 2922
2731 new CFClient::UI::Label 2923 new CFClient::UI::Label
2732 markup => $short, 2924 markup => $short,
2733 tooltip => $item->{tooltip}, 2925 tooltip => $item->{tooltip},
2734 tooltip_font => $::FONT_PROP, 2926 tooltip_font => $::FONT_PROP,
2735 tooltip_width => 0.67, 2927 tooltip_width => 0.67,
2736 fontsize => $item->{fontsize}, 2928 fontsize => $item->{fontsize} || $self->{fontsize},
2929 max_w => $::WIDTH * 0.44,
2737 fg => $item->{fg}, 2930 fg => $item->{fg},
2738 can_events => 1, 2931 can_events => 1,
2739 can_hover => 1 2932 can_hover => 1
2740 }; 2933 };
2741 } 2934 }
… …
2747sub add { 2940sub add {
2748 my ($self, $text, %arg) = @_; 2941 my ($self, $text, %arg) = @_;
2749 2942
2750 $text =~ s/^\s+//; 2943 $text =~ s/^\s+//;
2751 $text =~ s/\s+$//; 2944 $text =~ s/\s+$//;
2945
2946 return unless $text;
2752 2947
2753 my $timeout = time + ((delete $arg{timeout}) || 60); 2948 my $timeout = time + ((delete $arg{timeout}) || 60);
2754 2949
2755 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2950 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2756 2951
… …
2768 $self->{item}{$group} = { 2963 $self->{item}{$group} = {
2769 id => ++$self->{id}, 2964 id => ++$self->{id},
2770 text => $text, 2965 text => $text,
2771 timeout => $timeout, 2966 timeout => $timeout,
2772 tooltip => $text, 2967 tooltip => $text,
2773 fontsize => 0.8,
2774 fg => [0.8, 0.8, 0.8, 0.8], 2968 fg => [0.8, 0.8, 0.8, 0.8],
2775 pri => 0, 2969 pri => 0,
2776 count => 1, 2970 count => 1,
2777 %arg, 2971 %arg,
2778 }; 2972 };
2779 } 2973 }
2780 2974
2781 $self->reorder; 2975 $self->reorder;
2782} 2976}
2783 2977
2978sub reconfigure {
2979 my ($self) = @_;
2980
2981 delete $_->{label}
2982 for values %{ $self->{item} || {} };
2983
2984 $self->reorder;
2985 $self->SUPER::reconfigure;
2986}
2987
2784############################################################################# 2988#############################################################################
2785 2989
2786package CFClient::UI::Root; 2990package CFClient::UI::Root;
2787 2991
2788our @ISA = CFClient::UI::Container::; 2992our @ISA = CFClient::UI::Container::;
… …
2791 2995
2792sub new { 2996sub new {
2793 my $class = shift; 2997 my $class = shift;
2794 2998
2795 $class->SUPER::new ( 2999 $class->SUPER::new (
3000 visible => 1,
2796 @_, 3001 @_,
2797 ) 3002 )
2798} 3003}
2799 3004
2800sub configure { 3005sub configure {
… …
2818} 3023}
2819 3024
2820sub size_allocate { 3025sub size_allocate {
2821 my ($self, $w, $h) = @_; 3026 my ($self, $w, $h) = @_;
2822 3027
2823 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2824 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2825
2826 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2827 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2828
2829 for my $child ($self->children) { 3028 for my $child ($self->children) {
2830 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2831 3030
2832 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2833 if exists $child->{req_x}; 3032 if exists $child->{req_x};
… …
2862} 3061}
2863 3062
2864sub add { 3063sub add {
2865 my ($self, @children) = @_; 3064 my ($self, @children) = @_;
2866 3065
3066 for (my @widgets = @children; my $w = pop @widgets; ) {
3067 push @widgets, $w->children;
3068 $w->{root} = $self;
3069 $w->{visible} = $self->{visible} + 1;
3070 }
3071
2867 for my $child (@children) { 3072 for my $child (@children) {
2868 $child->{toplevel} = 1; 3073 $child->{is_toplevel} = 1;
2869 3074
2870 # integerise window positions 3075 # integerise window positions
2871 $child->{x} = int $child->{x}; 3076 $child->{x} = int $child->{x};
2872 $child->{y} = int $child->{y}; 3077 $child->{y} = int $child->{y};
2873 } 3078 }
2874 3079
2875 $self->SUPER::add (@children); 3080 $self->SUPER::add (@children);
2876} 3081}
2877 3082
3083sub remove {
3084 my ($self, @children) = @_;
3085
3086 $self->SUPER::remove (@children);
3087
3088 while (@children) {
3089 my $w = pop @children;
3090 push @children, $w->children;
3091 $w->set_invisible;
3092 }
3093}
3094
2878sub on_refresh { 3095sub on_refresh {
2879 my ($self, $id, $cb) = @_; 3096 my ($self, $id, $cb) = @_;
2880 3097
2881 $self->{refresh_hook}{$id} = $cb; 3098 $self->{refresh_hook}{$id} = $cb;
2882} 3099}
… …
2894 $_->() 3111 $_->()
2895 for values %{delete $self->{refresh_hook}}; 3112 for values %{delete $self->{refresh_hook}};
2896 } 3113 }
2897 3114
2898 if ($self->{check_size}) { 3115 if ($self->{check_size}) {
2899 my @queue = ([], []); 3116 my @queue;
2900 3117
2901 for (;;) { 3118 for (;;) {
2902 if ($self->{check_size}) { 3119 if ($self->{check_size}) {
2903 # heuristic: check containers last 3120 #TODO use array-of-depth approach
2904 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3121
3122 @queue = sort { $a->{visible} <=> $b->{visible} }
2905 for values %{delete $self->{check_size}} 3123 @queue, values %{delete $self->{check_size}};
2906 } 3124 }
2907 3125
2908 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3126 my $widget = pop @queue || last;
3127
3128 defined $widget->{visible} or last; # do not resize invisible widgets
2909 3129
2910 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3130 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2911 ? @$widget{qw(user_w user_h)} 3131 ? @$widget{qw(user_w user_h)}
2912 : $widget->size_request; 3132 : $widget->size_request;
2913 3133
… …
2933 $w = 0 if $w < 0; 3153 $w = 0 if $w < 0;
2934 $h = 0 if $h < 0; 3154 $h = 0 if $h < 0;
2935 3155
2936 $widget->{w} = $w; 3156 $widget->{w} = $w;
2937 $widget->{h} = $h; 3157 $widget->{h} = $h;
2938 $widget->size_allocate ($w, $h);
2939 $widget->emit (size_allocate => $w, $h); 3158 $widget->emit (size_allocate => $w, $h);
2940 } 3159 }
2941 } 3160 }
2942 3161
2943 while ($self->{post_alloc_hook}) { 3162 while ($self->{post_alloc_hook}) {
… …
2949 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3168 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2950 glClear GL_COLOR_BUFFER_BIT; 3169 glClear GL_COLOR_BUFFER_BIT;
2951 3170
2952 glMatrixMode GL_PROJECTION; 3171 glMatrixMode GL_PROJECTION;
2953 glLoadIdentity; 3172 glLoadIdentity;
2954 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3173 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2955 glMatrixMode GL_MODELVIEW; 3174 glMatrixMode GL_MODELVIEW;
2956 glLoadIdentity; 3175 glLoadIdentity;
2957 3176
2958 $self->_draw; 3177 $self->_draw;
2959} 3178}
… …
2961############################################################################# 3180#############################################################################
2962 3181
2963package CFClient::UI; 3182package CFClient::UI;
2964 3183
2965$ROOT = new CFClient::UI::Root; 3184$ROOT = new CFClient::UI::Root;
2966$TOOLTIP = new CFClient::UI::Tooltip; 3185$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2967 3186
29681 31871
2969 3188

Diff Legend

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