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.191 by root, Tue May 9 22:27:53 2006 UTC vs.
Revision 1.245 by elmex, Sat May 27 21:15:57 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
18
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}
15 38
16sub check_tooltip { 39sub check_tooltip {
17 if (!$GRAB) { 40 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
23 46
24 my $tip = $widget->{tooltip}; 47 my $tip = $widget->{tooltip};
25 48
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 49 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 50
28 $TOOLTIP->set_markup ($widget->{tooltip}); 51 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 52 $TOOLTIP->show;
31 53
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 55
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 57 if $x + $TOOLTIP->{w} > $::WIDTH;
37 58
38 $TOOLTIP->move ($x, $y); 59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
39 } 62 }
40 63
41 return; 64 return;
42 } 65 }
43 } 66 }
… …
47 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
48} 71}
49 72
50# class methods for events 73# class methods for events
51sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 76 if $FOCUS;
54} 77}
55 78
56sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 81 if $FOCUS;
59} 82}
60 83
61sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
62 my ($ev) = @_; 85 my ($ev) = @_;
… …
71 check_tooltip; 94 check_tooltip;
72 } 95 }
73 96
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 98
76 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 101}
81 102
82sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
83 my ($ev) = @_; 104 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
85 106
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 108
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 110
90 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 113
95 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 116 $grab->update if $grab;
98 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 134
116 check_tooltip; 135 check_tooltip;
117 } 136 }
118 137
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 139 if $HOVER;
123} 140}
124 141
125# convert position array to integers 142# convert position array to integers
126sub harmonize { 143sub harmonize {
127 my ($vals) = @_; 144 my ($vals) = @_;
… …
131 for (@$vals) { 148 for (@$vals) {
132 my $i = int $_ + $rem; 149 my $i = int $_ + $rem;
133 $rem += $_ - $i; 150 $rem += $_ - $i;
134 $_ = $i; 151 $_ = $i;
135 } 152 }
153}
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
171# call when resolution changes etc.
172sub rescale_widgets {
173 my ($sx, $sy) = @_;
174
175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) {
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
185 }
186 }
187
188 reconfigure_widgets;
136} 189}
137 190
138############################################################################# 191#############################################################################
139 192
140package CFClient::UI::Base; 193package CFClient::UI::Base;
… …
153 can_events => 1, 206 can_events => 1,
154 @_ 207 @_
155 }, $class; 208 }, $class;
156 209
157 for (keys %$self) { 210 for (keys %$self) {
158 if (/^connect_(.*)$/) { 211 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 212 $self->connect ($1 => delete $self->{$_});
160 } 213 }
161 } 214 }
162 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
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
163 $self 225 $self
226}
227
228sub toggle_visibility {
229 my ($self) = @_;
230
231 if ($self->{visible}) {
232 $self->hide;
233 } else {
234 $self->show;
235 }
164} 236}
165 237
166sub destroy { 238sub destroy {
167 my ($self) = @_; 239 my ($self) = @_;
168 240
… …
170 %$self = (); 242 %$self = ();
171} 243}
172 244
173sub show { 245sub show {
174 my ($self) = @_; 246 my ($self) = @_;
175
176 return if $self->{parent}; 247 return if $self->{parent};
177 248
178 $CFClient::UI::ROOT->add ($self); 249 $CFClient::UI::ROOT->add ($self);
179} 250}
180 251
181sub hide { 252sub show_centered {
182 my ($self) = @_; 253 my ($self) = @_;
254 return if $self->{parent};
255
256 $self->show;
257
258 $CFClient::UI::ROOT->on_post_alloc (
259 "centered $self" => sub {
260 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
261 },
262 );
263}
264
265sub set_invisible {
266 my ($self) = @_;
267
268 return unless $self->{visible};
269
270 # broken show/hide model
271
272 delete $self->{root};
273 delete $self->{visible};
183 274
184 undef $GRAB if $GRAB == $self; 275 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 276 undef $HOVER if $HOVER == $self;
277
278 CFClient::UI::check_tooltip
279 if $CFClient::UI::TOOLTIP->{owner} == $self;
280
281 $self->focus_out;
282
283 $self->emit (visibility_change => 0);
284}
285
286sub hide {
287 my ($self) = @_;
288
289 $self->set_invisible;
186 290
187 $self->{parent}->remove ($self) 291 $self->{parent}->remove ($self)
188 if $self->{parent}; 292 if $self->{parent};
189} 293}
190 294
… …
240 344
241sub size_allocate { 345sub size_allocate {
242 # nothing to be done 346 # nothing to be done
243} 347}
244 348
349sub reconfigure {
350 my ($self) = @_;
351
352 $self->check_size (1);
353 $self->update;
354}
355
245sub children { 356sub children {
246}
247
248# call when resolution changes etc.
249sub reconfigure {
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $self->size_allocate ($self->{w}, $self->{h});
257 $self->update;
258} 357}
259 358
260sub set_max_size { 359sub set_max_size {
261 my ($self, $w, $h) = @_; 360 my ($self, $w, $h) = @_;
262 361
263 delete $self->{max_w}; $self->{max_w} = $w if $w; 362 delete $self->{max_w}; $self->{max_w} = $w if $w;
264 delete $self->{max_h}; $self->{max_h} = $h if $h; 363 delete $self->{max_h}; $self->{max_h} = $h if $h;
364}
365
366sub set_tooltip {
367 my ($self, $tooltip) = @_;
368
369 $tooltip =~ s/^\s+//;
370 $tooltip =~ s/\s+$//;
371
372 return if $self->{tooltip} eq $tooltip;
373
374 $self->{tooltip} = $tooltip;
375
376 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
377 delete $CFClient::UI::TOOLTIP->{owner};
378 CFClient::UI::check_tooltip;
379 }
265} 380}
266 381
267# translate global coordinates to local coordinate system 382# translate global coordinates to local coordinate system
268sub coord2local { 383sub coord2local {
269 my ($self, $x, $y) = @_; 384 my ($self, $x, $y) = @_;
… …
284 return if $FOCUS == $self; 399 return if $FOCUS == $self;
285 return unless $self->{can_focus}; 400 return unless $self->{can_focus};
286 401
287 my $focus = $FOCUS; $FOCUS = $self; 402 my $focus = $FOCUS; $FOCUS = $self;
288 403
289 $self->emit (focus_in => $focus); 404 $self->_emit (focus_in => $focus);
290 405
291 $focus->update if $focus; 406 $focus->update if $focus;
292 $FOCUS->update; 407 $FOCUS->update;
293} 408}
294 409
… …
297 412
298 return unless $FOCUS == $self; 413 return unless $FOCUS == $self;
299 414
300 my $focus = $FOCUS; undef $FOCUS; 415 my $focus = $FOCUS; undef $FOCUS;
301 416
302 $self->emit (focus_out => $focus); 417 $self->_emit (focus_out => $focus);
303 418
304 $focus->update if $focus; #? 419 $focus->update if $focus; #?
420
421 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
422 unless $FOCUS;
305} 423}
306 424
307sub mouse_motion { } 425sub mouse_motion { }
308sub button_up { } 426sub button_up { }
309sub key_down { } 427sub key_down { }
310sub key_up { } 428sub key_up { }
311 429
312sub button_down { 430sub button_down {
313 my ($self, $ev, $x, $y) = @_; 431 my ($self, $ev, $x, $y) = @_;
314 432
315 $self->focus_in; 433 $self->focus_in;
… …
349 if ($ENV{PCLIENT_DEBUG}) { 467 if ($ENV{PCLIENT_DEBUG}) {
350 glPushMatrix; 468 glPushMatrix;
351 glColor 1, 1, 0, 1; 469 glColor 1, 1, 0, 1;
352 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 470 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353 glBegin GL_LINE_LOOP; 471 glBegin GL_LINE_LOOP;
354 glVertex 0 , 0; 472 glVertex 0 , 0;
355 glVertex $self->{w}, 0; 473 glVertex $self->{w} - 1, 0;
356 glVertex $self->{w}, $self->{h}; 474 glVertex $self->{w} - 1, $self->{h} - 1;
357 glVertex 0 , $self->{h}; 475 glVertex 0 , $self->{h} - 1;
358 glEnd; 476 glEnd;
359 glPopMatrix; 477 glPopMatrix;
360 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 478 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361 } 479 }
362} 480}
363 481
364sub _draw { 482sub _draw {
365 my ($self) = @_; 483 my ($self) = @_;
… …
380} 498}
381 499
382sub set_parent { 500sub set_parent {
383 my ($self, $parent) = @_; 501 my ($self, $parent) = @_;
384 502
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
386 Scalar::Util::weaken ($self->{parent} = $parent); 503 Scalar::Util::weaken ($self->{parent} = $parent);
504
505 if ($parent->{visible} || 1) {
506 $self->{root} = $parent->{root};
507 $self->{visible} = $parent->{visible} + 1;
508
509 $self->emit (visibility_change => 1)
510 unless $self->{parent}{visible};
511 }
512
513 # TODO: req_w _does_change after ->reconfigure
514 $self->check_size
515 unless exists $self->{req_w};
516
517 $self->show;
387} 518}
388 519
389sub check_size { 520sub check_size {
390 my ($self) = @_; 521 my ($self, $forced) = @_;
391 522
523 $self->{force_alloc} = 1 if $forced;
392 $CFClient::UI::ROOT->{check_size}{$self} = $self; 524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
393} 525}
394 526
395sub update { 527sub update {
396 my ($self) = @_; 528 my ($self) = @_;
… …
403 my ($self, $signal, $cb) = @_; 535 my ($self, $signal, $cb) = @_;
404 536
405 push @{ $self->{signal_cb}{$signal} }, $cb; 537 push @{ $self->{signal_cb}{$signal} }, $cb;
406} 538}
407 539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
408sub emit { 546sub emit {
409 my ($self, $signal, @args) = @_; 547 my ($self, $signal, @args) = @_;
410 548
411 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
412} 555}
413 556
414sub DESTROY { 557sub DESTROY {
415 my ($self) = @_; 558 my ($self) = @_;
416 559
560 delete $WIDGET{$self+0};
417 #$self->deactivate; 561 #$self->deactivate;
418} 562}
419 563
420############################################################################# 564#############################################################################
421 565
… …
430 my $class = shift; 574 my $class = shift;
431 575
432 # range [value, low, high, page] 576 # range [value, low, high, page]
433 577
434 $class->SUPER::new ( 578 $class->SUPER::new (
435 bg => [0, 0, 0, 0.2], 579 #bg => [0, 0, 0, 0.2],
436 active_bg => [1, 1, 1, 0.5], 580 #active_bg => [1, 1, 1, 0.5],
437 @_ 581 @_
438 ) 582 )
439} 583}
440 584
441sub _draw { 585sub _draw {
442 my ($self) = @_; 586 my ($self) = @_;
443 587
588 my $color = $FOCUS == $self && $self->{active_bg}
589 ? $self->{active_bg}
590 : $self->{bg};
591
592 if ($color && (@$color < 4 || $color->[3])) {
444 my ($w, $h) = @$self{qw(w h)}; 593 my ($w, $h) = @$self{qw(w h)};
445 594
446 glEnable GL_BLEND; 595 glEnable GL_BLEND;
447 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
448 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 597 glColor @$color;
449 598
450 glBegin GL_QUADS; 599 glBegin GL_QUADS;
451 glVertex 0 , 0; 600 glVertex 0 , 0;
452 glVertex 0 , $h; 601 glVertex 0 , $h;
453 glVertex $w, $h; 602 glVertex $w, $h;
454 glVertex $w, 0; 603 glVertex $w, 0;
455 glEnd; 604 glEnd;
456 605
457 glDisable GL_BLEND; 606 glDisable GL_BLEND;
607 }
458} 608}
459 609
460############################################################################# 610#############################################################################
461 611
462package CFClient::UI::Empty; 612package CFClient::UI::Empty;
… …
506 $self->{children} = [ 656 $self->{children} = [
507 sort { $a->{z} <=> $b->{z} } 657 sort { $a->{z} <=> $b->{z} }
508 @{$self->{children}}, @widgets 658 @{$self->{children}}, @widgets
509 ]; 659 ];
510 660
511 $_->check_size 661 $self->check_size (1);
512 for @widgets;
513
514 $self->update; 662 $self->update;
515} 663}
516 664
517sub children { 665sub children {
518 @{ $_[0]{children} } 666 @{ $_[0]{children} }
… …
524 delete $child->{parent}; 672 delete $child->{parent};
525 $child->hide; 673 $child->hide;
526 674
527 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
528 676
529 $self->check_size; 677 $self->check_size (1);
530 $self->update; 678 $self->update;
531} 679}
532 680
533sub clear { 681sub clear {
534 my ($self) = @_; 682 my ($self) = @_;
… …
625} 773}
626 774
627sub update { 775sub update {
628 my ($self) = @_; 776 my ($self) = @_;
629 777
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 778 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 779 $self->SUPER::update;
632} 780}
633 781
634sub size_allocate { 782sub size_allocate {
635 my ($self, $w, $h) = @_; 783 my ($self, $w, $h) = @_;
… …
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0; 797 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 798 glClear GL_COLOR_BUFFER_BIT;
651 799
652 $self->_render; 800 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 }; 801 };
661} 802}
662 803
663sub _draw { 804sub _draw {
664 my ($self) = @_; 805 my ($self) = @_;
… …
666 my ($w, $h) = ($self->w, $self->h); 807 my ($w, $h) = ($self->w, $self->h);
667 808
668 my $tex = $self->{texture} 809 my $tex = $self->{texture}
669 or return; 810 or return;
670 811
671 glEnable GL_BLEND;
672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 812 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1; 814 glColor 1, 1, 1, 1;
676 815
677 $tex->draw_quad (0, 0, $w, $h); 816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678 817
679 glDisable GL_BLEND;
680 glDisable GL_TEXTURE_2D; 818 glDisable GL_TEXTURE_2D;
681} 819}
682 820
683############################################################################# 821#############################################################################
684 822
685package CFClient::UI::ViewPort; 823package CFClient::UI::ViewPort;
686 824
687our @ISA = CFClient::UI::Window::; 825our @ISA = CFClient::UI::Window::;
688 826
827sub new {
828 my $class = shift;
829
830 $class->SUPER::new (
831 scroll_x => 0,
832 scroll_y => 1,
833 @_,
834 )
835}
836
689sub size_request { 837sub size_request {
690 my ($self) = @_; 838 my ($self) = @_;
691 839
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 841
695 @$self{qw(child_w child_h)} 842 @$self{qw(child_w child_h)}
696} 843}
697 844
698sub size_allocate { 845sub size_allocate {
699 my ($self, $w, $h) = @_; 846 my ($self, $w, $h) = @_;
700 847
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
850
851 $self->child->configure (0, 0, $w, $h);
701 $self->update; 852 $self->update;
702} 853}
703 854
704sub set_offset { 855sub set_offset {
705 my ($self, $x, $y) = @_; 856 my ($self, $x, $y) = @_;
… …
756 my $class = shift; 907 my $class = shift;
757 908
758 my $self; 909 my $self;
759 910
760 my $slider = new CFClient::UI::Slider 911 my $slider = new CFClient::UI::Slider
761 vertical => 1, 912 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 913 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 914 on_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 915 $self->{vp}->set_offset (0, $_[1]);
765 }, 916 },
766 ; 917 ;
767 918
768 $self = $class->SUPER::new ( 919 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 920 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 921 slider => $slider,
771 @_, 922 @_,
772 ); 923 );
773 924
774 $self->{vp}->add ($self->{scrolled}); 925 $self->{vp}->add ($self->{scrolled});
… …
776 $self->add ($self->{slider}); 927 $self->add ($self->{slider});
777 928
778 $self 929 $self
779} 930}
780 931
932sub update {
933 my ($self) = @_;
934
935 $self->SUPER::update;
936
937 # todo: overwrite size_allocate of child
938 my $child = $self->{vp}->child;
939 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
940}
941
942sub size_allocate {
943 my ($self, $w, $h) = @_;
944
945 $self->SUPER::size_allocate ($w, $h);
946
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949}
950
781#TODO# update range on size_allocate depeneing on child 951#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 952# update viewport offset on scroll
783 953
784############################################################################# 954#############################################################################
785 955
786package CFClient::UI::Frame; 956package CFClient::UI::Frame;
… …
790use CFClient::OpenGL; 960use CFClient::OpenGL;
791 961
792sub new { 962sub new {
793 my $class = shift; 963 my $class = shift;
794 964
795 my $self = $class->SUPER::new ( 965 $class->SUPER::new (
796 bg => [1, 1, 1, 1], 966 bg => undef,
797 border_bg => [1, 1, 1, 1],
798 border => 0.8,
799 @_ 967 @_,
800 ); 968 )
801
802 $self
803} 969}
804 970
805sub _draw { 971sub _draw {
806 my ($self) = @_; 972 my ($self) = @_;
807 973
808 my ($w, $h) = ($self->{w}, $self->{h}); 974 if ($self->{bg}) {
975 my ($w, $h) = @$self{qw(w h)};
809 976
810 glEnable GL_BLEND; 977 glEnable GL_BLEND;
811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 978 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812 glEnable GL_TEXTURE_2D; 979 glColor @{ $self->{bg} };
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 980
815# glBegin GL_QUADS; 981 glBegin GL_QUADS;
816# glColor 0, 0, 0, 0;
817# glVertex 0 , 0; 982 glVertex 0 , 0;
818# glVertex 0 , $h; 983 glVertex 0 , $h;
819# glVertex $w, $h; 984 glVertex $w, $h;
820# glVertex $w, 0; 985 glVertex $w, 0;
821# glEnd; 986 glEnd;
822 987
823
824 $self->child->draw;
825 glDisable GL_BLEND; 988 glDisable GL_BLEND;
826 glDisable GL_TEXTURE_2D; 989 }
990
991 $self->SUPER::_draw;
827} 992}
828 993
829############################################################################# 994#############################################################################
830 995
831package CFClient::UI::FancyFrame; 996package CFClient::UI::FancyFrame;
… …
842 my $class = shift; 1007 my $class = shift;
843 1008
844 # TODO: user_x, user_y, overwrite moveto? 1009 # TODO: user_x, user_y, overwrite moveto?
845 1010
846 my $self = $class->SUPER::new ( 1011 my $self = $class->SUPER::new (
847 bg => [1, 1, 1, 1], 1012 bg => [1, 1, 1, 1],
848 border_bg => [1, 1, 1, 1], 1013 border_bg => [1, 1, 1, 1],
849 border => 0.6, 1014 border => 0.6,
1015 is_toplevel => 1,
850 can_events => 1, 1016 can_events => 1,
851 @_ 1017 @_
852 ); 1018 );
853 1019
854 $self->{title} &&= new CFClient::UI::Label 1020 $self->{title} &&= new CFClient::UI::Label
855 align => 0, 1021 align => 0,
… …
879 my ($self, $w, $h) = @_; 1045 my ($self, $w, $h) = @_;
880 1046
881 $h -= List::Util::max 0, $self->border * 2; 1047 $h -= List::Util::max 0, $self->border * 2;
882 $w -= List::Util::max 0, $self->border * 2; 1048 $w -= List::Util::max 0, $self->border * 2;
883 1049
884 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1050 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
885 if $self->{title}; 1051 if $self->{title};
886 1052
887 $self->child->configure ($self->border, $self->border, $w, $h); 1053 $self->child->configure ($self->border, $self->border, $w, $h);
888} 1054}
889 1055
… …
908 my ($ev, $x, $y) = @_; 1074 my ($ev, $x, $y) = @_;
909 1075
910 my $dx = $ev->{x} - $ox; 1076 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy; 1077 my $dy = $ev->{y} - $oy;
912 1078
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1083 $self->move ($self->{user_x}, $self->{user_y});
916 $self->check_size; 1084 $self->check_size;
917 }; 1085 };
918 1086
919 } elsif ($lr ^ $td) { 1087 } elsif ($lr ^ $td) {
920 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1088 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
923 $self->{motion} = sub { 1091 $self->{motion} = sub {
924 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
925 1093
926 ($x, $y) = ($ev->{x}, $ev->{y}); 1094 ($x, $y) = ($ev->{x}, $ev->{y});
927 1095
928 $self->move ($bx + $x - $ox, $by + $y - $oy); 1096 $self->{user_x} = $bx + $x - $ox;
1097 $self->{user_y} = $by + $y - $oy;
1098 $self->move ($self->{user_x}, $self->{user_y});
929 $self->update; 1099 $self->update;
930 }; 1100 };
931 } 1101 }
932} 1102}
933 1103
… …
947 my ($self) = @_; 1117 my ($self) = @_;
948 1118
949 my ($w, $h ) = ($self->{w}, $self->{h}); 1119 my ($w, $h ) = ($self->{w}, $self->{h});
950 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951 1121
952 glEnable GL_BLEND;
953 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954 glEnable GL_TEXTURE_2D; 1122 glEnable GL_TEXTURE_2D;
955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956 1124
957 my $border = $self->border; 1125 my $border = $self->border;
958 1126
959 glColor @{ $self->{border_bg} }; 1127 glColor @{ $self->{border_bg} };
960 $tex[1]->draw_quad (0, 0, $w, $border); 1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
961 $tex[3]->draw_quad (0, $border, $border, $ch); 1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964 1132
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966 my $bg = $tex[0]; 1134 my $bg = $tex[0];
967 1135
968 # TODO: repeat texture not scale 1136 # TODO: repeat texture not scale
… …
972 glColor @{ $self->{bg} }; 1140 glColor @{ $self->{bg} };
973 1141
974 $bg->{s} = $rep_x; 1142 $bg->{s} = $rep_x;
975 $bg->{t} = $rep_y; 1143 $bg->{t} = $rep_y;
976 $bg->{wrap_mode} = 1; 1144 $bg->{wrap_mode} = 1;
977 $bg->draw_quad ($border, $border, $cw, $ch); 1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 }
978 1147
979 glDisable GL_TEXTURE_2D; 1148 glDisable GL_TEXTURE_2D;
980 glDisable GL_BLEND;
981 }
982 1149
983 $self->{title}->draw if $self->{title}; 1150 $self->{title}->draw if $self->{title};
984 1151
985 $self->child->draw; 1152 $self->child->draw;
986} 1153}
… …
998sub new { 1165sub new {
999 my $class = shift; 1166 my $class = shift;
1000 1167
1001 $class->SUPER::new ( 1168 $class->SUPER::new (
1002 col_expand => [], 1169 col_expand => [],
1003 @_ 1170 @_,
1004 ) 1171 )
1172}
1173
1174sub children {
1175 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1005} 1176}
1006 1177
1007sub add { 1178sub add {
1008 my ($self, $x, $y, $child) = @_; 1179 my ($self, $x, $y, $child) = @_;
1009 1180
1010 $child->set_parent ($self); 1181 $child->set_parent ($self);
1011 $self->{children}[$y][$x] = $child; 1182 $self->{children}[$y][$x] = $child;
1012 1183
1013 $child->check_size; 1184 $self->check_size (1);
1014} 1185}
1015 1186
1016sub children {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018}
1019
1020# TODO: move to container class maybe? send childs a signal on removal? 1187# TODO: move to container class maybe? send children a signal on removal?
1021sub clear { 1188sub clear {
1022 my ($self) = @_; 1189 my ($self) = @_;
1023 1190
1024 my @children = $self->children; 1191 my @children = $self->children;
1025 delete $self->{children}; 1192 delete $self->{children};
… …
1027 for (@children) { 1194 for (@children) {
1028 delete $_->{parent}; 1195 delete $_->{parent};
1029 $_->hide; 1196 $_->hide;
1030 } 1197 }
1031 1198
1199 $self->check_size (1);
1032 $self->update; 1200 $self->update;
1033} 1201}
1034 1202
1035sub get_wh { 1203sub get_wh {
1036 my ($self) = @_; 1204 my ($self) = @_;
… …
1068sub size_allocate { 1236sub size_allocate {
1069 my ($self, $w, $h) = @_; 1237 my ($self, $w, $h) = @_;
1070 1238
1071 my ($ws, $hs) = $self->get_wh; 1239 my ($ws, $hs) = $self->get_wh;
1072 1240
1073 my $req_w = sum @$ws; 1241 my $req_w = (sum @$ws) || 1;
1074 my $req_h = sum @$hs; 1242 my $req_h = (sum @$hs) || 1;
1075 1243
1076 # TODO: nicer code && do row_expand 1244 # TODO: nicer code && do row_expand
1077 my @col_expand = @{$self->{col_expand}}; 1245 my @col_expand = @{$self->{col_expand}};
1078 @col_expand = (1) x @$ws unless @col_expand; 1246 @col_expand = (1) x @$ws unless @col_expand;
1079 my $col_expand = (sum @col_expand) || 1; 1247 my $col_expand = (sum @col_expand) || 1;
… …
1213} 1381}
1214 1382
1215sub size_allocate { 1383sub size_allocate {
1216 my ($self, $w, $h) = @_; 1384 my ($self, $w, $h) = @_;
1217 1385
1386 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1387
1218 my $children = $self->{children}; 1388 my $children = $self->{children};
1219 1389
1220 my @h = map $_->{req_h}, @$children; 1390 my @h = map $_->{req_h}, @$children;
1221 1391
1222 my $req_h = List::Util::sum @h; 1392 my $req_h = List::Util::sum @h;
… …
1251 1421
1252############################################################################# 1422#############################################################################
1253 1423
1254package CFClient::UI::Label; 1424package CFClient::UI::Label;
1255 1425
1256our @ISA = CFClient::UI::Base::; 1426our @ISA = CFClient::UI::DrawBG::;
1257 1427
1258use CFClient::OpenGL; 1428use CFClient::OpenGL;
1259 1429
1260sub new { 1430sub new {
1261 my ($class, %arg) = @_; 1431 my ($class, %arg) = @_;
1262 1432
1263 my $self = $class->SUPER::new ( 1433 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1434 fg => [1, 1, 1],
1435 #bg => none
1436 #active_bg => none
1265 #font => default_font 1437 #font => default_font
1438 #text => initial text
1439 #markup => initial narkup
1440 #max_w => maximum pixel width
1441 ellipsise => 3, # end
1442 layout => (new CFClient::Layout),
1266 fontsize => 1, 1443 fontsize => 1,
1267 text => "",
1268 align => -1, 1444 align => -1,
1269 valign => -1, 1445 valign => -1,
1270 padding => 2, 1446 padding => 2,
1271 layout => new CFClient::Layout,
1272 can_events => 0, 1447 can_events => 0,
1273 %arg 1448 %arg
1274 ); 1449 );
1275 1450
1276 if (exists $self->{template}) { 1451 if (exists $self->{template}) {
1277 my $layout = new CFClient::Layout; 1452 my $layout = new CFClient::Layout;
1278 $layout->set_text (delete $self->{template}); 1453 $layout->set_text (delete $self->{template});
1279 $self->{template} = $layout; 1454 $self->{template} = $layout;
1280 } 1455 }
1281 1456
1282 $self->set_text (delete $self->{text}) if exists $self->{text}; 1457 if (exists $self->{markup}) {
1283 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1458 $self->set_markup (delete $self->{markup});
1459 } else {
1460 $self->set_text (delete $self->{text});
1461 }
1284 1462
1285 $self 1463 $self
1286} 1464}
1287 1465
1288sub escape { 1466sub escape($) {
1289 local $_ = $_[1]; 1467 local $_ = $_[0];
1290 1468
1291 s/&/&amp;/g; 1469 s/&/&amp;/g;
1292 s/>/&gt;/g; 1470 s/>/&gt;/g;
1293 s/</&lt;/g; 1471 s/</&lt;/g;
1294 1472
1295 $_[1] 1473 $_
1296} 1474}
1297 1475
1298sub update { 1476sub update {
1299 my ($self) = @_; 1477 my ($self) = @_;
1300 1478
… …
1306 my ($self, $text) = @_; 1484 my ($self, $text) = @_;
1307 1485
1308 return if $self->{text} eq "T$text"; 1486 return if $self->{text} eq "T$text";
1309 $self->{text} = "T$text"; 1487 $self->{text} = "T$text";
1310 1488
1489 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1311 $self->{layout}->set_text ($text); 1490 $self->{layout}->set_text ($text);
1312 1491
1313 $self->update; 1492 $self->update;
1314 $self->check_size; 1493 $self->check_size;
1315} 1494}
… …
1318 my ($self, $markup) = @_; 1497 my ($self, $markup) = @_;
1319 1498
1320 return if $self->{text} eq "M$markup"; 1499 return if $self->{text} eq "M$markup";
1321 $self->{text} = "M$markup"; 1500 $self->{text} = "M$markup";
1322 1501
1502 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503
1504 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1323 $self->{layout}->set_markup ($markup); 1505 $self->{layout}->set_markup ($markup);
1324 1506
1325 $self->update; 1507 $self->update;
1326 $self->check_size; 1508 $self->check_size;
1327} 1509}
… …
1329sub size_request { 1511sub size_request {
1330 my ($self) = @_; 1512 my ($self) = @_;
1331 1513
1332 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1514 $self->{layout}->set_font ($self->{font}) if $self->{font};
1333 $self->{layout}->set_width ($self->{max_w} || -1); 1515 $self->{layout}->set_width ($self->{max_w} || -1);
1516 $self->{layout}->set_ellipsise ($self->{ellipsise});
1517 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1334 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1518 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1335 1519
1336 my ($w, $h) = $self->{layout}->size; 1520 my ($w, $h) = $self->{layout}->size;
1337 1521
1338 if (exists $self->{template}) { 1522 if (exists $self->{template}) {
… …
1368} 1552}
1369 1553
1370sub _draw { 1554sub _draw {
1371 my ($self) = @_; 1555 my ($self) = @_;
1372 1556
1557 $self->SUPER::_draw; # draw background, if applicable
1558
1373 my $tex = $self->{texture} ||= do { 1559 my $tex = $self->{texture} ||= do {
1560 $self->{layout}->set_foreground (@{$self->{fg}});
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1561 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{w}); 1562 $self->{layout}->set_width ($self->{w});
1563 $self->{layout}->set_ellipsise ($self->{ellipsise});
1564 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1565 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1566
1377 new_from_layout CFClient::Texture $self->{layout} 1567 my $tex = new_from_layout CFClient::Texture $self->{layout};
1568
1569 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1570 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1571 : ($self->{w} - $tex->{w}) * 0.5);
1572
1573 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1574 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1575 : ($self->{h} - $tex->{h}) * 0.5);
1576
1577 $tex
1378 }; 1578 };
1379 1579
1380 glEnable GL_BLEND;
1381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1382 glEnable GL_TEXTURE_2D; 1580 glEnable GL_TEXTURE_2D;
1383 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1384 1582
1583 if ($tex->{format} == GL_ALPHA) {
1385 glColor @{$self->{fg}}; 1584 glColor @{$self->{fg}};
1386
1387 $self->{ox} = int (
1388 $self->{align} < 0 ? $self->{padding}
1389 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390 : ($self->{w} - $tex->{w}) * 0.5
1391 );
1392
1393 $self->{oy} = int (
1394 $self->{valign} < 0 ? $self->{padding}
1395 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1396 : ($self->{h} - $tex->{h}) * 0.5
1397 );
1398
1399 $tex->draw_quad ($self->{ox}, $self->{oy}); 1585 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1586 } else {
1587 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1588 }
1400 1589
1401 glDisable GL_TEXTURE_2D; 1590 glDisable GL_TEXTURE_2D;
1402 glDisable GL_BLEND;
1403} 1591}
1404 1592
1405############################################################################# 1593#############################################################################
1406 1594
1407package CFClient::UI::EntryBase; 1595package CFClient::UI::EntryBase;
… …
1420 active_fg => [0, 0, 0], 1608 active_fg => [0, 0, 0],
1421 can_hover => 1, 1609 can_hover => 1,
1422 can_focus => 1, 1610 can_focus => 1,
1423 valign => 0, 1611 valign => 0,
1424 can_events => 1, 1612 can_events => 1,
1613 #text => ...
1425 @_ 1614 @_
1426 ) 1615 )
1427} 1616}
1428 1617
1429sub _set_text { 1618sub _set_text {
… …
1439 $self->{text} = $text; 1628 $self->{text} = $text;
1440 1629
1441 $text =~ s/./*/g if $self->{hidden}; 1630 $text =~ s/./*/g if $self->{hidden};
1442 $self->{layout}->set_text ("$text "); 1631 $self->{layout}->set_text ("$text ");
1443 1632
1444 $self->emit (changed => $self->{text}); 1633 $self->_emit (changed => $self->{text});
1445}
1446
1447sub get_text {
1448 $_[0]{text}
1449}
1450
1451sub size_request {
1452 my ($self) = @_;
1453
1454 my ($w, $h) = $self->SUPER::size_request;
1455
1456 ($w + 1, $h) # add 1 for cursor
1457}
1458
1459sub size_allocate {
1460 my ($self, $w, $h) = @_;
1461
1462 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1463} 1634}
1464 1635
1465sub set_text { 1636sub set_text {
1466 my ($self, $text) = @_; 1637 my ($self, $text) = @_;
1467 1638
1468 $self->{cursor} = length $text; 1639 $self->{cursor} = length $text;
1469 $self->_set_text ($text); 1640 $self->_set_text ($text);
1470 $self->update; 1641 $self->update;
1642 $self->check_size;
1643}
1644
1645sub get_text {
1646 $_[0]{text}
1647}
1648
1649sub size_request {
1650 my ($self) = @_;
1651
1652 my ($w, $h) = $self->SUPER::size_request;
1653
1654 ($w + 1, $h) # add 1 for cursor
1471} 1655}
1472 1656
1473sub key_down { 1657sub key_down {
1474 my ($self, $ev) = @_; 1658 my ($self, $ev) = @_;
1475 1659
… …
1477 my $sym = $ev->{sym}; 1661 my $sym = $ev->{sym};
1478 my $uni = $ev->{unicode}; 1662 my $uni = $ev->{unicode};
1479 1663
1480 my $text = $self->get_text; 1664 my $text = $self->get_text;
1481 1665
1482 if ($sym == 8) { 1666 if ($uni == 8) {
1483 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1667 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1484 } elsif ($sym == 127) { 1668 } elsif ($uni == 127) {
1485 substr $text, $self->{cursor}, 1, ""; 1669 substr $text, $self->{cursor}, 1, "";
1486 } elsif ($sym == CFClient::SDLK_LEFT) { 1670 } elsif ($sym == CFClient::SDLK_LEFT) {
1487 --$self->{cursor} if $self->{cursor}; 1671 --$self->{cursor} if $self->{cursor};
1488 } elsif ($sym == CFClient::SDLK_RIGHT) { 1672 } elsif ($sym == CFClient::SDLK_RIGHT) {
1489 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1673 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1490 } elsif ($sym == CFClient::SDLK_HOME) { 1674 } elsif ($sym == CFClient::SDLK_HOME) {
1491 $self->{cursor} = 0; 1675 $self->{cursor} = 0;
1492 } elsif ($sym == CFClient::SDLK_END) { 1676 } elsif ($sym == CFClient::SDLK_END) {
1493 $self->{cursor} = length $text; 1677 $self->{cursor} = length $text;
1494 } elsif ($sym == 27) { 1678 } elsif ($uni == 27) {
1495 $self->emit ('escape'); 1679 $self->_emit ('escape');
1496 } elsif ($uni) { 1680 } elsif ($uni) {
1497 substr $text, $self->{cursor}++, 0, chr $uni; 1681 substr $text, $self->{cursor}++, 0, chr $uni;
1498 } 1682 }
1499 1683
1500 $self->_set_text ($text); 1684 $self->_set_text ($text);
1501 $self->update; 1685 $self->update;
1686 $self->check_size;
1502} 1687}
1503 1688
1504sub focus_in { 1689sub focus_in {
1505 my ($self) = @_; 1690 my ($self) = @_;
1506 1691
… …
1586 if ($sym == 13) { 1771 if ($sym == 13) {
1587 unshift @{$self->{history}}, 1772 unshift @{$self->{history}},
1588 my $txt = $self->get_text; 1773 my $txt = $self->get_text;
1589 $self->{history_pointer} = -1; 1774 $self->{history_pointer} = -1;
1590 $self->{history_saveback} = ''; 1775 $self->{history_saveback} = '';
1591 $self->emit (activate => $txt); 1776 $self->_emit (activate => $txt);
1592 $self->update; 1777 $self->update;
1593 1778
1594 } elsif ($sym == CFClient::SDLK_UP) { 1779 } elsif ($sym == CFClient::SDLK_UP) {
1595 if ($self->{history_pointer} < 0) { 1780 if ($self->{history_pointer} < 0) {
1596 $self->{history_saveback} = $self->get_text; 1781 $self->{history_saveback} = $self->get_text;
… …
1635 my $class = shift; 1820 my $class = shift;
1636 1821
1637 $class->SUPER::new ( 1822 $class->SUPER::new (
1638 padding => 4, 1823 padding => 4,
1639 fg => [1, 1, 1], 1824 fg => [1, 1, 1],
1640 bg => [1, 1, 1, 0.2],
1641 active_fg => [0, 0, 1], 1825 active_fg => [0, 0, 1],
1642 can_hover => 1, 1826 can_hover => 1,
1643 align => 0, 1827 align => 0,
1644 valign => 0, 1828 valign => 0,
1645 can_events => 1, 1829 can_events => 1,
1646 @_ 1830 @_
1647 ) 1831 )
1648} 1832}
1649 1833
1834sub activate { }
1835
1650sub button_up { 1836sub button_up {
1651 my ($self, $ev, $x, $y) = @_; 1837 my ($self, $ev, $x, $y) = @_;
1652 1838
1839 $self->emit ("activate")
1653 if ($x >= 0 && $x < $self->{w} 1840 if $x >= 0 && $x < $self->{w}
1654 && $y >= 0 && $y < $self->{h}) { 1841 && $y >= 0 && $y < $self->{h};
1655 $self->emit ("activate");
1656 }
1657} 1842}
1658 1843
1659sub _draw { 1844sub _draw {
1660 my ($self) = @_; 1845 my ($self) = @_;
1661 1846
… …
1663 1848
1664 if ($GRAB == $self) { 1849 if ($GRAB == $self) {
1665 $self->{fg} = $self->{active_fg}; 1850 $self->{fg} = $self->{active_fg};
1666 } 1851 }
1667 1852
1668 glEnable GL_BLEND;
1669 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1670 glEnable GL_TEXTURE_2D; 1853 glEnable GL_TEXTURE_2D;
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1854 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672 glColor 0, 0, 0, 1; 1855 glColor 0, 0, 0, 1;
1673 1856
1674 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1857 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1675 1858
1676 glDisable GL_TEXTURE_2D; 1859 glDisable GL_TEXTURE_2D;
1677 glDisable GL_BLEND;
1678 1860
1679 $self->SUPER::_draw; 1861 $self->SUPER::_draw;
1680} 1862}
1681 1863
1682############################################################################# 1864#############################################################################
… …
1696 1878
1697 $class->SUPER::new ( 1879 $class->SUPER::new (
1698 padding => 2, 1880 padding => 2,
1699 fg => [1, 1, 1], 1881 fg => [1, 1, 1],
1700 active_fg => [1, 1, 0], 1882 active_fg => [1, 1, 0],
1883 bg => [0, 0, 0, 0.2],
1884 active_bg => [1, 1, 1, 0.5],
1701 state => 0, 1885 state => 0,
1702 can_hover => 1, 1886 can_hover => 1,
1703 @_ 1887 @_
1704 ) 1888 )
1705} 1889}
… …
1714 my ($self, $ev, $x, $y) = @_; 1898 my ($self, $ev, $x, $y) = @_;
1715 1899
1716 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1900 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1717 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1901 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1718 $self->{state} = !$self->{state}; 1902 $self->{state} = !$self->{state};
1719 $self->emit (changed => $self->{state}); 1903 $self->_emit (changed => $self->{state});
1720 } 1904 }
1721} 1905}
1722 1906
1723sub _draw { 1907sub _draw {
1724 my ($self) = @_; 1908 my ($self) = @_;
… …
1729 1913
1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1914 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1731 1915
1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1916 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733 1917
1734 glEnable GL_BLEND; 1918 my $tex = $self->{state} ? $tex[1] : $tex[0];
1919
1735 glEnable GL_TEXTURE_2D; 1920 glEnable GL_TEXTURE_2D;
1736 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1737
1738 my $tex = $self->{state} ? $tex[1] : $tex[0];
1739
1740 $tex->draw_quad (0, 0, $s, $s); 1921 $tex->draw_quad_alpha (0, 0, $s, $s);
1741
1742 glDisable GL_TEXTURE_2D; 1922 glDisable GL_TEXTURE_2D;
1743 glDisable GL_BLEND;
1744} 1923}
1745 1924
1746############################################################################# 1925#############################################################################
1747 1926
1748package CFClient::UI::Image; 1927package CFClient::UI::Image;
… …
1791 glTranslate 0, -$self->{w}, 0; 1970 glTranslate 0, -$self->{w}, 0;
1792 1971
1793 ($w, $h) = ($h, $w); 1972 ($w, $h) = ($h, $w);
1794 } 1973 }
1795 1974
1796 glEnable GL_BLEND;
1797 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798 glEnable GL_TEXTURE_2D; 1975 glEnable GL_TEXTURE_2D;
1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800 1977
1801 $tex->draw_quad (0, 0, $w, $h); 1978 $tex->draw_quad_alpha (0, 0, $w, $h);
1802 1979
1803 glDisable GL_BLEND;
1804 glDisable GL_TEXTURE_2D; 1980 glDisable GL_TEXTURE_2D;
1805} 1981}
1806 1982
1807############################################################################# 1983#############################################################################
1808 1984
… …
1997 qw(s1_slider.png s1_slider_bg.png); 2173 qw(s1_slider.png s1_slider_bg.png);
1998 2174
1999sub new { 2175sub new {
2000 my $class = shift; 2176 my $class = shift;
2001 2177
2002 # range [value, low, high, page] 2178 # range [value, low, high, page, unit]
2003 2179
2004 # TODO: 0-width page 2180 # TODO: 0-width page
2005 # TODO: req_w/h are wrong with vertical 2181 # TODO: req_w/h are wrong with vertical
2006 # TODO: calculations are off 2182 # TODO: calculations are off
2007 my $self = $class->SUPER::new ( 2183 my $self = $class->SUPER::new (
2008 fg => [1, 1, 1], 2184 fg => [1, 1, 1],
2009 active_fg => [0, 0, 0], 2185 active_fg => [0, 0, 0],
2186 bg => [0, 0, 0, 0.2],
2187 active_bg => [1, 1, 1, 0.5],
2010 range => [0, 0, 100, 10], 2188 range => [0, 0, 100, 10, 0],
2011 req_w => $::WIDTH / 80, 2189 req_w => $::WIDTH / 80,
2012 req_h => $::WIDTH / 80, 2190 req_h => $::WIDTH / 80,
2013 vertical => 0, 2191 vertical => 0,
2014 can_hover => 1, 2192 can_hover => 1,
2015 inner_pad => 5, 2193 inner_pad => 0.02,
2016 @_ 2194 @_
2017 ); 2195 );
2018 2196
2197 $self->set_value ($self->{range}[0]);
2198 $self->update;
2199
2019 $self 2200 $self
2201}
2202
2203sub set_range {
2204 my ($self, $range) = @_;
2205
2206 ($range, $self->{range}) = ($self->{range}, $range);
2207
2208 $self->update
2209 if "@$range" ne "@{$self->{range}}";
2210}
2211
2212sub set_value {
2213 my ($self, $value) = @_;
2214
2215 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2216
2217 $hi = $lo + 1 if $hi <= $lo;
2218
2219 $page = $hi - $lo if $page > $hi - $lo;
2220
2221 $value = $lo if $value < $lo;
2222 $value = $hi - $page if $value > $hi - $page;
2223
2224 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2225 if $unit;
2226
2227 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2228
2229 if ($value != $old_value) {
2230 $self->_emit (changed => $value);
2231 $self->update;
2232 }
2020} 2233}
2021 2234
2022sub size_request { 2235sub size_request {
2023 my ($self) = @_; 2236 my ($self) = @_;
2024 2237
… …
2030 2243
2031sub button_down { 2244sub button_down {
2032 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
2033 2246
2034 $self->SUPER::button_down ($ev, $x, $y); 2247 $self->SUPER::button_down ($ev, $x, $y);
2248
2249 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2250
2035 $self->mouse_motion ($ev, $x, $y); 2251 $self->mouse_motion ($ev, $x, $y);
2036} 2252}
2037 2253
2038sub mouse_motion { 2254sub mouse_motion {
2039 my ($self, $ev, $x, $y) = @_; 2255 my ($self, $ev, $x, $y) = @_;
2040 2256
2041 if ($GRAB == $self) { 2257 if ($GRAB == $self) {
2258 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2259
2260 my (undef, $lo, $hi, $page) = @{$self->{range}};
2261
2262 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2263
2264 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2265 }
2266}
2267
2268sub update {
2269 my ($self) = @_;
2270
2271 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2272 $self->set_value ($self->{range}[0]);
2273
2042 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2274 my ($value, $lo, $hi, $page) = @{$self->{range}};
2275 my $range = ($hi - $page - $lo) || 1e-100;
2043 2276
2044 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2277 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2045 2278
2046 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2279 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2047 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2280 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2048 2281
2049 $x -= $inner_pad_px; # substract the padding 2282 $value = ($value - $lo) / $range;
2050 $x = $x * ($hi - $lo) / $inner_w + $lo; 2283 $value = $value * $self->{scale} + $self->{offset};
2051 $x = $lo if $x < $lo;
2052 $x = $hi - $page if $x > $hi - $page;
2053 $self->{range}[0] = $x;
2054 2284
2055 $self->emit (changed => $x); 2285 $self->{knob_x} = $value - $knob_w * 0.5;
2056 $self->update; 2286 $self->{knob_w} = $knob_w;
2057 } 2287 });
2058}
2059 2288
2060# the inner_* stuff is for generating a padding for the slider handle, 2289 $self->SUPER::update;
2061# so that the handle doesn't leave the texture. This calculation isn't 100%
2062# correct propably, but it does the job for now
2063sub _calc_inner_pad_px {
2064 my ($self, $w) = @_;
2065 ($w / 100) * $self->{inner_pad} # % to pixels
2066} 2290}
2067 2291
2068sub _draw { 2292sub _draw {
2069 my ($self) = @_; 2293 my ($self) = @_;
2070 2294
2071 $self->SUPER::_draw (); 2295 $self->SUPER::_draw ();
2072 2296
2073 my ($w, $h) = @$self{qw(w h)}; 2297 glScale $self->{w}, $self->{h};
2074 2298
2075 if ($self->{vertical}) { 2299 if ($self->{vertical}) {
2076 # draw a vertical slider like a rotated horizontal slider 2300 # draw a vertical slider like a rotated horizontal slider
2077 2301
2302 glTranslate 1, 0, 0;
2078 glRotate 90, 0, 0, 1; 2303 glRotate 90, 0, 0, 1;
2079 glTranslate 0, -$self->{w}, 0;
2080
2081 ($w, $h) = ($h, $w);
2082 } 2304 }
2083 2305
2084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2306 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2307 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086 2308
2087 my ($value, $lo, $hi, $page) = @{$self->{range}};
2088
2089 $hi = $value + 1 if $lo == $hi;
2090
2091 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2092 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2093
2094 $page = int $page * $inner_w / ($hi - $lo);
2095 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2096
2097 $w -= $page;
2098 $page &= ~1;
2099 glTranslate $page * 0.5, 0, 0;
2100 $page ||= 2;
2101
2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2104
2105 glEnable GL_BLEND;
2106 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2107 glEnable GL_TEXTURE_2D; 2309 glEnable GL_TEXTURE_2D;
2108 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2109 2311
2110 # draw background 2312 # draw background
2111 $tex[1]->draw_quad (0, 0, $w, $h); 2313 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2112 2314
2113 # draw handle 2315 # draw handle
2114 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2316 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2115 2317
2116 glDisable GL_BLEND;
2117 glDisable GL_TEXTURE_2D; 2318 glDisable GL_TEXTURE_2D;
2118} 2319}
2320
2321#############################################################################
2322
2323package CFClient::UI::ValSlider;
2324
2325our @ISA = CFClient::UI::HBox::;
2326
2327sub new {
2328 my ($class, %arg) = @_;
2329
2330 my $range = delete $arg{range};
2331
2332 my $self = $class->SUPER::new (
2333 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2334 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2335 to_value => sub { shift },
2336 from_value => sub { shift },
2337 %arg,
2338 );
2339
2340 $self->{slider}->connect (changed => sub {
2341 my ($self, $value) = @_;
2342 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2343 $self->{parent}->emit (changed => $value);
2344 });
2345
2346# $self->{entry}->connect (changed => sub {
2347# my ($self, $value) = @_;
2348# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2349# $self->{parent}->emit (changed => $value);
2350# });
2351
2352 $self->add ($self->{slider}, $self->{entry});
2353
2354 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2355
2356 $self
2357}
2358
2359sub set_range { shift->{slider}->set_range (@_) }
2360sub set_value { shift->{slider}->set_value (@_) }
2119 2361
2120############################################################################# 2362#############################################################################
2121 2363
2122package CFClient::UI::TextView; 2364package CFClient::UI::TextView;
2123 2365
… …
2132 fontsize => 1, 2374 fontsize => 1,
2133 can_events => 0, 2375 can_events => 0,
2134 #font => default_font 2376 #font => default_font
2135 @_, 2377 @_,
2136 2378
2137 layout => (new CFClient::Layout), 2379 layout => (new CFClient::Layout 1),
2138 par => [], 2380 par => [],
2139 height => 0, 2381 height => 0,
2140 children => [ 2382 children => [
2141 (new CFClient::UI::Empty expand => 1), 2383 (new CFClient::UI::Empty expand => 1),
2142 (new CFClient::UI::Slider vertical => 1), 2384 (new CFClient::UI::Slider vertical => 1),
… …
2153 2395
2154 $self->{fontsize} = $fontsize; 2396 $self->{fontsize} = $fontsize;
2155 $self->reflow; 2397 $self->reflow;
2156} 2398}
2157 2399
2158sub text_height {
2159 my ($self, $text) = @_;
2160
2161 my $layout = $self->{layout};
2162
2163 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2164 $layout->set_width ($self->{children}[0]{w});
2165 $layout->set_text ($text);
2166
2167 ($layout->size)[1]
2168}
2169
2170sub reflow {
2171 my ($self) = @_;
2172
2173 $self->{need_reflow}++;
2174 $self->update;
2175}
2176
2177sub size_allocate { 2400sub size_allocate {
2178 my ($self, $w, $h) = @_; 2401 my ($self, $w, $h) = @_;
2179 2402
2180 $self->SUPER::size_allocate ($w, $h); 2403 $self->SUPER::size_allocate ($w, $h);
2181 2404
… …
2184 $self->{layout}->set_width ($self->{children}[0]{w}); 2407 $self->{layout}->set_width ($self->{children}[0]{w});
2185 2408
2186 $self->reflow; 2409 $self->reflow;
2187} 2410}
2188 2411
2412sub text_size {
2413 my ($self, $text, $indent) = @_;
2414
2415 my $layout = $self->{layout};
2416
2417 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2418 $layout->set_width ($self->{children}[0]{w} - $indent);
2419 $layout->set_markup ($text);
2420
2421 $layout->size
2422}
2423
2424sub reflow {
2425 my ($self) = @_;
2426
2427 $self->{need_reflow}++;
2428 $self->update;
2429}
2430
2431sub set_offset {
2432 my ($self, $offset) = @_;
2433
2434 # todo: base offset on lines or so, not on pixels
2435 $self->{children}[1]->set_value ($offset);
2436}
2437
2438sub clear {
2439 my ($self) = @_;
2440
2441 $self->{par} = [];
2442 $self->{height} = 0;
2443 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2444}
2445
2189sub add_paragraph { 2446sub add_paragraph {
2190 my ($self, $color, $text) = @_; 2447 my ($self, $color, $text, $indent) = @_;
2191 2448
2192 #TODO: intelligently "reformat" paragraph 2449 for my $line (split /\n/, $text) {
2193 2450 my ($w, $h) = $self->text_size ($line);
2194 my $height = $self->text_height ($text);
2195
2196 $self->{height} += $height; 2451 $self->{height} += $h;
2452 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2453 }
2197 2454
2198 push @{$self->{par}}, [$height, $color, $text];
2199
2200 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2455 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2201 $self->{children}[1]->update;
2202} 2456}
2203 2457
2204sub update { 2458sub update {
2205 my ($self) = @_; 2459 my ($self) = @_;
2206 2460
… …
2208 2462
2209 return unless $self->{h} > 0; 2463 return unless $self->{h} > 0;
2210 2464
2211 delete $self->{texture}; 2465 delete $self->{texture};
2212 2466
2213 $ROOT->on_refresh ($self, sub { 2467 $ROOT->on_post_alloc ($self, sub {
2468 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2469
2214 if (delete $self->{need_reflow}) { 2470 if (delete $self->{need_reflow}) {
2215 my $height = 0; 2471 my $height = 0;
2216 2472
2217 $height += $_->[0] = $self->text_height ($_->[2]) 2473 my $layout = $self->{layout};
2474
2475 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2476
2218 for @{$self->{par}}; 2477 for (@{$self->{par}}) {
2478 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2479 $layout->set_width ($W - $_->[3]);
2480 $layout->set_markup ($_->[4]);
2481 my ($w, $h) = $layout->size;
2482 $_->[0] = $w + $_->[3];
2483 $_->[1] = $h;
2484 }
2485
2486 $height += $_->[1];
2487 }
2219 2488
2220 $self->{height} = $height; 2489 $self->{height} = $height;
2221 2490
2222 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2491 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2223 2492
2224 delete $self->{texture}; 2493 delete $self->{texture};
2225 } 2494 }
2226 2495
2227 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2496 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2228 glClearColor 0, 0, 0, 0; 2497 glClearColor 0.5, 0.5, 0.5, 0;
2229 glClear GL_COLOR_BUFFER_BIT; 2498 glClear GL_COLOR_BUFFER_BIT;
2230 2499
2500 my $top = int $self->{children}[1]{range}[0];
2501
2502 my $y0 = $top;
2503 my $y1 = $top + $H;
2504
2505 my $y = 0;
2506
2507 my $layout = $self->{layout};
2508
2509 $layout->set_font ($self->{font}) if $self->{font};
2510
2231 glEnable GL_BLEND; 2511 glEnable GL_BLEND;
2512 #TODO# not correct in windows where rgba is forced off
2232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2513 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2233 glEnable GL_TEXTURE_2D;
2234 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2235
2236 my $top = int $self->{children}[1]{range}[0];
2237
2238 my $y0 = $top;
2239 my $y1 = $top + $self->{h};
2240
2241 my $y = 0;
2242
2243 my $layout = $self->{layout};
2244
2245 $layout->set_font ($self->{font}) if $self->{font};
2246 2514
2247 for my $par (@{$self->{par}}) { 2515 for my $par (@{$self->{par}}) {
2248 my $h = $par->[0]; 2516 my $h = $par->[1];
2249 2517
2250 if ($y0 < $y + $h && $y < $y1) { 2518 if ($y0 < $y + $h && $y < $y1) {
2519 $layout->set_foreground (@{ $par->[2] });
2520 $layout->set_width ($W - $par->[3]);
2251 $layout->set_text ($par->[2]); 2521 $layout->set_markup ($par->[4]);
2252 2522
2253 glColor @{ $par->[1] }; 2523 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2254 my ($W, $H) = $layout->size; 2524
2255 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2525 glRasterPos $par->[3], $y - $y0;
2526 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2256 } 2527 }
2257 2528
2258 $y += $h; 2529 $y += $h;
2259 } 2530 }
2260 2531
2261 glDisable GL_TEXTURE_2D;
2262 glDisable GL_BLEND; 2532 glDisable GL_BLEND;
2263 }; 2533 };
2264 }); 2534 });
2265} 2535}
2266 2536
2267sub _draw { 2537sub _draw {
2268 my ($self) = @_; 2538 my ($self) = @_;
2269 2539
2270 glEnable GL_BLEND;
2271 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2272 glEnable GL_TEXTURE_2D; 2540 glEnable GL_TEXTURE_2D;
2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274 glColor 1, 1, 1, 1; 2542 glColor 1, 1, 1, 1;
2275 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2543 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2276 glDisable GL_TEXTURE_2D; 2544 glDisable GL_TEXTURE_2D;
2277 glDisable GL_BLEND;
2278 2545
2279 $self->{children}[1]->draw; 2546 $self->{children}[1]->draw;
2280 2547
2281} 2548}
2282 2549
… …
2330 2597
2331sub new { 2598sub new {
2332 my $class = shift; 2599 my $class = shift;
2333 2600
2334 my $self = $class->SUPER::new ( 2601 my $self = $class->SUPER::new (
2335 state => 0, 2602 state => 0,
2336 connect_activate => \&toggle_flopper, 2603 on_activate => \&toggle_flopper,
2337 @_ 2604 @_
2338 ); 2605 );
2339 2606
2340 if ($self->{state}) {
2341 $self->{state} = 0;
2342 $self->toggle_flopper;
2343 }
2344
2345 $self 2607 $self
2346} 2608}
2347 2609
2348sub toggle_flopper { 2610sub toggle_flopper {
2349 my ($self) = @_; 2611 my ($self) = @_;
2350 2612
2351 # TODO: use animation 2613 $self->{other}->toggle_visibility;
2352 if ($self->{state} = !$self->{state}) {
2353 $CFClient::UI::ROOT->add ($self->{other});
2354 $self->{other}->move ($self->coord2global (0, $self->{h}));
2355 $self->emit ("open");
2356 } else {
2357 $CFClient::UI::ROOT->remove ($self->{other});
2358 $self->emit ("close");
2359 }
2360
2361 $self->emit (changed => $self->{state});
2362} 2614}
2363 2615
2364############################################################################# 2616#############################################################################
2365 2617
2366package CFClient::UI::Tooltip; 2618package CFClient::UI::Tooltip;
… …
2376 @_, 2628 @_,
2377 can_events => 0, 2629 can_events => 0,
2378 ) 2630 )
2379} 2631}
2380 2632
2381sub set_markup { 2633sub set_tooltip_from {
2382 my ($self, $text) = @_; 2634 my ($self, $widget) = @_;
2383 2635
2384 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2636 $self->add (new CFClient::UI::Label
2385 $self->{label}->set_markup ($text); 2637 markup => $widget->{tooltip},
2386 $self->add ($self->{label}); 2638 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2639 fontsize => 0.8,
2640 fg => [0, 0, 0, 1],
2641 ellipsise => 0,
2642 font => ($widget->{tooltip_font} || $::FONT_PROP),
2643 );
2387} 2644}
2388 2645
2389sub size_request { 2646sub size_request {
2390 my ($self) = @_; 2647 my ($self) = @_;
2391
2392 $self->child->set_max_size ($::WIDTH * 0.3);
2393 2648
2394 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2649 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2395 2650
2396 ($w + 4, $h + 4) 2651 ($w + 4, $h + 4)
2397} 2652}
… …
2403} 2658}
2404 2659
2405sub _draw { 2660sub _draw {
2406 my ($self) = @_; 2661 my ($self) = @_;
2407 2662
2408 glPushMatrix;
2409 glTranslate 0.375, 0.375; 2663 glTranslate 0.375, 0.375;
2410 2664
2411 my ($w, $h) = @$self{qw(w h)}; 2665 my ($w, $h) = @$self{qw(w h)};
2412 2666
2413 glColor 1, 0.8, 0.4; 2667 glColor 1, 0.8, 0.4;
… …
2424 glVertex 0 , $h; 2678 glVertex 0 , $h;
2425 glVertex $w, $h; 2679 glVertex $w, $h;
2426 glVertex $w, 0; 2680 glVertex $w, 0;
2427 glEnd; 2681 glEnd;
2428 2682
2429 glPopMatrix; 2683 glTranslate 2 - 0.375, 2 - 0.375;
2430
2431 glTranslate 2, 2;
2432 $self->SUPER::_draw; 2684 $self->SUPER::_draw;
2433} 2685}
2434 2686
2435############################################################################# 2687#############################################################################
2436 2688
… …
2441use CFClient::OpenGL; 2693use CFClient::OpenGL;
2442 2694
2443sub new { 2695sub new {
2444 my $class = shift; 2696 my $class = shift;
2445 2697
2446 $class->SUPER::new ( 2698 my $self = $class->SUPER::new (
2447 aspect => 1, 2699 aspect => 1,
2700 can_events => 0,
2448 @_, 2701 @_,
2449 ) 2702 );
2703
2704 if ($self->{anim} && $self->{animspeed}) {
2705 Scalar::Util::weaken (my $widget = $self);
2706
2707 $self->{timer} = Event->timer (
2708 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2709 hard => 1,
2710 interval => $self->{animspeed},
2711 cb => sub {
2712 ++$widget->{frame};
2713 $widget->update;
2714 },
2715 );
2716 }
2717
2718 $self
2450} 2719}
2451 2720
2452sub size_request { 2721sub size_request {
2453 (32, 8) 2722 (32, 8)
2454} 2723}
2455 2724
2725sub update {
2726 my ($self) = @_;
2727
2728 return unless $self->{visible};
2729
2730 $self->SUPER::update;
2731}
2732
2456sub _draw { 2733sub _draw {
2457 my ($self) = @_; 2734 my ($self) = @_;
2458 2735
2459 return unless $::CONN;#d# manage and cache textures differently 2736 return unless $::CONN;
2737
2738 my $face;
2739
2740 if ($self->{frame}) {
2741 my $anim = $::CONN->{anim}[$self->{anim}];
2742
2743 $face = $anim->[ $self->{frame} % @$anim ]
2744 if $anim && @$anim;
2745 }
2746
2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2461 2748
2462 # TODO animation
2463 if ($tex) { 2749 if ($tex) {
2464 glEnable GL_BLEND;
2465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2466 glEnable GL_TEXTURE_2D; 2750 glEnable GL_TEXTURE_2D;
2467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2468 glColor 1, 1, 1, 1; 2752 glColor 1, 1, 1, 1;
2469 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470 glDisable GL_TEXTURE_2D; 2754 glDisable GL_TEXTURE_2D;
2471 glDisable GL_BLEND;
2472 } 2755 }
2756}
2757
2758sub DESTROY {
2759 my ($self) = @_;
2760
2761 $self->{timer}->cancel
2762 if $self->{timer};
2763
2764 $self->SUPER::DESTROY;
2473} 2765}
2474 2766
2475############################################################################# 2767#############################################################################
2476 2768
2477package CFClient::UI::InventoryItem; 2769package CFClient::UI::Inventory;
2478 2770
2479our @ISA = CFClient::UI::HBox::; 2771our @ISA = CFClient::UI::ScrolledWindow::;
2480 2772
2481sub new { 2773sub new {
2482 my $class = shift; 2774 my $class = shift;
2483 2775
2484 my %args = @_;
2485
2486 my $item = $args{item};
2487
2488 my $desc = $item->{nrof} < 2
2489 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}";
2491
2492
2493 my $self = $class->SUPER::new ( 2776 my $self = $class->SUPER::new (
2494 can_hover => 1, 2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2495 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc)
2497 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498 connect_button_down => sub {
2499 my ($self, $ev, $x, $y) = @_;
2500
2501 # todo: maybe put examine on 1? but should just be a tooltip :(
2502 if ($ev->{button} == 1) {
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517 ],
2518 )->popup ($ev);
2519 }
2520
2521 1
2522 },
2523 %args
2524 );
2525 $self->add(new CFClient::UI::Face
2526 can_events => 0,
2527 face => $item->{face},
2528 anim => $item->{anim},
2529 animspeed => $item->{animspeed});
2530 $self->add(new CFClient::UI::Label
2531 can_events => 0,
2532 text => $desc);
2533
2534 $self
2535}
2536
2537#############################################################################
2538
2539package CFClient::UI::Inventory;
2540
2541our @ISA = CFClient::UI::ScrolledWindow::;
2542
2543sub new {
2544 my $class = shift;
2545
2546 my $self = $class->SUPER::new (
2547 scrolled => (new CFClient::UI::VBox),
2548 @_, 2778 @_,
2549 ); 2779 );
2550 2780
2551 $self 2781 $self
2552} 2782}
… …
2555 my ($self, $items) = @_; 2785 my ($self, $items) = @_;
2556 2786
2557 $self->{scrolled}->clear; 2787 $self->{scrolled}->clear;
2558 return unless $items; 2788 return unless $items;
2559 2789
2560 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2790 my @items = sort {
2791 ($a->{type} <=> $b->{type})
2792 or ($a->{name} cmp $b->{name})
2793 } @$items;
2561 2794
2562 $self->{real_items} = \@items; 2795 $self->{real_items} = \@items;
2563 2796
2797 my $row = 0;
2564 for my $item (@items) { 2798 for my $item (@items) {
2565 my $desc = $item->{nrof} < 2 2799 CFClient::Item::update_widgets $item;
2566 ? $item->{name}
2567 : "$item->{nrof} $item->{name_pl}";
2568 2800
2569 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2570 } 2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2571 2804
2572# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2805 $row++;
2806 }
2573} 2807}
2574 2808
2575sub size_request { 2809sub size_request {
2576 my ($self) = @_; 2810 my ($self) = @_;
2577 ($self->{req_w}, $self->{req_h}); 2811 ($self->{req_w}, $self->{req_h});
… …
2617 2851
2618# popup given the event (must be a mouse button down event currently) 2852# popup given the event (must be a mouse button down event currently)
2619sub popup { 2853sub popup {
2620 my ($self, $ev) = @_; 2854 my ($self, $ev) = @_;
2621 2855
2622 $self->emit ("popdown"); 2856 $self->_emit ("popdown");
2623 2857
2624 # maybe save $GRAB? must be careful about events... 2858 # maybe save $GRAB? must be careful about events...
2625 $GRAB = $self; 2859 $GRAB = $self;
2626 $self->{button} = $ev->{button}; 2860 $self->{button} = $ev->{button};
2627 2861
… …
2642 2876
2643 if ($ev->{button} == $self->{button}) { 2877 if ($ev->{button} == $self->{button}) {
2644 undef $GRAB; 2878 undef $GRAB;
2645 $self->hide; 2879 $self->hide;
2646 2880
2647 $self->emit ("popdown"); 2881 $self->_emit ("popdown");
2648 $self->{hover}[1]->() if $self->{hover}; 2882 $self->{hover}[1]->() if $self->{hover};
2649 } 2883 }
2650} 2884}
2651 2885
2652############################################################################# 2886#############################################################################
2653 2887
2654package CFClient::UI::Root; 2888package CFClient::UI::Statusbox;
2655 2889
2656our @ISA = CFClient::UI::Container::; 2890our @ISA = CFClient::UI::VBox::;
2657
2658use CFClient::OpenGL;
2659 2891
2660sub new { 2892sub new {
2661 my $class = shift; 2893 my $class = shift;
2662 2894
2663 $class->SUPER::new ( 2895 $class->SUPER::new (
2896 fontsize => 0.8,
2664 @_, 2897 @_,
2665 ) 2898 )
2666} 2899}
2667 2900
2901sub reorder {
2902 my ($self) = @_;
2903 my $NOW = time;
2904
2905 while (my ($k, $v) = each %{ $self->{item} }) {
2906 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2907 }
2908
2909 my @widgets;
2910
2911 my @items = sort {
2912 $a->{pri} <=> $b->{pri}
2913 or $b->{id} <=> $a->{id}
2914 } values %{ $self->{item} };
2915
2916 my $count = 10 + 1;
2917 for my $item (@items) {
2918 last unless --$count;
2919
2920 push @widgets, $item->{label} ||= do {
2921 # TODO: doesn't handle markup well (read as: at all)
2922 my $short = $item->{count} > 1
2923 ? "<b>$item->{count} ×</b> $item->{text}"
2924 : $item->{text};
2925
2926 for ($short) {
2927 s/^\s+//;
2928 s/\s+/ /g;
2929 }
2930
2931 new CFClient::UI::Label
2932 markup => $short,
2933 tooltip => $item->{tooltip},
2934 tooltip_font => $::FONT_PROP,
2935 tooltip_width => 0.67,
2936 fontsize => $item->{fontsize} || $self->{fontsize},
2937 max_w => $::WIDTH * 0.44,
2938 fg => $item->{fg},
2939 can_events => 1,
2940 can_hover => 1
2941 };
2942 }
2943
2944 $self->clear;
2945 $self->SUPER::add (reverse @widgets);
2946}
2947
2948sub add {
2949 my ($self, $text, %arg) = @_;
2950
2951 $text =~ s/^\s+//;
2952 $text =~ s/\s+$//;
2953
2954 return unless $text;
2955
2956 my $timeout = time + ((delete $arg{timeout}) || 60);
2957
2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2959
2960 if (my $item = $self->{item}{$group}) {
2961 if ($item->{text} eq $text) {
2962 $item->{count}++;
2963 } else {
2964 $item->{count} = 1;
2965 $item->{text} = $item->{tooltip} = $text;
2966 }
2967 $item->{id} = ++$self->{id};
2968 $item->{timeout} = $timeout;
2969 delete $item->{label};
2970 } else {
2971 $self->{item}{$group} = {
2972 id => ++$self->{id},
2973 text => $text,
2974 timeout => $timeout,
2975 tooltip => $text,
2976 fg => [0.8, 0.8, 0.8, 0.8],
2977 pri => 0,
2978 count => 1,
2979 %arg,
2980 };
2981 }
2982
2983 $self->reorder;
2984}
2985
2986sub reconfigure {
2987 my ($self) = @_;
2988
2989 delete $_->{label}
2990 for values %{ $self->{item} || {} };
2991
2992 $self->reorder;
2993 $self->SUPER::reconfigure;
2994}
2995
2996#############################################################################
2997
2998package CFClient::UI::Root;
2999
3000our @ISA = CFClient::UI::Container::;
3001
3002use CFClient::OpenGL;
3003
3004sub new {
3005 my $class = shift;
3006
3007 $class->SUPER::new (
3008 visible => 1,
3009 @_,
3010 )
3011}
3012
2668sub configure { 3013sub configure {
2669 my ($self, $x, $y, $w, $h) = @_; 3014 my ($self, $x, $y, $w, $h) = @_;
2670 3015
2671 $self->{w} = $w; 3016 $self->{w} = $w;
2672 $self->{h} = $h; 3017 $self->{h} = $h;
… …
2686} 3031}
2687 3032
2688sub size_allocate { 3033sub size_allocate {
2689 my ($self, $w, $h) = @_; 3034 my ($self, $w, $h) = @_;
2690 3035
2691 my $old_w = $self->{old_w};
2692 my $old_h = $self->{old_h};
2693
2694 if ($old_w && $old_h) {
2695 for my $child ($self->children) {
2696 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2697 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2698 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2699 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2700 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2701 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2702 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2703 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2704 }
2705 }
2706
2707 for my $child ($self->children) { 3036 for my $child ($self->children) {
2708 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2709 3038
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3040 if exists $child->{req_x};
3041
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3043 if exists $child->{req_y};
3044
3045 $X = $self->{user_x} if exists $self->{user_x};
3046 $Y = $self->{user_y} if exists $self->{user_y};
3047
2710 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2711 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050
2712 $child->configure ($X, $Y, $W, $H); 3051 $child->configure ($X, $Y, $W, $H);
2713 } 3052 }
2714
2715 $self->{old_w} = $w;
2716 $self->{old_h} = $h;
2717} 3053}
2718 3054
2719sub coord2local { 3055sub coord2local {
2720 my ($self, $x, $y) = @_; 3056 my ($self, $x, $y) = @_;
2721 3057
… …
2734 $self->check_size; 3070 $self->check_size;
2735 $::WANT_REFRESH++; 3071 $::WANT_REFRESH++;
2736} 3072}
2737 3073
2738sub add { 3074sub add {
2739 my ($self, $child) = @_; 3075 my ($self, @children) = @_;
2740 3076
3077 for (my @widgets = @children; my $w = pop @widgets; ) {
3078 push @widgets, $w->children;
3079 $w->{root} = $self;
3080 $w->{visible} = $self->{visible} + 1;
3081 }
3082
3083 for my $child (@children) {
3084 $child->{is_toplevel} = 1;
3085
2741 # integerise window positions 3086 # integerise window positions
2742 $child->{x} = int $child->{x}; 3087 $child->{x} = int $child->{x};
2743 $child->{y} = int $child->{y}; 3088 $child->{y} = int $child->{y};
3089 }
2744 3090
2745 $self->SUPER::add ($child); 3091 $self->SUPER::add (@children);
3092}
3093
3094sub remove {
3095 my ($self, @children) = @_;
3096
3097 $self->SUPER::remove (@children);
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 $w->set_invisible;
3103 }
2746} 3104}
2747 3105
2748sub on_refresh { 3106sub on_refresh {
2749 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2750 3108
2751 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2752} 3110}
2753 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
2754sub draw { 3118sub draw {
2755 my ($self) = @_; 3119 my ($self) = @_;
2756 3120
3121 while ($self->{refresh_hook}) {
3122 $_->()
3123 for values %{delete $self->{refresh_hook}};
3124 }
3125
2757 if ($self->{check_size}) { 3126 if ($self->{check_size}) {
2758 my @queue = ([], []); 3127 my @queue;
2759 3128
2760 for (;;) { 3129 for (;;) {
2761 if ($self->{check_size}) { 3130 if ($self->{check_size}) {
2762 # heuristic: check containers last 3131 #TODO use array-of-depth approach
2763 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3132
3133 @queue = sort { $a->{visible} <=> $b->{visible} }
2764 for values %{delete $self->{check_size}} 3134 @queue, values %{delete $self->{check_size}};
2765 } 3135 }
2766 3136
2767 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3137 my $widget = pop @queue || last;
3138
3139 defined $widget->{visible} or last; # do not resize invisible widgets
2768 3140
2769 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3141 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2770 ? @$widget{qw(user_w user_h)} 3142 ? @$widget{qw(user_w user_h)}
2771 : $widget->size_request; 3143 : $widget->size_request;
2772 3144
3145 if (delete $widget->{force_alloc}
2773 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 3146 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3147 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3148
2774 $widget->{req_w} = $w; 3149 $widget->{req_w} = $w;
2775 $widget->{req_h} = $h; 3150 $widget->{req_h} = $h;
2776 3151
2777 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 3152 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2778 3153
2779 $widget->{parent}->check_size 3154 $widget->{parent}->check_size
2780 if $widget->{parent}; 3155 if $widget->{parent};
2781 } 3156 }
2782 } 3157 }
… …
2784 3159
2785 while ($self->{size_alloc}) { 3160 while ($self->{size_alloc}) {
2786 for (values %{delete $self->{size_alloc}}) { 3161 for (values %{delete $self->{size_alloc}}) {
2787 my ($widget, $w, $h) = @$_; 3162 my ($widget, $w, $h) = @$_;
2788 3163
3164 $w = 0 if $w < 0;
3165 $h = 0 if $h < 0;
3166
2789 $widget->{w} = $w; 3167 $widget->{w} = $w;
2790 $widget->{h} = $h; 3168 $widget->{h} = $h;
2791 $widget->size_allocate ($w, $h);
2792 $widget->emit (size_allocate => $w, $h); 3169 $widget->emit (size_allocate => $w, $h);
2793 } 3170 }
2794 } 3171 }
2795 3172
2796 while ($self->{refresh_hook}) { 3173 while ($self->{post_alloc_hook}) {
2797 $_->() 3174 $_->()
2798 for values %{delete $self->{refresh_hook}}; 3175 for values %{delete $self->{post_alloc_hook}};
2799 } 3176 }
2800 3177
2801 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3178 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2802 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3179 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2803 glClear GL_COLOR_BUFFER_BIT; 3180 glClear GL_COLOR_BUFFER_BIT;
2804 3181
2805 glMatrixMode GL_PROJECTION; 3182 glMatrixMode GL_PROJECTION;
2806 glLoadIdentity; 3183 glLoadIdentity;
2807 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3184 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2808 glMatrixMode GL_MODELVIEW; 3185 glMatrixMode GL_MODELVIEW;
2809 glLoadIdentity; 3186 glLoadIdentity;
2810 3187
2811 $self->_draw; 3188 $self->_draw;
2812} 3189}
… …
2814############################################################################# 3191#############################################################################
2815 3192
2816package CFClient::UI; 3193package CFClient::UI;
2817 3194
2818$ROOT = new CFClient::UI::Root; 3195$ROOT = new CFClient::UI::Root;
2819$TOOLTIP = new CFClient::UI::Tooltip; 3196$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2820 3197
28211 31981
2822 3199

Diff Legend

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