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.243 by root, Sat May 27 20:46:54 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
164} 226}
165 227
166sub destroy { 228sub destroy {
167 my ($self) = @_; 229 my ($self) = @_;
… …
170 %$self = (); 232 %$self = ();
171} 233}
172 234
173sub show { 235sub show {
174 my ($self) = @_; 236 my ($self) = @_;
175
176 return if $self->{parent}; 237 return if $self->{parent};
177 238
178 $CFClient::UI::ROOT->add ($self); 239 $CFClient::UI::ROOT->add ($self);
179} 240}
180 241
181sub hide { 242sub show_centered {
182 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};
183 262
184 undef $GRAB if $GRAB == $self; 263 undef $GRAB if $GRAB == $self;
185 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;
186 276
187 $self->{parent}->remove ($self) 277 $self->{parent}->remove ($self)
188 if $self->{parent}; 278 if $self->{parent};
189} 279}
190 280
… …
240 330
241sub size_allocate { 331sub size_allocate {
242 # nothing to be done 332 # nothing to be done
243} 333}
244 334
335sub reconfigure {
336 my ($self) = @_;
337
338 $self->check_size (1);
339 $self->update;
340}
341
245sub children { 342sub 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} 343}
259 344
260sub set_max_size { 345sub set_max_size {
261 my ($self, $w, $h) = @_; 346 my ($self, $w, $h) = @_;
262 347
263 delete $self->{max_w}; $self->{max_w} = $w if $w; 348 delete $self->{max_w}; $self->{max_w} = $w if $w;
264 delete $self->{max_h}; $self->{max_h} = $h if $h; 349 delete $self->{max_h}; $self->{max_h} = $h if $h;
350}
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 }
265} 366}
266 367
267# translate global coordinates to local coordinate system 368# translate global coordinates to local coordinate system
268sub coord2local { 369sub coord2local {
269 my ($self, $x, $y) = @_; 370 my ($self, $x, $y) = @_;
… …
284 return if $FOCUS == $self; 385 return if $FOCUS == $self;
285 return unless $self->{can_focus}; 386 return unless $self->{can_focus};
286 387
287 my $focus = $FOCUS; $FOCUS = $self; 388 my $focus = $FOCUS; $FOCUS = $self;
288 389
289 $self->emit (focus_in => $focus); 390 $self->_emit (focus_in => $focus);
290 391
291 $focus->update if $focus; 392 $focus->update if $focus;
292 $FOCUS->update; 393 $FOCUS->update;
293} 394}
294 395
… …
297 398
298 return unless $FOCUS == $self; 399 return unless $FOCUS == $self;
299 400
300 my $focus = $FOCUS; undef $FOCUS; 401 my $focus = $FOCUS; undef $FOCUS;
301 402
302 $self->emit (focus_out => $focus); 403 $self->_emit (focus_out => $focus);
303 404
304 $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;
305} 409}
306 410
307sub mouse_motion { } 411sub mouse_motion { }
308sub button_up { } 412sub button_up { }
309sub key_down { } 413sub key_down { }
310sub key_up { } 414sub key_up { }
311 415
312sub button_down { 416sub button_down {
313 my ($self, $ev, $x, $y) = @_; 417 my ($self, $ev, $x, $y) = @_;
314 418
315 $self->focus_in; 419 $self->focus_in;
… …
349 if ($ENV{PCLIENT_DEBUG}) { 453 if ($ENV{PCLIENT_DEBUG}) {
350 glPushMatrix; 454 glPushMatrix;
351 glColor 1, 1, 0, 1; 455 glColor 1, 1, 0, 1;
352 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353 glBegin GL_LINE_LOOP; 457 glBegin GL_LINE_LOOP;
354 glVertex 0 , 0; 458 glVertex 0 , 0;
355 glVertex $self->{w}, 0; 459 glVertex $self->{w} - 1, 0;
356 glVertex $self->{w}, $self->{h}; 460 glVertex $self->{w} - 1, $self->{h} - 1;
357 glVertex 0 , $self->{h}; 461 glVertex 0 , $self->{h} - 1;
358 glEnd; 462 glEnd;
359 glPopMatrix; 463 glPopMatrix;
360 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;
361 } 465 }
362} 466}
363 467
364sub _draw { 468sub _draw {
365 my ($self) = @_; 469 my ($self) = @_;
… …
380} 484}
381 485
382sub set_parent { 486sub set_parent {
383 my ($self, $parent) = @_; 487 my ($self, $parent) = @_;
384 488
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
386 Scalar::Util::weaken ($self->{parent} = $parent); 489 Scalar::Util::weaken ($self->{parent} = $parent);
490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
494 # TODO: req_w _does_change after ->reconfigure
495 $self->check_size
496 unless exists $self->{req_w};
497
498 $self->show;
387} 499}
388 500
389sub check_size { 501sub check_size {
390 my ($self) = @_; 502 my ($self, $forced) = @_;
391 503
504 $self->{force_alloc} = 1 if $forced;
392 $CFClient::UI::ROOT->{check_size}{$self} = $self; 505 $CFClient::UI::ROOT->{check_size}{$self} = $self;
393} 506}
394 507
395sub update { 508sub update {
396 my ($self) = @_; 509 my ($self) = @_;
… …
403 my ($self, $signal, $cb) = @_; 516 my ($self, $signal, $cb) = @_;
404 517
405 push @{ $self->{signal_cb}{$signal} }, $cb; 518 push @{ $self->{signal_cb}{$signal} }, $cb;
406} 519}
407 520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
408sub emit { 527sub emit {
409 my ($self, $signal, @args) = @_; 528 my ($self, $signal, @args) = @_;
410 529
411 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
412} 532}
413 533
414sub DESTROY { 534sub DESTROY {
415 my ($self) = @_; 535 my ($self) = @_;
416 536
537 delete $WIDGET{$self+0};
417 #$self->deactivate; 538 #$self->deactivate;
418} 539}
419 540
420############################################################################# 541#############################################################################
421 542
… …
430 my $class = shift; 551 my $class = shift;
431 552
432 # range [value, low, high, page] 553 # range [value, low, high, page]
433 554
434 $class->SUPER::new ( 555 $class->SUPER::new (
435 bg => [0, 0, 0, 0.2], 556 #bg => [0, 0, 0, 0.2],
436 active_bg => [1, 1, 1, 0.5], 557 #active_bg => [1, 1, 1, 0.5],
437 @_ 558 @_
438 ) 559 )
439} 560}
440 561
441sub _draw { 562sub _draw {
442 my ($self) = @_; 563 my ($self) = @_;
443 564
565 my $color = $FOCUS == $self && $self->{active_bg}
566 ? $self->{active_bg}
567 : $self->{bg};
568
569 if ($color && (@$color < 4 || $color->[3])) {
444 my ($w, $h) = @$self{qw(w h)}; 570 my ($w, $h) = @$self{qw(w h)};
445 571
446 glEnable GL_BLEND; 572 glEnable GL_BLEND;
447 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
448 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 574 glColor @$color;
449 575
450 glBegin GL_QUADS; 576 glBegin GL_QUADS;
451 glVertex 0 , 0; 577 glVertex 0 , 0;
452 glVertex 0 , $h; 578 glVertex 0 , $h;
453 glVertex $w, $h; 579 glVertex $w, $h;
454 glVertex $w, 0; 580 glVertex $w, 0;
455 glEnd; 581 glEnd;
456 582
457 glDisable GL_BLEND; 583 glDisable GL_BLEND;
584 }
458} 585}
459 586
460############################################################################# 587#############################################################################
461 588
462package CFClient::UI::Empty; 589package CFClient::UI::Empty;
… …
506 $self->{children} = [ 633 $self->{children} = [
507 sort { $a->{z} <=> $b->{z} } 634 sort { $a->{z} <=> $b->{z} }
508 @{$self->{children}}, @widgets 635 @{$self->{children}}, @widgets
509 ]; 636 ];
510 637
511 $_->check_size 638 $self->check_size (1);
512 for @widgets;
513
514 $self->update; 639 $self->update;
515} 640}
516 641
517sub children { 642sub children {
518 @{ $_[0]{children} } 643 @{ $_[0]{children} }
… …
524 delete $child->{parent}; 649 delete $child->{parent};
525 $child->hide; 650 $child->hide;
526 651
527 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
528 653
529 $self->check_size; 654 $self->check_size (1);
530 $self->update; 655 $self->update;
531} 656}
532 657
533sub clear { 658sub clear {
534 my ($self) = @_; 659 my ($self) = @_;
… …
625} 750}
626 751
627sub update { 752sub update {
628 my ($self) = @_; 753 my ($self) = @_;
629 754
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 755 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 756 $self->SUPER::update;
632} 757}
633 758
634sub size_allocate { 759sub size_allocate {
635 my ($self, $w, $h) = @_; 760 my ($self, $w, $h) = @_;
… …
648 $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 {
649 glClearColor 0, 0, 0, 0; 774 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 775 glClear GL_COLOR_BUFFER_BIT;
651 776
652 $self->_render; 777 $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 }; 778 };
661} 779}
662 780
663sub _draw { 781sub _draw {
664 my ($self) = @_; 782 my ($self) = @_;
… …
666 my ($w, $h) = ($self->w, $self->h); 784 my ($w, $h) = ($self->w, $self->h);
667 785
668 my $tex = $self->{texture} 786 my $tex = $self->{texture}
669 or return; 787 or return;
670 788
671 glEnable GL_BLEND;
672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 789 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 790 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1; 791 glColor 1, 1, 1, 1;
676 792
677 $tex->draw_quad (0, 0, $w, $h); 793 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678 794
679 glDisable GL_BLEND;
680 glDisable GL_TEXTURE_2D; 795 glDisable GL_TEXTURE_2D;
681} 796}
682 797
683############################################################################# 798#############################################################################
684 799
685package CFClient::UI::ViewPort; 800package CFClient::UI::ViewPort;
686 801
687our @ISA = CFClient::UI::Window::; 802our @ISA = CFClient::UI::Window::;
688 803
804sub new {
805 my $class = shift;
806
807 $class->SUPER::new (
808 scroll_x => 0,
809 scroll_y => 1,
810 @_,
811 )
812}
813
689sub size_request { 814sub size_request {
690 my ($self) = @_; 815 my ($self) = @_;
691 816
692 @$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)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 818
695 @$self{qw(child_w child_h)} 819 @$self{qw(child_w child_h)}
696} 820}
697 821
698sub size_allocate { 822sub size_allocate {
699 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
700 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);
701 $self->update; 829 $self->update;
702} 830}
703 831
704sub set_offset { 832sub set_offset {
705 my ($self, $x, $y) = @_; 833 my ($self, $x, $y) = @_;
… …
756 my $class = shift; 884 my $class = shift;
757 885
758 my $self; 886 my $self;
759 887
760 my $slider = new CFClient::UI::Slider 888 my $slider = new CFClient::UI::Slider
761 vertical => 1, 889 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 890 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 891 on_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 892 $self->{vp}->set_offset (0, $_[1]);
765 }, 893 },
766 ; 894 ;
767 895
768 $self = $class->SUPER::new ( 896 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 897 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 898 slider => $slider,
771 @_, 899 @_,
772 ); 900 );
773 901
774 $self->{vp}->add ($self->{scrolled}); 902 $self->{vp}->add ($self->{scrolled});
… …
776 $self->add ($self->{slider}); 904 $self->add ($self->{slider});
777 905
778 $self 906 $self
779} 907}
780 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]);
926}
927
781#TODO# update range on size_allocate depeneing on child 928#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 929# update viewport offset on scroll
783 930
784############################################################################# 931#############################################################################
785 932
786package CFClient::UI::Frame; 933package CFClient::UI::Frame;
… …
790use CFClient::OpenGL; 937use CFClient::OpenGL;
791 938
792sub new { 939sub new {
793 my $class = shift; 940 my $class = shift;
794 941
795 my $self = $class->SUPER::new ( 942 $class->SUPER::new (
796 bg => [1, 1, 1, 1], 943 bg => undef,
797 border_bg => [1, 1, 1, 1],
798 border => 0.8,
799 @_ 944 @_,
800 ); 945 )
801
802 $self
803} 946}
804 947
805sub _draw { 948sub _draw {
806 my ($self) = @_; 949 my ($self) = @_;
807 950
808 my ($w, $h) = ($self->{w}, $self->{h}); 951 if ($self->{bg}) {
952 my ($w, $h) = @$self{qw(w h)};
809 953
810 glEnable GL_BLEND; 954 glEnable GL_BLEND;
811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 955 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812 glEnable GL_TEXTURE_2D; 956 glColor @{ $self->{bg} };
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 957
815# glBegin GL_QUADS; 958 glBegin GL_QUADS;
816# glColor 0, 0, 0, 0;
817# glVertex 0 , 0; 959 glVertex 0 , 0;
818# glVertex 0 , $h; 960 glVertex 0 , $h;
819# glVertex $w, $h; 961 glVertex $w, $h;
820# glVertex $w, 0; 962 glVertex $w, 0;
821# glEnd; 963 glEnd;
822 964
823
824 $self->child->draw;
825 glDisable GL_BLEND; 965 glDisable GL_BLEND;
826 glDisable GL_TEXTURE_2D; 966 }
967
968 $self->SUPER::_draw;
827} 969}
828 970
829############################################################################# 971#############################################################################
830 972
831package CFClient::UI::FancyFrame; 973package CFClient::UI::FancyFrame;
… …
842 my $class = shift; 984 my $class = shift;
843 985
844 # TODO: user_x, user_y, overwrite moveto? 986 # TODO: user_x, user_y, overwrite moveto?
845 987
846 my $self = $class->SUPER::new ( 988 my $self = $class->SUPER::new (
847 bg => [1, 1, 1, 1], 989 bg => [1, 1, 1, 1],
848 border_bg => [1, 1, 1, 1], 990 border_bg => [1, 1, 1, 1],
849 border => 0.6, 991 border => 0.6,
992 is_toplevel => 1,
850 can_events => 1, 993 can_events => 1,
851 @_ 994 @_
852 ); 995 );
853 996
854 $self->{title} &&= new CFClient::UI::Label 997 $self->{title} &&= new CFClient::UI::Label
855 align => 0, 998 align => 0,
… …
879 my ($self, $w, $h) = @_; 1022 my ($self, $w, $h) = @_;
880 1023
881 $h -= List::Util::max 0, $self->border * 2; 1024 $h -= List::Util::max 0, $self->border * 2;
882 $w -= List::Util::max 0, $self->border * 2; 1025 $w -= List::Util::max 0, $self->border * 2;
883 1026
884 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1027 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
885 if $self->{title}; 1028 if $self->{title};
886 1029
887 $self->child->configure ($self->border, $self->border, $w, $h); 1030 $self->child->configure ($self->border, $self->border, $w, $h);
888} 1031}
889 1032
… …
908 my ($ev, $x, $y) = @_; 1051 my ($ev, $x, $y) = @_;
909 1052
910 my $dx = $ev->{x} - $ox; 1053 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy; 1054 my $dy = $ev->{y} - $oy;
912 1055
1056 $self->{user_x} = $wx + $dx * $mx;
1057 $self->{user_y} = $wy + $dy * $my;
913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1060 $self->move ($self->{user_x}, $self->{user_y});
916 $self->check_size; 1061 $self->check_size;
917 }; 1062 };
918 1063
919 } elsif ($lr ^ $td) { 1064 } elsif ($lr ^ $td) {
920 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1065 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
923 $self->{motion} = sub { 1068 $self->{motion} = sub {
924 my ($ev, $x, $y) = @_; 1069 my ($ev, $x, $y) = @_;
925 1070
926 ($x, $y) = ($ev->{x}, $ev->{y}); 1071 ($x, $y) = ($ev->{x}, $ev->{y});
927 1072
928 $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});
929 $self->update; 1076 $self->update;
930 }; 1077 };
931 } 1078 }
932} 1079}
933 1080
… …
947 my ($self) = @_; 1094 my ($self) = @_;
948 1095
949 my ($w, $h ) = ($self->{w}, $self->{h}); 1096 my ($w, $h ) = ($self->{w}, $self->{h});
950 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1097 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951 1098
952 glEnable GL_BLEND;
953 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954 glEnable GL_TEXTURE_2D; 1099 glEnable GL_TEXTURE_2D;
955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1100 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956 1101
957 my $border = $self->border; 1102 my $border = $self->border;
958 1103
959 glColor @{ $self->{border_bg} }; 1104 glColor @{ $self->{border_bg} };
960 $tex[1]->draw_quad (0, 0, $w, $border); 1105 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
961 $tex[3]->draw_quad (0, $border, $border, $ch); 1106 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1107 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1108 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964 1109
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1110 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966 my $bg = $tex[0]; 1111 my $bg = $tex[0];
967 1112
968 # TODO: repeat texture not scale 1113 # TODO: repeat texture not scale
… …
972 glColor @{ $self->{bg} }; 1117 glColor @{ $self->{bg} };
973 1118
974 $bg->{s} = $rep_x; 1119 $bg->{s} = $rep_x;
975 $bg->{t} = $rep_y; 1120 $bg->{t} = $rep_y;
976 $bg->{wrap_mode} = 1; 1121 $bg->{wrap_mode} = 1;
977 $bg->draw_quad ($border, $border, $cw, $ch); 1122 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123 }
978 1124
979 glDisable GL_TEXTURE_2D; 1125 glDisable GL_TEXTURE_2D;
980 glDisable GL_BLEND;
981 }
982 1126
983 $self->{title}->draw if $self->{title}; 1127 $self->{title}->draw if $self->{title};
984 1128
985 $self->child->draw; 1129 $self->child->draw;
986} 1130}
… …
998sub new { 1142sub new {
999 my $class = shift; 1143 my $class = shift;
1000 1144
1001 $class->SUPER::new ( 1145 $class->SUPER::new (
1002 col_expand => [], 1146 col_expand => [],
1003 @_ 1147 @_,
1004 ) 1148 )
1149}
1150
1151sub children {
1152 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1005} 1153}
1006 1154
1007sub add { 1155sub add {
1008 my ($self, $x, $y, $child) = @_; 1156 my ($self, $x, $y, $child) = @_;
1009 1157
1010 $child->set_parent ($self); 1158 $child->set_parent ($self);
1011 $self->{children}[$y][$x] = $child; 1159 $self->{children}[$y][$x] = $child;
1012 1160
1013 $child->check_size; 1161 $self->check_size (1);
1014} 1162}
1015 1163
1016sub children {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018}
1019
1020# 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?
1021sub clear { 1165sub clear {
1022 my ($self) = @_; 1166 my ($self) = @_;
1023 1167
1024 my @children = $self->children; 1168 my @children = $self->children;
1025 delete $self->{children}; 1169 delete $self->{children};
… …
1027 for (@children) { 1171 for (@children) {
1028 delete $_->{parent}; 1172 delete $_->{parent};
1029 $_->hide; 1173 $_->hide;
1030 } 1174 }
1031 1175
1176 $self->check_size (1);
1032 $self->update; 1177 $self->update;
1033} 1178}
1034 1179
1035sub get_wh { 1180sub get_wh {
1036 my ($self) = @_; 1181 my ($self) = @_;
… …
1068sub size_allocate { 1213sub size_allocate {
1069 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1070 1215
1071 my ($ws, $hs) = $self->get_wh; 1216 my ($ws, $hs) = $self->get_wh;
1072 1217
1073 my $req_w = sum @$ws; 1218 my $req_w = (sum @$ws) || 1;
1074 my $req_h = sum @$hs; 1219 my $req_h = (sum @$hs) || 1;
1075 1220
1076 # TODO: nicer code && do row_expand 1221 # TODO: nicer code && do row_expand
1077 my @col_expand = @{$self->{col_expand}}; 1222 my @col_expand = @{$self->{col_expand}};
1078 @col_expand = (1) x @$ws unless @col_expand; 1223 @col_expand = (1) x @$ws unless @col_expand;
1079 my $col_expand = (sum @col_expand) || 1; 1224 my $col_expand = (sum @col_expand) || 1;
… …
1213} 1358}
1214 1359
1215sub size_allocate { 1360sub size_allocate {
1216 my ($self, $w, $h) = @_; 1361 my ($self, $w, $h) = @_;
1217 1362
1363 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1364
1218 my $children = $self->{children}; 1365 my $children = $self->{children};
1219 1366
1220 my @h = map $_->{req_h}, @$children; 1367 my @h = map $_->{req_h}, @$children;
1221 1368
1222 my $req_h = List::Util::sum @h; 1369 my $req_h = List::Util::sum @h;
… …
1251 1398
1252############################################################################# 1399#############################################################################
1253 1400
1254package CFClient::UI::Label; 1401package CFClient::UI::Label;
1255 1402
1256our @ISA = CFClient::UI::Base::; 1403our @ISA = CFClient::UI::DrawBG::;
1257 1404
1258use CFClient::OpenGL; 1405use CFClient::OpenGL;
1259 1406
1260sub new { 1407sub new {
1261 my ($class, %arg) = @_; 1408 my ($class, %arg) = @_;
1262 1409
1263 my $self = $class->SUPER::new ( 1410 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1411 fg => [1, 1, 1],
1412 #bg => none
1413 #active_bg => none
1265 #font => default_font 1414 #font => default_font
1415 #text => initial text
1416 #markup => initial narkup
1417 #max_w => maximum pixel width
1418 ellipsise => 3, # end
1419 layout => (new CFClient::Layout),
1266 fontsize => 1, 1420 fontsize => 1,
1267 text => "",
1268 align => -1, 1421 align => -1,
1269 valign => -1, 1422 valign => -1,
1270 padding => 2, 1423 padding => 2,
1271 layout => new CFClient::Layout,
1272 can_events => 0, 1424 can_events => 0,
1273 %arg 1425 %arg
1274 ); 1426 );
1275 1427
1276 if (exists $self->{template}) { 1428 if (exists $self->{template}) {
1277 my $layout = new CFClient::Layout; 1429 my $layout = new CFClient::Layout;
1278 $layout->set_text (delete $self->{template}); 1430 $layout->set_text (delete $self->{template});
1279 $self->{template} = $layout; 1431 $self->{template} = $layout;
1280 } 1432 }
1281 1433
1282 $self->set_text (delete $self->{text}) if exists $self->{text}; 1434 if (exists $self->{markup}) {
1283 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1435 $self->set_markup (delete $self->{markup});
1436 } else {
1437 $self->set_text (delete $self->{text});
1438 }
1284 1439
1285 $self 1440 $self
1286} 1441}
1287 1442
1288sub escape { 1443sub escape($) {
1289 local $_ = $_[1]; 1444 local $_ = $_[0];
1290 1445
1291 s/&/&amp;/g; 1446 s/&/&amp;/g;
1292 s/>/&gt;/g; 1447 s/>/&gt;/g;
1293 s/</&lt;/g; 1448 s/</&lt;/g;
1294 1449
1295 $_[1] 1450 $_
1296} 1451}
1297 1452
1298sub update { 1453sub update {
1299 my ($self) = @_; 1454 my ($self) = @_;
1300 1455
… …
1306 my ($self, $text) = @_; 1461 my ($self, $text) = @_;
1307 1462
1308 return if $self->{text} eq "T$text"; 1463 return if $self->{text} eq "T$text";
1309 $self->{text} = "T$text"; 1464 $self->{text} = "T$text";
1310 1465
1466 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1311 $self->{layout}->set_text ($text); 1467 $self->{layout}->set_text ($text);
1312 1468
1313 $self->update; 1469 $self->update;
1314 $self->check_size; 1470 $self->check_size;
1315} 1471}
… …
1318 my ($self, $markup) = @_; 1474 my ($self, $markup) = @_;
1319 1475
1320 return if $self->{text} eq "M$markup"; 1476 return if $self->{text} eq "M$markup";
1321 $self->{text} = "M$markup"; 1477 $self->{text} = "M$markup";
1322 1478
1479 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480
1481 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1323 $self->{layout}->set_markup ($markup); 1482 $self->{layout}->set_markup ($markup);
1324 1483
1325 $self->update; 1484 $self->update;
1326 $self->check_size; 1485 $self->check_size;
1327} 1486}
… …
1329sub size_request { 1488sub size_request {
1330 my ($self) = @_; 1489 my ($self) = @_;
1331 1490
1332 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1491 $self->{layout}->set_font ($self->{font}) if $self->{font};
1333 $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});
1334 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1495 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1335 1496
1336 my ($w, $h) = $self->{layout}->size; 1497 my ($w, $h) = $self->{layout}->size;
1337 1498
1338 if (exists $self->{template}) { 1499 if (exists $self->{template}) {
… …
1368} 1529}
1369 1530
1370sub _draw { 1531sub _draw {
1371 my ($self) = @_; 1532 my ($self) = @_;
1372 1533
1534 $self->SUPER::_draw; # draw background, if applicable
1535
1373 my $tex = $self->{texture} ||= do { 1536 my $tex = $self->{texture} ||= do {
1537 $self->{layout}->set_foreground (@{$self->{fg}});
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1538 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $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});
1376 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1542 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1543
1377 new_from_layout CFClient::Texture $self->{layout} 1544 my $tex = new_from_layout CFClient::Texture $self->{layout};
1545
1546 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1547 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1548 : ($self->{w} - $tex->{w}) * 0.5);
1549
1550 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1551 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1552 : ($self->{h} - $tex->{h}) * 0.5);
1553
1554 $tex
1378 }; 1555 };
1379 1556
1380 glEnable GL_BLEND;
1381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1382 glEnable GL_TEXTURE_2D; 1557 glEnable GL_TEXTURE_2D;
1383 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1558 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1384 1559
1560 if ($tex->{format} == GL_ALPHA) {
1385 glColor @{$self->{fg}}; 1561 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}); 1562 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1563 } else {
1564 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1565 }
1400 1566
1401 glDisable GL_TEXTURE_2D; 1567 glDisable GL_TEXTURE_2D;
1402 glDisable GL_BLEND;
1403} 1568}
1404 1569
1405############################################################################# 1570#############################################################################
1406 1571
1407package CFClient::UI::EntryBase; 1572package CFClient::UI::EntryBase;
… …
1420 active_fg => [0, 0, 0], 1585 active_fg => [0, 0, 0],
1421 can_hover => 1, 1586 can_hover => 1,
1422 can_focus => 1, 1587 can_focus => 1,
1423 valign => 0, 1588 valign => 0,
1424 can_events => 1, 1589 can_events => 1,
1590 #text => ...
1425 @_ 1591 @_
1426 ) 1592 )
1427} 1593}
1428 1594
1429sub _set_text { 1595sub _set_text {
… …
1439 $self->{text} = $text; 1605 $self->{text} = $text;
1440 1606
1441 $text =~ s/./*/g if $self->{hidden}; 1607 $text =~ s/./*/g if $self->{hidden};
1442 $self->{layout}->set_text ("$text "); 1608 $self->{layout}->set_text ("$text ");
1443 1609
1444 $self->emit (changed => $self->{text}); 1610 $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} 1611}
1464 1612
1465sub set_text { 1613sub set_text {
1466 my ($self, $text) = @_; 1614 my ($self, $text) = @_;
1467 1615
1468 $self->{cursor} = length $text; 1616 $self->{cursor} = length $text;
1469 $self->_set_text ($text); 1617 $self->_set_text ($text);
1470 $self->update; 1618 $self->update;
1619 $self->check_size;
1620}
1621
1622sub get_text {
1623 $_[0]{text}
1624}
1625
1626sub size_request {
1627 my ($self) = @_;
1628
1629 my ($w, $h) = $self->SUPER::size_request;
1630
1631 ($w + 1, $h) # add 1 for cursor
1471} 1632}
1472 1633
1473sub key_down { 1634sub key_down {
1474 my ($self, $ev) = @_; 1635 my ($self, $ev) = @_;
1475 1636
… …
1477 my $sym = $ev->{sym}; 1638 my $sym = $ev->{sym};
1478 my $uni = $ev->{unicode}; 1639 my $uni = $ev->{unicode};
1479 1640
1480 my $text = $self->get_text; 1641 my $text = $self->get_text;
1481 1642
1482 if ($sym == 8) { 1643 if ($uni == 8) {
1483 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1644 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1484 } elsif ($sym == 127) { 1645 } elsif ($uni == 127) {
1485 substr $text, $self->{cursor}, 1, ""; 1646 substr $text, $self->{cursor}, 1, "";
1486 } elsif ($sym == CFClient::SDLK_LEFT) { 1647 } elsif ($sym == CFClient::SDLK_LEFT) {
1487 --$self->{cursor} if $self->{cursor}; 1648 --$self->{cursor} if $self->{cursor};
1488 } elsif ($sym == CFClient::SDLK_RIGHT) { 1649 } elsif ($sym == CFClient::SDLK_RIGHT) {
1489 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1650 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1490 } elsif ($sym == CFClient::SDLK_HOME) { 1651 } elsif ($sym == CFClient::SDLK_HOME) {
1491 $self->{cursor} = 0; 1652 $self->{cursor} = 0;
1492 } elsif ($sym == CFClient::SDLK_END) { 1653 } elsif ($sym == CFClient::SDLK_END) {
1493 $self->{cursor} = length $text; 1654 $self->{cursor} = length $text;
1494 } elsif ($sym == 27) { 1655 } elsif ($uni == 27) {
1495 $self->emit ('escape'); 1656 $self->_emit ('escape');
1496 } elsif ($uni) { 1657 } elsif ($uni) {
1497 substr $text, $self->{cursor}++, 0, chr $uni; 1658 substr $text, $self->{cursor}++, 0, chr $uni;
1498 } 1659 }
1499 1660
1500 $self->_set_text ($text); 1661 $self->_set_text ($text);
1501 $self->update; 1662 $self->update;
1663 $self->check_size;
1502} 1664}
1503 1665
1504sub focus_in { 1666sub focus_in {
1505 my ($self) = @_; 1667 my ($self) = @_;
1506 1668
… …
1586 if ($sym == 13) { 1748 if ($sym == 13) {
1587 unshift @{$self->{history}}, 1749 unshift @{$self->{history}},
1588 my $txt = $self->get_text; 1750 my $txt = $self->get_text;
1589 $self->{history_pointer} = -1; 1751 $self->{history_pointer} = -1;
1590 $self->{history_saveback} = ''; 1752 $self->{history_saveback} = '';
1591 $self->emit (activate => $txt); 1753 $self->_emit (activate => $txt);
1592 $self->update; 1754 $self->update;
1593 1755
1594 } elsif ($sym == CFClient::SDLK_UP) { 1756 } elsif ($sym == CFClient::SDLK_UP) {
1595 if ($self->{history_pointer} < 0) { 1757 if ($self->{history_pointer} < 0) {
1596 $self->{history_saveback} = $self->get_text; 1758 $self->{history_saveback} = $self->get_text;
… …
1635 my $class = shift; 1797 my $class = shift;
1636 1798
1637 $class->SUPER::new ( 1799 $class->SUPER::new (
1638 padding => 4, 1800 padding => 4,
1639 fg => [1, 1, 1], 1801 fg => [1, 1, 1],
1640 bg => [1, 1, 1, 0.2],
1641 active_fg => [0, 0, 1], 1802 active_fg => [0, 0, 1],
1642 can_hover => 1, 1803 can_hover => 1,
1643 align => 0, 1804 align => 0,
1644 valign => 0, 1805 valign => 0,
1645 can_events => 1, 1806 can_events => 1,
1646 @_ 1807 @_
1647 ) 1808 )
1648} 1809}
1649 1810
1811sub activate { }
1812
1650sub button_up { 1813sub button_up {
1651 my ($self, $ev, $x, $y) = @_; 1814 my ($self, $ev, $x, $y) = @_;
1652 1815
1816 $self->emit ("activate")
1653 if ($x >= 0 && $x < $self->{w} 1817 if $x >= 0 && $x < $self->{w}
1654 && $y >= 0 && $y < $self->{h}) { 1818 && $y >= 0 && $y < $self->{h};
1655 $self->emit ("activate");
1656 }
1657} 1819}
1658 1820
1659sub _draw { 1821sub _draw {
1660 my ($self) = @_; 1822 my ($self) = @_;
1661 1823
… …
1663 1825
1664 if ($GRAB == $self) { 1826 if ($GRAB == $self) {
1665 $self->{fg} = $self->{active_fg}; 1827 $self->{fg} = $self->{active_fg};
1666 } 1828 }
1667 1829
1668 glEnable GL_BLEND;
1669 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1670 glEnable GL_TEXTURE_2D; 1830 glEnable GL_TEXTURE_2D;
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672 glColor 0, 0, 0, 1; 1832 glColor 0, 0, 0, 1;
1673 1833
1674 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1834 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1675 1835
1676 glDisable GL_TEXTURE_2D; 1836 glDisable GL_TEXTURE_2D;
1677 glDisable GL_BLEND;
1678 1837
1679 $self->SUPER::_draw; 1838 $self->SUPER::_draw;
1680} 1839}
1681 1840
1682############################################################################# 1841#############################################################################
… …
1696 1855
1697 $class->SUPER::new ( 1856 $class->SUPER::new (
1698 padding => 2, 1857 padding => 2,
1699 fg => [1, 1, 1], 1858 fg => [1, 1, 1],
1700 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],
1701 state => 0, 1862 state => 0,
1702 can_hover => 1, 1863 can_hover => 1,
1703 @_ 1864 @_
1704 ) 1865 )
1705} 1866}
… …
1714 my ($self, $ev, $x, $y) = @_; 1875 my ($self, $ev, $x, $y) = @_;
1715 1876
1716 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1877 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1717 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1878 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1718 $self->{state} = !$self->{state}; 1879 $self->{state} = !$self->{state};
1719 $self->emit (changed => $self->{state}); 1880 $self->_emit (changed => $self->{state});
1720 } 1881 }
1721} 1882}
1722 1883
1723sub _draw { 1884sub _draw {
1724 my ($self) = @_; 1885 my ($self) = @_;
… …
1729 1890
1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1891 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1731 1892
1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1893 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733 1894
1734 glEnable GL_BLEND; 1895 my $tex = $self->{state} ? $tex[1] : $tex[0];
1896
1735 glEnable GL_TEXTURE_2D; 1897 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); 1898 $tex->draw_quad_alpha (0, 0, $s, $s);
1741
1742 glDisable GL_TEXTURE_2D; 1899 glDisable GL_TEXTURE_2D;
1743 glDisable GL_BLEND;
1744} 1900}
1745 1901
1746############################################################################# 1902#############################################################################
1747 1903
1748package CFClient::UI::Image; 1904package CFClient::UI::Image;
… …
1791 glTranslate 0, -$self->{w}, 0; 1947 glTranslate 0, -$self->{w}, 0;
1792 1948
1793 ($w, $h) = ($h, $w); 1949 ($w, $h) = ($h, $w);
1794 } 1950 }
1795 1951
1796 glEnable GL_BLEND;
1797 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800 1954
1801 $tex->draw_quad (0, 0, $w, $h); 1955 $tex->draw_quad_alpha (0, 0, $w, $h);
1802 1956
1803 glDisable GL_BLEND;
1804 glDisable GL_TEXTURE_2D; 1957 glDisable GL_TEXTURE_2D;
1805} 1958}
1806 1959
1807############################################################################# 1960#############################################################################
1808 1961
… …
1997 qw(s1_slider.png s1_slider_bg.png); 2150 qw(s1_slider.png s1_slider_bg.png);
1998 2151
1999sub new { 2152sub new {
2000 my $class = shift; 2153 my $class = shift;
2001 2154
2002 # range [value, low, high, page] 2155 # range [value, low, high, page, unit]
2003 2156
2004 # TODO: 0-width page 2157 # TODO: 0-width page
2005 # TODO: req_w/h are wrong with vertical 2158 # TODO: req_w/h are wrong with vertical
2006 # TODO: calculations are off 2159 # TODO: calculations are off
2007 my $self = $class->SUPER::new ( 2160 my $self = $class->SUPER::new (
2008 fg => [1, 1, 1], 2161 fg => [1, 1, 1],
2009 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],
2010 range => [0, 0, 100, 10], 2165 range => [0, 0, 100, 10, 0],
2011 req_w => $::WIDTH / 80, 2166 req_w => $::WIDTH / 80,
2012 req_h => $::WIDTH / 80, 2167 req_h => $::WIDTH / 80,
2013 vertical => 0, 2168 vertical => 0,
2014 can_hover => 1, 2169 can_hover => 1,
2015 inner_pad => 5, 2170 inner_pad => 0.02,
2016 @_ 2171 @_
2017 ); 2172 );
2018 2173
2174 $self->set_value ($self->{range}[0]);
2175 $self->update;
2176
2019 $self 2177 $self
2178}
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
2189sub set_value {
2190 my ($self, $value) = @_;
2191
2192 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2193
2194 $hi = $lo + 1 if $hi <= $lo;
2195
2196 $page = $hi - $lo if $page > $hi - $lo;
2197
2198 $value = $lo if $value < $lo;
2199 $value = $hi - $page if $value > $hi - $page;
2200
2201 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2202 if $unit;
2203
2204 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2205
2206 if ($value != $old_value) {
2207 $self->_emit (changed => $value);
2208 $self->update;
2209 }
2020} 2210}
2021 2211
2022sub size_request { 2212sub size_request {
2023 my ($self) = @_; 2213 my ($self) = @_;
2024 2214
… …
2030 2220
2031sub button_down { 2221sub button_down {
2032 my ($self, $ev, $x, $y) = @_; 2222 my ($self, $ev, $x, $y) = @_;
2033 2223
2034 $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
2035 $self->mouse_motion ($ev, $x, $y); 2228 $self->mouse_motion ($ev, $x, $y);
2036} 2229}
2037 2230
2038sub mouse_motion { 2231sub mouse_motion {
2039 my ($self, $ev, $x, $y) = @_; 2232 my ($self, $ev, $x, $y) = @_;
2040 2233
2041 if ($GRAB == $self) { 2234 if ($GRAB == $self) {
2235 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2236
2237 my (undef, $lo, $hi, $page) = @{$self->{range}};
2238
2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240
2241 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2242 }
2243}
2244
2245sub update {
2246 my ($self) = @_;
2247
2248 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2249 $self->set_value ($self->{range}[0]);
2250
2042 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2251 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100;
2043 2253
2044 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2254 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2045 2255
2046 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2256 $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 2257 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2048 2258
2049 $x -= $inner_pad_px; # substract the padding 2259 $value = ($value - $lo) / $range;
2050 $x = $x * ($hi - $lo) / $inner_w + $lo; 2260 $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 2261
2055 $self->emit (changed => $x); 2262 $self->{knob_x} = $value - $knob_w * 0.5;
2056 $self->update; 2263 $self->{knob_w} = $knob_w;
2057 } 2264 });
2058}
2059 2265
2060# the inner_* stuff is for generating a padding for the slider handle, 2266 $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} 2267}
2067 2268
2068sub _draw { 2269sub _draw {
2069 my ($self) = @_; 2270 my ($self) = @_;
2070 2271
2071 $self->SUPER::_draw (); 2272 $self->SUPER::_draw ();
2072 2273
2073 my ($w, $h) = @$self{qw(w h)}; 2274 glScale $self->{w}, $self->{h};
2074 2275
2075 if ($self->{vertical}) { 2276 if ($self->{vertical}) {
2076 # draw a vertical slider like a rotated horizontal slider 2277 # draw a vertical slider like a rotated horizontal slider
2077 2278
2279 glTranslate 1, 0, 0;
2078 glRotate 90, 0, 0, 1; 2280 glRotate 90, 0, 0, 1;
2079 glTranslate 0, -$self->{w}, 0;
2080
2081 ($w, $h) = ($h, $w);
2082 } 2281 }
2083 2282
2084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2283 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2284 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086 2285
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; 2286 glEnable GL_TEXTURE_2D;
2108 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2287 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2109 2288
2110 # draw background 2289 # draw background
2111 $tex[1]->draw_quad (0, 0, $w, $h); 2290 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2112 2291
2113 # draw handle 2292 # draw handle
2114 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2293 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2115 2294
2116 glDisable GL_BLEND;
2117 glDisable GL_TEXTURE_2D; 2295 glDisable GL_TEXTURE_2D;
2118} 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 (@_) }
2119 2338
2120############################################################################# 2339#############################################################################
2121 2340
2122package CFClient::UI::TextView; 2341package CFClient::UI::TextView;
2123 2342
… …
2132 fontsize => 1, 2351 fontsize => 1,
2133 can_events => 0, 2352 can_events => 0,
2134 #font => default_font 2353 #font => default_font
2135 @_, 2354 @_,
2136 2355
2137 layout => (new CFClient::Layout), 2356 layout => (new CFClient::Layout 1),
2138 par => [], 2357 par => [],
2139 height => 0, 2358 height => 0,
2140 children => [ 2359 children => [
2141 (new CFClient::UI::Empty expand => 1), 2360 (new CFClient::UI::Empty expand => 1),
2142 (new CFClient::UI::Slider vertical => 1), 2361 (new CFClient::UI::Slider vertical => 1),
… …
2153 2372
2154 $self->{fontsize} = $fontsize; 2373 $self->{fontsize} = $fontsize;
2155 $self->reflow; 2374 $self->reflow;
2156} 2375}
2157 2376
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 { 2377sub size_allocate {
2178 my ($self, $w, $h) = @_; 2378 my ($self, $w, $h) = @_;
2179 2379
2180 $self->SUPER::size_allocate ($w, $h); 2380 $self->SUPER::size_allocate ($w, $h);
2181 2381
… …
2184 $self->{layout}->set_width ($self->{children}[0]{w}); 2384 $self->{layout}->set_width ($self->{children}[0]{w});
2185 2385
2186 $self->reflow; 2386 $self->reflow;
2187} 2387}
2188 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
2189sub add_paragraph { 2423sub add_paragraph {
2190 my ($self, $color, $text) = @_; 2424 my ($self, $color, $text, $indent) = @_;
2191 2425
2192 #TODO: intelligently "reformat" paragraph 2426 for my $line (split /\n/, $text) {
2193 2427 my ($w, $h) = $self->text_size ($line);
2194 my $height = $self->text_height ($text);
2195
2196 $self->{height} += $height; 2428 $self->{height} += $h;
2429 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2430 }
2197 2431
2198 push @{$self->{par}}, [$height, $color, $text];
2199
2200 $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]);
2201 $self->{children}[1]->update;
2202} 2433}
2203 2434
2204sub update { 2435sub update {
2205 my ($self) = @_; 2436 my ($self) = @_;
2206 2437
… …
2208 2439
2209 return unless $self->{h} > 0; 2440 return unless $self->{h} > 0;
2210 2441
2211 delete $self->{texture}; 2442 delete $self->{texture};
2212 2443
2213 $ROOT->on_refresh ($self, sub { 2444 $ROOT->on_post_alloc ($self, sub {
2445 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2446
2214 if (delete $self->{need_reflow}) { 2447 if (delete $self->{need_reflow}) {
2215 my $height = 0; 2448 my $height = 0;
2216 2449
2217 $height += $_->[0] = $self->text_height ($_->[2]) 2450 my $layout = $self->{layout};
2451
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453
2218 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 }
2219 2465
2220 $self->{height} = $height; 2466 $self->{height} = $height;
2221 2467
2222 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2468 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2223 2469
2224 delete $self->{texture}; 2470 delete $self->{texture};
2225 } 2471 }
2226 2472
2227 $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 {
2228 glClearColor 0, 0, 0, 0; 2474 glClearColor 0.5, 0.5, 0.5, 0;
2229 glClear GL_COLOR_BUFFER_BIT; 2475 glClear GL_COLOR_BUFFER_BIT;
2230 2476
2477 my $top = int $self->{children}[1]{range}[0];
2478
2479 my $y0 = $top;
2480 my $y1 = $top + $H;
2481
2482 my $y = 0;
2483
2484 my $layout = $self->{layout};
2485
2486 $layout->set_font ($self->{font}) if $self->{font};
2487
2231 glEnable GL_BLEND; 2488 glEnable GL_BLEND;
2489 #TODO# not correct in windows where rgba is forced off
2232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2490 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 2491
2247 for my $par (@{$self->{par}}) { 2492 for my $par (@{$self->{par}}) {
2248 my $h = $par->[0]; 2493 my $h = $par->[1];
2249 2494
2250 if ($y0 < $y + $h && $y < $y1) { 2495 if ($y0 < $y + $h && $y < $y1) {
2496 $layout->set_foreground (@{ $par->[2] });
2497 $layout->set_width ($W - $par->[3]);
2251 $layout->set_text ($par->[2]); 2498 $layout->set_markup ($par->[4]);
2252 2499
2253 glColor @{ $par->[1] }; 2500 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2254 my ($W, $H) = $layout->size; 2501
2255 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2502 glRasterPos $par->[3], $y - $y0;
2503 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2256 } 2504 }
2257 2505
2258 $y += $h; 2506 $y += $h;
2259 } 2507 }
2260 2508
2261 glDisable GL_TEXTURE_2D;
2262 glDisable GL_BLEND; 2509 glDisable GL_BLEND;
2263 }; 2510 };
2264 }); 2511 });
2265} 2512}
2266 2513
2267sub _draw { 2514sub _draw {
2268 my ($self) = @_; 2515 my ($self) = @_;
2269 2516
2270 glEnable GL_BLEND;
2271 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2272 glEnable GL_TEXTURE_2D; 2517 glEnable GL_TEXTURE_2D;
2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2518 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274 glColor 1, 1, 1, 1; 2519 glColor 1, 1, 1, 1;
2275 $self->{texture}->draw_quad (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});
2276 glDisable GL_TEXTURE_2D; 2521 glDisable GL_TEXTURE_2D;
2277 glDisable GL_BLEND;
2278 2522
2279 $self->{children}[1]->draw; 2523 $self->{children}[1]->draw;
2280 2524
2281} 2525}
2282 2526
… …
2330 2574
2331sub new { 2575sub new {
2332 my $class = shift; 2576 my $class = shift;
2333 2577
2334 my $self = $class->SUPER::new ( 2578 my $self = $class->SUPER::new (
2335 state => 0, 2579 state => 0,
2336 connect_activate => \&toggle_flopper, 2580 on_activate => \&toggle_flopper,
2337 @_ 2581 @_
2338 ); 2582 );
2339 2583
2340 if ($self->{state}) { 2584 if ($self->{state}) {
2341 $self->{state} = 0; 2585 $self->{state} = 0;
… …
2350 2594
2351 # TODO: use animation 2595 # TODO: use animation
2352 if ($self->{state} = !$self->{state}) { 2596 if ($self->{state} = !$self->{state}) {
2353 $CFClient::UI::ROOT->add ($self->{other}); 2597 $CFClient::UI::ROOT->add ($self->{other});
2354 $self->{other}->move ($self->coord2global (0, $self->{h})); 2598 $self->{other}->move ($self->coord2global (0, $self->{h}));
2355 $self->emit ("open"); 2599 $self->_emit ("open");
2356 } else { 2600 } else {
2357 $CFClient::UI::ROOT->remove ($self->{other}); 2601 $CFClient::UI::ROOT->remove ($self->{other});
2358 $self->emit ("close"); 2602 $self->_emit ("close");
2359 } 2603 }
2360 2604
2361 $self->emit (changed => $self->{state}); 2605 $self->_emit (changed => $self->{state});
2362} 2606}
2363 2607
2364############################################################################# 2608#############################################################################
2365 2609
2366package CFClient::UI::Tooltip; 2610package CFClient::UI::Tooltip;
… …
2376 @_, 2620 @_,
2377 can_events => 0, 2621 can_events => 0,
2378 ) 2622 )
2379} 2623}
2380 2624
2381sub set_markup { 2625sub set_tooltip_from {
2382 my ($self, $text) = @_; 2626 my ($self, $widget) = @_;
2383 2627
2384 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2628 $self->add (new CFClient::UI::Label
2385 $self->{label}->set_markup ($text); 2629 markup => $widget->{tooltip},
2386 $self->add ($self->{label}); 2630 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2631 fontsize => 0.8,
2632 fg => [0, 0, 0, 1],
2633 ellipsise => 0,
2634 font => ($widget->{tooltip_font} || $::FONT_PROP),
2635 );
2387} 2636}
2388 2637
2389sub size_request { 2638sub size_request {
2390 my ($self) = @_; 2639 my ($self) = @_;
2391
2392 $self->child->set_max_size ($::WIDTH * 0.3);
2393 2640
2394 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2641 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2395 2642
2396 ($w + 4, $h + 4) 2643 ($w + 4, $h + 4)
2397} 2644}
… …
2403} 2650}
2404 2651
2405sub _draw { 2652sub _draw {
2406 my ($self) = @_; 2653 my ($self) = @_;
2407 2654
2408 glPushMatrix;
2409 glTranslate 0.375, 0.375; 2655 glTranslate 0.375, 0.375;
2410 2656
2411 my ($w, $h) = @$self{qw(w h)}; 2657 my ($w, $h) = @$self{qw(w h)};
2412 2658
2413 glColor 1, 0.8, 0.4; 2659 glColor 1, 0.8, 0.4;
… …
2424 glVertex 0 , $h; 2670 glVertex 0 , $h;
2425 glVertex $w, $h; 2671 glVertex $w, $h;
2426 glVertex $w, 0; 2672 glVertex $w, 0;
2427 glEnd; 2673 glEnd;
2428 2674
2429 glPopMatrix; 2675 glTranslate 2 - 0.375, 2 - 0.375;
2430
2431 glTranslate 2, 2;
2432 $self->SUPER::_draw; 2676 $self->SUPER::_draw;
2433} 2677}
2434 2678
2435############################################################################# 2679#############################################################################
2436 2680
… …
2441use CFClient::OpenGL; 2685use CFClient::OpenGL;
2442 2686
2443sub new { 2687sub new {
2444 my $class = shift; 2688 my $class = shift;
2445 2689
2446 $class->SUPER::new ( 2690 my $self = $class->SUPER::new (
2447 aspect => 1, 2691 aspect => 1,
2692 can_events => 0,
2448 @_, 2693 @_,
2449 ) 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
2450} 2711}
2451 2712
2452sub size_request { 2713sub size_request {
2453 (32, 8) 2714 (32, 8)
2454} 2715}
2455 2716
2717sub update {
2718 my ($self) = @_;
2719
2720 return unless $self->{visible};
2721
2722 $self->SUPER::update;
2723}
2724
2456sub _draw { 2725sub _draw {
2457 my ($self) = @_; 2726 my ($self) = @_;
2458 2727
2459 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
2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2739 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2461 2740
2462 # TODO animation
2463 if ($tex) { 2741 if ($tex) {
2464 glEnable GL_BLEND;
2465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2466 glEnable GL_TEXTURE_2D; 2742 glEnable GL_TEXTURE_2D;
2467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2468 glColor 1, 1, 1, 1; 2744 glColor 1, 1, 1, 1;
2469 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2745 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470 glDisable GL_TEXTURE_2D; 2746 glDisable GL_TEXTURE_2D;
2471 glDisable GL_BLEND;
2472 } 2747 }
2748}
2749
2750sub DESTROY {
2751 my ($self) = @_;
2752
2753 $self->{timer}->cancel
2754 if $self->{timer};
2755
2756 $self->SUPER::DESTROY;
2473} 2757}
2474 2758
2475############################################################################# 2759#############################################################################
2476 2760
2477package CFClient::UI::InventoryItem; 2761package CFClient::UI::Inventory;
2478 2762
2479our @ISA = CFClient::UI::HBox::; 2763our @ISA = CFClient::UI::ScrolledWindow::;
2480 2764
2481sub new { 2765sub new {
2482 my $class = shift; 2766 my $class = shift;
2483 2767
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 ( 2768 my $self = $class->SUPER::new (
2494 can_hover => 1, 2769 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 @_, 2770 @_,
2549 ); 2771 );
2550 2772
2551 $self 2773 $self
2552} 2774}
… …
2555 my ($self, $items) = @_; 2777 my ($self, $items) = @_;
2556 2778
2557 $self->{scrolled}->clear; 2779 $self->{scrolled}->clear;
2558 return unless $items; 2780 return unless $items;
2559 2781
2560 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2782 my @items = sort {
2783 ($a->{type} <=> $b->{type})
2784 or ($a->{name} cmp $b->{name})
2785 } @$items;
2561 2786
2562 $self->{real_items} = \@items; 2787 $self->{real_items} = \@items;
2563 2788
2789 my $row = 0;
2564 for my $item (@items) { 2790 for my $item (@items) {
2565 my $desc = $item->{nrof} < 2 2791 CFClient::Item::update_widgets $item;
2566 ? $item->{name}
2567 : "$item->{nrof} $item->{name_pl}";
2568 2792
2569 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2793 $self->{scrolled}->add (0, $row, $item->{face_widget});
2570 } 2794 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2795 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2571 2796
2572# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2797 $row++;
2798 }
2573} 2799}
2574 2800
2575sub size_request { 2801sub size_request {
2576 my ($self) = @_; 2802 my ($self) = @_;
2577 ($self->{req_w}, $self->{req_h}); 2803 ($self->{req_w}, $self->{req_h});
… …
2617 2843
2618# 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)
2619sub popup { 2845sub popup {
2620 my ($self, $ev) = @_; 2846 my ($self, $ev) = @_;
2621 2847
2622 $self->emit ("popdown"); 2848 $self->_emit ("popdown");
2623 2849
2624 # maybe save $GRAB? must be careful about events... 2850 # maybe save $GRAB? must be careful about events...
2625 $GRAB = $self; 2851 $GRAB = $self;
2626 $self->{button} = $ev->{button}; 2852 $self->{button} = $ev->{button};
2627 2853
… …
2642 2868
2643 if ($ev->{button} == $self->{button}) { 2869 if ($ev->{button} == $self->{button}) {
2644 undef $GRAB; 2870 undef $GRAB;
2645 $self->hide; 2871 $self->hide;
2646 2872
2647 $self->emit ("popdown"); 2873 $self->_emit ("popdown");
2648 $self->{hover}[1]->() if $self->{hover}; 2874 $self->{hover}[1]->() if $self->{hover};
2649 } 2875 }
2650} 2876}
2651 2877
2652############################################################################# 2878#############################################################################
2653 2879
2654package CFClient::UI::Root; 2880package CFClient::UI::Statusbox;
2655 2881
2656our @ISA = CFClient::UI::Container::; 2882our @ISA = CFClient::UI::VBox::;
2657
2658use CFClient::OpenGL;
2659 2883
2660sub new { 2884sub new {
2661 my $class = shift; 2885 my $class = shift;
2662 2886
2663 $class->SUPER::new ( 2887 $class->SUPER::new (
2888 fontsize => 0.8,
2664 @_, 2889 @_,
2665 ) 2890 )
2666} 2891}
2667 2892
2893sub reorder {
2894 my ($self) = @_;
2895 my $NOW = time;
2896
2897 while (my ($k, $v) = each %{ $self->{item} }) {
2898 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2899 }
2900
2901 my @widgets;
2902
2903 my @items = sort {
2904 $a->{pri} <=> $b->{pri}
2905 or $b->{id} <=> $a->{id}
2906 } values %{ $self->{item} };
2907
2908 my $count = 10 + 1;
2909 for my $item (@items) {
2910 last unless --$count;
2911
2912 push @widgets, $item->{label} ||= do {
2913 # TODO: doesn't handle markup well (read as: at all)
2914 my $short = $item->{count} > 1
2915 ? "<b>$item->{count} ×</b> $item->{text}"
2916 : $item->{text};
2917
2918 for ($short) {
2919 s/^\s+//;
2920 s/\s+/ /g;
2921 }
2922
2923 new CFClient::UI::Label
2924 markup => $short,
2925 tooltip => $item->{tooltip},
2926 tooltip_font => $::FONT_PROP,
2927 tooltip_width => 0.67,
2928 fontsize => $item->{fontsize} || $self->{fontsize},
2929 max_w => $::WIDTH * 0.44,
2930 fg => $item->{fg},
2931 can_events => 1,
2932 can_hover => 1
2933 };
2934 }
2935
2936 $self->clear;
2937 $self->SUPER::add (reverse @widgets);
2938}
2939
2940sub add {
2941 my ($self, $text, %arg) = @_;
2942
2943 $text =~ s/^\s+//;
2944 $text =~ s/\s+$//;
2945
2946 return unless $text;
2947
2948 my $timeout = time + ((delete $arg{timeout}) || 60);
2949
2950 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2951
2952 if (my $item = $self->{item}{$group}) {
2953 if ($item->{text} eq $text) {
2954 $item->{count}++;
2955 } else {
2956 $item->{count} = 1;
2957 $item->{text} = $item->{tooltip} = $text;
2958 }
2959 $item->{id} = ++$self->{id};
2960 $item->{timeout} = $timeout;
2961 delete $item->{label};
2962 } else {
2963 $self->{item}{$group} = {
2964 id => ++$self->{id},
2965 text => $text,
2966 timeout => $timeout,
2967 tooltip => $text,
2968 fg => [0.8, 0.8, 0.8, 0.8],
2969 pri => 0,
2970 count => 1,
2971 %arg,
2972 };
2973 }
2974
2975 $self->reorder;
2976}
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
2988#############################################################################
2989
2990package CFClient::UI::Root;
2991
2992our @ISA = CFClient::UI::Container::;
2993
2994use CFClient::OpenGL;
2995
2996sub new {
2997 my $class = shift;
2998
2999 $class->SUPER::new (
3000 visible => 1,
3001 @_,
3002 )
3003}
3004
2668sub configure { 3005sub configure {
2669 my ($self, $x, $y, $w, $h) = @_; 3006 my ($self, $x, $y, $w, $h) = @_;
2670 3007
2671 $self->{w} = $w; 3008 $self->{w} = $w;
2672 $self->{h} = $h; 3009 $self->{h} = $h;
… …
2686} 3023}
2687 3024
2688sub size_allocate { 3025sub size_allocate {
2689 my ($self, $w, $h) = @_; 3026 my ($self, $w, $h) = @_;
2690 3027
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) { 3028 for my $child ($self->children) {
2708 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)};
2709 3030
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3032 if exists $child->{req_x};
3033
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3035 if exists $child->{req_y};
3036
2710 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3037 $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; 3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039
2712 $child->configure ($X, $Y, $W, $H); 3040 $child->configure ($X, $Y, $W, $H);
2713 } 3041 }
2714
2715 $self->{old_w} = $w;
2716 $self->{old_h} = $h;
2717} 3042}
2718 3043
2719sub coord2local { 3044sub coord2local {
2720 my ($self, $x, $y) = @_; 3045 my ($self, $x, $y) = @_;
2721 3046
… …
2734 $self->check_size; 3059 $self->check_size;
2735 $::WANT_REFRESH++; 3060 $::WANT_REFRESH++;
2736} 3061}
2737 3062
2738sub add { 3063sub add {
2739 my ($self, $child) = @_; 3064 my ($self, @children) = @_;
2740 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
3072 for my $child (@children) {
3073 $child->{is_toplevel} = 1;
3074
2741 # integerise window positions 3075 # integerise window positions
2742 $child->{x} = int $child->{x}; 3076 $child->{x} = int $child->{x};
2743 $child->{y} = int $child->{y}; 3077 $child->{y} = int $child->{y};
3078 }
2744 3079
2745 $self->SUPER::add ($child); 3080 $self->SUPER::add (@children);
3081}
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 }
2746} 3093}
2747 3094
2748sub on_refresh { 3095sub on_refresh {
2749 my ($self, $id, $cb) = @_; 3096 my ($self, $id, $cb) = @_;
2750 3097
2751 $self->{refresh_hook}{$id} = $cb; 3098 $self->{refresh_hook}{$id} = $cb;
2752} 3099}
2753 3100
3101sub on_post_alloc {
3102 my ($self, $id, $cb) = @_;
3103
3104 $self->{post_alloc_hook}{$id} = $cb;
3105}
3106
2754sub draw { 3107sub draw {
2755 my ($self) = @_; 3108 my ($self) = @_;
2756 3109
3110 while ($self->{refresh_hook}) {
3111 $_->()
3112 for values %{delete $self->{refresh_hook}};
3113 }
3114
2757 if ($self->{check_size}) { 3115 if ($self->{check_size}) {
2758 my @queue = ([], []); 3116 my @queue;
2759 3117
2760 for (;;) { 3118 for (;;) {
2761 if ($self->{check_size}) { 3119 if ($self->{check_size}) {
2762 # heuristic: check containers last 3120 #TODO use array-of-depth approach
2763 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3121
3122 @queue = sort { $a->{visible} <=> $b->{visible} }
2764 for values %{delete $self->{check_size}} 3123 @queue, values %{delete $self->{check_size}};
2765 } 3124 }
2766 3125
2767 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
2768 3129
2769 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3130 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2770 ? @$widget{qw(user_w user_h)} 3131 ? @$widget{qw(user_w user_h)}
2771 : $widget->size_request; 3132 : $widget->size_request;
2772 3133
3134 if (delete $widget->{force_alloc}
2773 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 3135 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3136 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3137
2774 $widget->{req_w} = $w; 3138 $widget->{req_w} = $w;
2775 $widget->{req_h} = $h; 3139 $widget->{req_h} = $h;
2776 3140
2777 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 3141 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2778 3142
2779 $widget->{parent}->check_size 3143 $widget->{parent}->check_size
2780 if $widget->{parent}; 3144 if $widget->{parent};
2781 } 3145 }
2782 } 3146 }
… …
2784 3148
2785 while ($self->{size_alloc}) { 3149 while ($self->{size_alloc}) {
2786 for (values %{delete $self->{size_alloc}}) { 3150 for (values %{delete $self->{size_alloc}}) {
2787 my ($widget, $w, $h) = @$_; 3151 my ($widget, $w, $h) = @$_;
2788 3152
3153 $w = 0 if $w < 0;
3154 $h = 0 if $h < 0;
3155
2789 $widget->{w} = $w; 3156 $widget->{w} = $w;
2790 $widget->{h} = $h; 3157 $widget->{h} = $h;
2791 $widget->size_allocate ($w, $h);
2792 $widget->emit (size_allocate => $w, $h); 3158 $widget->emit (size_allocate => $w, $h);
2793 } 3159 }
2794 } 3160 }
2795 3161
2796 while ($self->{refresh_hook}) { 3162 while ($self->{post_alloc_hook}) {
2797 $_->() 3163 $_->()
2798 for values %{delete $self->{refresh_hook}}; 3164 for values %{delete $self->{post_alloc_hook}};
2799 } 3165 }
2800 3166
2801 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3167 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2802 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3168 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2803 glClear GL_COLOR_BUFFER_BIT; 3169 glClear GL_COLOR_BUFFER_BIT;
2804 3170
2805 glMatrixMode GL_PROJECTION; 3171 glMatrixMode GL_PROJECTION;
2806 glLoadIdentity; 3172 glLoadIdentity;
2807 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3173 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2808 glMatrixMode GL_MODELVIEW; 3174 glMatrixMode GL_MODELVIEW;
2809 glLoadIdentity; 3175 glLoadIdentity;
2810 3176
2811 $self->_draw; 3177 $self->_draw;
2812} 3178}
… …
2814############################################################################# 3180#############################################################################
2815 3181
2816package CFClient::UI; 3182package CFClient::UI;
2817 3183
2818$ROOT = new CFClient::UI::Root; 3184$ROOT = new CFClient::UI::Root;
2819$TOOLTIP = new CFClient::UI::Tooltip; 3185$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2820 3186
28211 31871
2822 3188

Diff Legend

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