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.194 by root, Thu May 11 23:41:47 2006 UTC vs.
Revision 1.247 by root, Sun May 28 01:16:04 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
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}
16 38
17sub check_tooltip { 39sub check_tooltip {
18 if (!$GRAB) { 40 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
24 46
25 my $tip = $widget->{tooltip}; 47 my $tip = $widget->{tooltip};
26 48
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 49 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 50
29 $TOOLTIP->set_markup ($widget->{tooltip}); 51 $TOOLTIP->set_tooltip_from ($widget);
30
31 $TOOLTIP->show; 52 $TOOLTIP->show;
32 53
33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34 55
35 if ($x + $TOOLTIP->{w} > $::WIDTH) {
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 } 57 if $x + $TOOLTIP->{w} > $::WIDTH;
38 58
39 $TOOLTIP->move ($x, $y); 59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
40 } 62 }
41 63
42 return; 64 return;
43 } 65 }
44 } 66 }
… …
48 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
49} 71}
50 72
51# class methods for events 73# class methods for events
52sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
53 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
54 if $FOCUS; 76 if $FOCUS;
55} 77}
56 78
57sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
58 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
59 if $FOCUS; 81 if $FOCUS;
60} 82}
61 83
62sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
63 my ($ev) = @_; 85 my ($ev) = @_;
… …
72 check_tooltip; 94 check_tooltip;
73 } 95 }
74 96
75 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
76 98
77 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
78 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
79 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
80 }
81} 101}
82 102
83sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
84 my ($ev) = @_; 104 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
86 106
87 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
88 108
89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
90 110
91 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
92 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
93 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
94 }
95 113
96 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
97 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
98 $grab->update if $grab; 116 $grab->update if $grab;
99 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
115 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
116 134
117 check_tooltip; 135 check_tooltip;
118 } 136 }
119 137
120 if ($HOVER) {
121 ($x, $y) = $HOVER->coord2local ($x, $y);
122 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
123 } 139 if $HOVER;
124} 140}
125 141
126# convert position array to integers 142# convert position array to integers
127sub harmonize { 143sub harmonize {
128 my ($vals) = @_; 144 my ($vals) = @_;
… …
132 for (@$vals) { 148 for (@$vals) {
133 my $i = int $_ + $rem; 149 my $i = int $_ + $rem;
134 $rem += $_ - $i; 150 $rem += $_ - $i;
135 $_ = $i; 151 $_ = $i;
136 } 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->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
183 }
184 }
185
186 reconfigure_widgets;
137} 187}
138 188
139############################################################################# 189#############################################################################
140 190
141package CFClient::UI::Base; 191package CFClient::UI::Base;
… …
154 can_events => 1, 204 can_events => 1,
155 @_ 205 @_
156 }, $class; 206 }, $class;
157 207
158 for (keys %$self) { 208 for (keys %$self) {
159 if (/^connect_(.*)$/) { 209 if (/^on_(.*)$/) {
160 $self->connect ($1 => delete $self->{$_}); 210 $self->connect ($1 => delete $self->{$_});
161 } 211 }
162 } 212 }
163 213
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH;
218 $self->{req_y} = $layout->{y} * $::HEIGHT;
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
221 }
222
164 $self 223 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
165} 234}
166 235
167sub destroy { 236sub destroy {
168 my ($self) = @_; 237 my ($self) = @_;
169 238
… …
171 %$self = (); 240 %$self = ();
172} 241}
173 242
174sub show { 243sub show {
175 my ($self) = @_; 244 my ($self) = @_;
176
177 return if $self->{parent}; 245 return if $self->{parent};
178 246
179 $CFClient::UI::ROOT->add ($self); 247 $CFClient::UI::ROOT->add ($self);
180} 248}
181 249
182sub hide { 250sub center {
183 my ($self) = @_; 251 my ($self) = @_;
252
253 $CFClient::UI::ROOT->on_post_alloc (
254 "center_$self" => sub {
255 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
256 },
257 );
258
259 $self->update;
260}
261
262sub set_visible {
263 my ($self) = @_;
264
265 return if $self->{visible};
266
267 $self->{root} = $self->{parent}{root};
268 $self->{visible} = $self->{parent}{visible} + 1;
269
270 $self->emit (visibility_change => 1)
271}
272
273sub set_invisible {
274 my ($self) = @_;
275
276 return unless $self->{visible};
277
278 # broken show/hide model
279
280 delete $self->{root};
281 delete $self->{visible};
184 282
185 undef $GRAB if $GRAB == $self; 283 undef $GRAB if $GRAB == $self;
186 undef $HOVER if $HOVER == $self; 284 undef $HOVER if $HOVER == $self;
285
286 CFClient::UI::check_tooltip
287 if $CFClient::UI::TOOLTIP->{owner} == $self;
288
289 $self->focus_out;
290
291 $self->emit (visibility_change => 0);
292}
293
294sub hide {
295 my ($self) = @_;
296
297 $self->set_invisible;
187 298
188 $self->{parent}->remove ($self) 299 $self->{parent}->remove ($self)
189 if $self->{parent}; 300 if $self->{parent};
190} 301}
191 302
… …
200} 311}
201 312
202sub set_size { 313sub set_size {
203 my ($self, $w, $h) = @_; 314 my ($self, $w, $h) = @_;
204 315
205 $self->{user_w} = $w; 316 $self->{def_w} = $w;
206 $self->{user_h} = $h; 317 $self->{def_h} = $h;
207 318
208 $self->check_size; 319 $self->check_size;
209} 320}
210 321
211sub size_request { 322sub size_request {
… …
241 352
242sub size_allocate { 353sub size_allocate {
243 # nothing to be done 354 # nothing to be done
244} 355}
245 356
357sub reconfigure {
358 my ($self) = @_;
359
360 $self->check_size (1);
361 $self->update;
362}
363
246sub children { 364sub children {
247}
248
249# call when resolution changes etc.
250sub reconfigure {
251 my ($self) = @_;
252
253 $_->reconfigure
254 for $self->children;
255
256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
259} 365}
260 366
261sub set_max_size { 367sub set_max_size {
262 my ($self, $w, $h) = @_; 368 my ($self, $w, $h) = @_;
263 369
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 370 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 371 delete $self->{max_h}; $self->{max_h} = $h if $h;
372}
373
374sub set_tooltip {
375 my ($self, $tooltip) = @_;
376
377 $tooltip =~ s/^\s+//;
378 $tooltip =~ s/\s+$//;
379
380 return if $self->{tooltip} eq $tooltip;
381
382 $self->{tooltip} = $tooltip;
383
384 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
385 delete $CFClient::UI::TOOLTIP->{owner};
386 CFClient::UI::check_tooltip;
387 }
266} 388}
267 389
268# translate global coordinates to local coordinate system 390# translate global coordinates to local coordinate system
269sub coord2local { 391sub coord2local {
270 my ($self, $x, $y) = @_; 392 my ($self, $x, $y) = @_;
… …
285 return if $FOCUS == $self; 407 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 408 return unless $self->{can_focus};
287 409
288 my $focus = $FOCUS; $FOCUS = $self; 410 my $focus = $FOCUS; $FOCUS = $self;
289 411
290 $self->emit (focus_in => $focus); 412 $self->_emit (focus_in => $focus);
291 413
292 $focus->update if $focus; 414 $focus->update if $focus;
293 $FOCUS->update; 415 $FOCUS->update;
294} 416}
295 417
… …
298 420
299 return unless $FOCUS == $self; 421 return unless $FOCUS == $self;
300 422
301 my $focus = $FOCUS; undef $FOCUS; 423 my $focus = $FOCUS; undef $FOCUS;
302 424
303 $self->emit (focus_out => $focus); 425 $self->_emit (focus_out => $focus);
304 426
305 $focus->update if $focus; #? 427 $focus->update if $focus; #?
428
429 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
430 unless $FOCUS;
306} 431}
307 432
308sub mouse_motion { } 433sub mouse_motion { }
309sub button_up { } 434sub button_up { }
310sub key_down { } 435sub key_down { }
311sub key_up { } 436sub key_up { }
312 437
313sub button_down { 438sub button_down {
314 my ($self, $ev, $x, $y) = @_; 439 my ($self, $ev, $x, $y) = @_;
315 440
316 $self->focus_in; 441 $self->focus_in;
… …
350 if ($ENV{PCLIENT_DEBUG}) { 475 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix; 476 glPushMatrix;
352 glColor 1, 1, 0, 1; 477 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 478 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP; 479 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0; 480 glVertex 0 , 0;
356 glVertex $self->{w}, 0; 481 glVertex $self->{w} - 1, 0;
357 glVertex $self->{w}, $self->{h}; 482 glVertex $self->{w} - 1, $self->{h} - 1;
358 glVertex 0 , $self->{h}; 483 glVertex 0 , $self->{h} - 1;
359 glEnd; 484 glEnd;
360 glPopMatrix; 485 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 486 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 } 487 }
363} 488}
364 489
365sub _draw { 490sub _draw {
366 my ($self) = @_; 491 my ($self) = @_;
… …
383sub set_parent { 508sub set_parent {
384 my ($self, $parent) = @_; 509 my ($self, $parent) = @_;
385 510
386 Scalar::Util::weaken ($self->{parent} = $parent); 511 Scalar::Util::weaken ($self->{parent} = $parent);
387 512
513 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
514
388 $self->check_size 515 $self->check_size;
389 unless exists $self->{req_w};
390} 516}
391 517
392sub check_size { 518sub check_size {
393 my ($self) = @_; 519 my ($self, $forced) = @_;
394 520
521 $self->{force_alloc} = 1 if $forced;
395 $CFClient::UI::ROOT->{check_size}{$self} = $self; 522 $CFClient::UI::ROOT->{check_size}{$self} = $self;
396} 523}
397 524
398sub update { 525sub update {
399 my ($self) = @_; 526 my ($self) = @_;
… …
406 my ($self, $signal, $cb) = @_; 533 my ($self, $signal, $cb) = @_;
407 534
408 push @{ $self->{signal_cb}{$signal} }, $cb; 535 push @{ $self->{signal_cb}{$signal} }, $cb;
409} 536}
410 537
538sub _emit {
539 my ($self, $signal, @args) = @_;
540
541 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
542}
543
411sub emit { 544sub emit {
412 my ($self, $signal, @args) = @_; 545 my ($self, $signal, @args) = @_;
413 546
414 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 547 $self->_emit ($signal, @args)
548 || $self->$signal (@args);
549}
550
551sub visibility_change {
552 #my ($self, $visible) = @_;
415} 553}
416 554
417sub DESTROY { 555sub DESTROY {
418 my ($self) = @_; 556 my ($self) = @_;
419 557
558 delete $WIDGET{$self+0};
420 #$self->deactivate; 559 #$self->deactivate;
421} 560}
422 561
423############################################################################# 562#############################################################################
424 563
… …
433 my $class = shift; 572 my $class = shift;
434 573
435 # range [value, low, high, page] 574 # range [value, low, high, page]
436 575
437 $class->SUPER::new ( 576 $class->SUPER::new (
438 bg => [0, 0, 0, 0.2], 577 #bg => [0, 0, 0, 0.2],
439 active_bg => [1, 1, 1, 0.5], 578 #active_bg => [1, 1, 1, 0.5],
440 @_ 579 @_
441 ) 580 )
442} 581}
443 582
444sub _draw { 583sub _draw {
445 my ($self) = @_; 584 my ($self) = @_;
446 585
586 my $color = $FOCUS == $self && $self->{active_bg}
587 ? $self->{active_bg}
588 : $self->{bg};
589
590 if ($color && (@$color < 4 || $color->[3])) {
447 my ($w, $h) = @$self{qw(w h)}; 591 my ($w, $h) = @$self{qw(w h)};
448 592
449 glEnable GL_BLEND; 593 glEnable GL_BLEND;
450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 595 glColor @$color;
452 596
453 glBegin GL_QUADS; 597 glBegin GL_QUADS;
454 glVertex 0 , 0; 598 glVertex 0 , 0;
455 glVertex 0 , $h; 599 glVertex 0 , $h;
456 glVertex $w, $h; 600 glVertex $w, $h;
457 glVertex $w, 0; 601 glVertex $w, 0;
458 glEnd; 602 glEnd;
459 603
460 glDisable GL_BLEND; 604 glDisable GL_BLEND;
605 }
461} 606}
462 607
463############################################################################# 608#############################################################################
464 609
465package CFClient::UI::Empty; 610package CFClient::UI::Empty;
… …
509 $self->{children} = [ 654 $self->{children} = [
510 sort { $a->{z} <=> $b->{z} } 655 sort { $a->{z} <=> $b->{z} }
511 @{$self->{children}}, @widgets 656 @{$self->{children}}, @widgets
512 ]; 657 ];
513 658
514 $self->check_size; 659 $self->check_size (1);
515 $self->update; 660 $self->update;
516} 661}
517 662
518sub children { 663sub children {
519 @{ $_[0]{children} } 664 @{ $_[0]{children} }
… …
525 delete $child->{parent}; 670 delete $child->{parent};
526 $child->hide; 671 $child->hide;
527 672
528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 673 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529 674
530 $self->check_size; 675 $self->check_size (1);
531 $self->update; 676 $self->update;
532} 677}
533 678
534sub clear { 679sub clear {
535 my ($self) = @_; 680 my ($self) = @_;
… …
626} 771}
627 772
628sub update { 773sub update {
629 my ($self) = @_; 774 my ($self) = @_;
630 775
631 $ROOT->on_refresh ($self => sub { $self->render_child }); 776 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->SUPER::update; 777 $self->SUPER::update;
633} 778}
634 779
635sub size_allocate { 780sub size_allocate {
636 my ($self, $w, $h) = @_; 781 my ($self, $w, $h) = @_;
… …
649 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 794 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
650 glClearColor 0, 0, 0, 0; 795 glClearColor 0, 0, 0, 0;
651 glClear GL_COLOR_BUFFER_BIT; 796 glClear GL_COLOR_BUFFER_BIT;
652 797
653 $self->_render; 798 $self->_render;
654# glColorMask 1, 1, 1, 0;
655# glEnable GL_BLEND;
656# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
657# glRasterPos 0, 0;
658# glCopyPixels 0, 0, $self->{w}, $self->{h};
659# glDisable GL_BLEND;
660# glColorMask 1, 1, 1, 1;
661 }; 799 };
662} 800}
663 801
664sub _draw { 802sub _draw {
665 my ($self) = @_; 803 my ($self) = @_;
… …
669 my $tex = $self->{texture} 807 my $tex = $self->{texture}
670 or return; 808 or return;
671 809
672 glEnable GL_TEXTURE_2D; 810 glEnable GL_TEXTURE_2D;
673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
674 glColor 0, 0, 0, 1; 812 glColor 1, 1, 1, 1;
675 813
676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 814 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
677 815
678 glDisable GL_TEXTURE_2D; 816 glDisable GL_TEXTURE_2D;
679} 817}
… …
682 820
683package CFClient::UI::ViewPort; 821package CFClient::UI::ViewPort;
684 822
685our @ISA = CFClient::UI::Window::; 823our @ISA = CFClient::UI::Window::;
686 824
825sub new {
826 my $class = shift;
827
828 $class->SUPER::new (
829 scroll_x => 0,
830 scroll_y => 1,
831 @_,
832 )
833}
834
687sub size_request { 835sub size_request {
688 my ($self) = @_; 836 my ($self) = @_;
689 837
690 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 838 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
692 839
693 @$self{qw(child_w child_h)} 840 $w = 10 if $self->{scroll_x};
841 $h = 10 if $self->{scroll_y};
842
843 ($w, $h)
694} 844}
695 845
696sub size_allocate { 846sub size_allocate {
697 my ($self, $w, $h) = @_; 847 my ($self, $w, $h) = @_;
698 848
849 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
850 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
851
852 $self->child->configure (0, 0, $w, $h);
699 $self->update; 853 $self->update;
700} 854}
701 855
702sub set_offset { 856sub set_offset {
703 my ($self, $x, $y) = @_; 857 my ($self, $x, $y) = @_;
… …
754 my $class = shift; 908 my $class = shift;
755 909
756 my $self; 910 my $self;
757 911
758 my $slider = new CFClient::UI::Slider 912 my $slider = new CFClient::UI::Slider
759 vertical => 1, 913 vertical => 1,
760 range => [0, 0, 1, 0.01], # HACK fix 914 range => [0, 0, 1, 0.01], # HACK fix
761 connect_changed => sub { 915 on_changed => sub {
762 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 916 $self->{vp}->set_offset (0, $_[1]);
763 }, 917 },
764 ; 918 ;
765 919
766 $self = $class->SUPER::new ( 920 $self = $class->SUPER::new (
767 vp => (new CFClient::UI::ViewPort), 921 vp => (new CFClient::UI::ViewPort expand => 1),
768 slider => $slider, 922 slider => $slider,
769 @_, 923 @_,
770 ); 924 );
771 925
772 $self->{vp}->add ($self->{scrolled}); 926 $self->{vp}->add ($self->{scrolled});
… …
774 $self->add ($self->{slider}); 928 $self->add ($self->{slider});
775 929
776 $self 930 $self
777} 931}
778 932
933sub update {
934 my ($self) = @_;
935
936 $self->SUPER::update;
937
938 # todo: overwrite size_allocate of child
939 my $child = $self->{vp}->child;
940 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
941}
942
943sub size_allocate {
944 my ($self, $w, $h) = @_;
945
946 $self->SUPER::size_allocate ($w, $h);
947
948 my $child = $self->{vp}->child;
949 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
950}
951
779#TODO# update range on size_allocate depeneing on child 952#TODO# update range on size_allocate depending on child
780# update viewport offset on scroll 953# update viewport offset on scroll
781 954
782############################################################################# 955#############################################################################
783 956
784package CFClient::UI::Frame; 957package CFClient::UI::Frame;
… …
788use CFClient::OpenGL; 961use CFClient::OpenGL;
789 962
790sub new { 963sub new {
791 my $class = shift; 964 my $class = shift;
792 965
793 my $self = $class->SUPER::new ( 966 $class->SUPER::new (
794 bg => [1, 1, 1, 1], 967 bg => undef,
795 border_bg => [1, 1, 1, 1],
796 border => 0.8,
797 @_ 968 @_,
798 ); 969 )
799
800 $self
801} 970}
802 971
803sub _draw { 972sub _draw {
804 my ($self) = @_; 973 my ($self) = @_;
805 974
806 my ($w, $h) = ($self->{w}, $self->{h}); 975 if ($self->{bg}) {
976 my ($w, $h) = @$self{qw(w h)};
807 977
808 glEnable GL_BLEND; 978 glEnable GL_BLEND;
809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 979 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810 glEnable GL_TEXTURE_2D; 980 glColor @{ $self->{bg} };
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812 981
813# glBegin GL_QUADS; 982 glBegin GL_QUADS;
814# glColor 0, 0, 0, 0;
815# glVertex 0 , 0; 983 glVertex 0 , 0;
816# glVertex 0 , $h; 984 glVertex 0 , $h;
817# glVertex $w, $h; 985 glVertex $w, $h;
818# glVertex $w, 0; 986 glVertex $w, 0;
819# glEnd; 987 glEnd;
820 988
821
822 $self->child->draw;
823 glDisable GL_BLEND; 989 glDisable GL_BLEND;
824 glDisable GL_TEXTURE_2D; 990 }
991
992 $self->SUPER::_draw;
825} 993}
826 994
827############################################################################# 995#############################################################################
828 996
829package CFClient::UI::FancyFrame; 997package CFClient::UI::FancyFrame;
… …
837 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1005 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
838 1006
839sub new { 1007sub new {
840 my $class = shift; 1008 my $class = shift;
841 1009
842 # TODO: user_x, user_y, overwrite moveto?
843
844 my $self = $class->SUPER::new ( 1010 my $self = $class->SUPER::new (
845 bg => [1, 1, 1, 1], 1011 bg => [1, 1, 1, 1],
846 border_bg => [1, 1, 1, 1], 1012 border_bg => [1, 1, 1, 1],
847 border => 0.6, 1013 border => 0.6,
1014 is_toplevel => 1,
848 can_events => 1, 1015 can_events => 1,
849 @_ 1016 @_
850 ); 1017 );
851 1018
852 $self->{title} &&= new CFClient::UI::Label 1019 $self->{title} &&= new CFClient::UI::Label
853 align => 0, 1020 align => 0,
… …
877 my ($self, $w, $h) = @_; 1044 my ($self, $w, $h) = @_;
878 1045
879 $h -= List::Util::max 0, $self->border * 2; 1046 $h -= List::Util::max 0, $self->border * 2;
880 $w -= List::Util::max 0, $self->border * 2; 1047 $w -= List::Util::max 0, $self->border * 2;
881 1048
882 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1049 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
883 if $self->{title}; 1050 if $self->{title};
884 1051
885 $self->child->configure ($self->border, $self->border, $w, $h); 1052 $self->child->configure ($self->border, $self->border, $w, $h);
886} 1053}
887 1054
… …
906 my ($ev, $x, $y) = @_; 1073 my ($ev, $x, $y) = @_;
907 1074
908 my $dx = $ev->{x} - $ox; 1075 my $dx = $ev->{x} - $ox;
909 my $dy = $ev->{y} - $oy; 1076 my $dy = $ev->{y} - $oy;
910 1077
1078 $self->{user_x} = $wx + $dx * $mx;
1079 $self->{user_y} = $wy + $dy * $my;
911 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1080 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
912 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1081 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
913 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1082 $self->move ($self->{user_x}, $self->{user_y});
914 $self->check_size; 1083 $self->check_size;
915 }; 1084 };
916 1085
917 } elsif ($lr ^ $td) { 1086 } elsif ($lr ^ $td) {
918 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1087 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
921 $self->{motion} = sub { 1090 $self->{motion} = sub {
922 my ($ev, $x, $y) = @_; 1091 my ($ev, $x, $y) = @_;
923 1092
924 ($x, $y) = ($ev->{x}, $ev->{y}); 1093 ($x, $y) = ($ev->{x}, $ev->{y});
925 1094
926 $self->move ($bx + $x - $ox, $by + $y - $oy); 1095 $self->{user_x} = $bx + $x - $ox;
1096 $self->{user_y} = $by + $y - $oy;
1097
1098 $self->move ($self->{user_x}, $self->{user_y});
927 $self->update; 1099 $self->update;
928 }; 1100 };
929 } 1101 }
930} 1102}
931 1103
… …
945 my ($self) = @_; 1117 my ($self) = @_;
946 1118
947 my ($w, $h ) = ($self->{w}, $self->{h}); 1119 my ($w, $h ) = ($self->{w}, $self->{h});
948 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
949 1121
950 glEnable GL_BLEND;
951 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952 glEnable GL_TEXTURE_2D; 1122 glEnable GL_TEXTURE_2D;
953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954 1124
955 my $border = $self->border; 1125 my $border = $self->border;
956 1126
957 glColor @{ $self->{border_bg} }; 1127 glColor @{ $self->{border_bg} };
958 $tex[1]->draw_quad (0, 0, $w, $border); 1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
959 $tex[3]->draw_quad (0, $border, $border, $ch); 1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
962 1132
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964 my $bg = $tex[0]; 1134 my $bg = $tex[0];
965 1135
966 # TODO: repeat texture not scale 1136 # TODO: repeat texture not scale
… …
970 glColor @{ $self->{bg} }; 1140 glColor @{ $self->{bg} };
971 1141
972 $bg->{s} = $rep_x; 1142 $bg->{s} = $rep_x;
973 $bg->{t} = $rep_y; 1143 $bg->{t} = $rep_y;
974 $bg->{wrap_mode} = 1; 1144 $bg->{wrap_mode} = 1;
975 $bg->draw_quad ($border, $border, $cw, $ch); 1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 }
976 1147
977 glDisable GL_TEXTURE_2D; 1148 glDisable GL_TEXTURE_2D;
978 glDisable GL_BLEND;
979 }
980 1149
981 $self->{title}->draw if $self->{title}; 1150 $self->{title}->draw if $self->{title};
982 1151
983 $self->child->draw; 1152 $self->child->draw;
984} 1153}
… …
996sub new { 1165sub new {
997 my $class = shift; 1166 my $class = shift;
998 1167
999 $class->SUPER::new ( 1168 $class->SUPER::new (
1000 col_expand => [], 1169 col_expand => [],
1001 @_ 1170 @_,
1002 ) 1171 )
1172}
1173
1174sub children {
1175 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1003} 1176}
1004 1177
1005sub add { 1178sub add {
1006 my ($self, $x, $y, $child) = @_; 1179 my ($self, $x, $y, $child) = @_;
1007 1180
1008 $child->set_parent ($self); 1181 $child->set_parent ($self);
1009 $self->{children}[$y][$x] = $child; 1182 $self->{children}[$y][$x] = $child;
1010 1183
1011 $child->check_size; 1184 $self->check_size (1);
1012} 1185}
1013 1186
1014sub children {
1015 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1016}
1017
1018# 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?
1019sub clear { 1188sub clear {
1020 my ($self) = @_; 1189 my ($self) = @_;
1021 1190
1022 my @children = $self->children; 1191 my @children = $self->children;
1023 delete $self->{children}; 1192 delete $self->{children};
… …
1025 for (@children) { 1194 for (@children) {
1026 delete $_->{parent}; 1195 delete $_->{parent};
1027 $_->hide; 1196 $_->hide;
1028 } 1197 }
1029 1198
1199 $self->check_size (1);
1030 $self->update; 1200 $self->update;
1031} 1201}
1032 1202
1033sub get_wh { 1203sub get_wh {
1034 my ($self) = @_; 1204 my ($self) = @_;
… …
1066sub size_allocate { 1236sub size_allocate {
1067 my ($self, $w, $h) = @_; 1237 my ($self, $w, $h) = @_;
1068 1238
1069 my ($ws, $hs) = $self->get_wh; 1239 my ($ws, $hs) = $self->get_wh;
1070 1240
1071 my $req_w = sum @$ws; 1241 my $req_w = (sum @$ws) || 1;
1072 my $req_h = sum @$hs; 1242 my $req_h = (sum @$hs) || 1;
1073 1243
1074 # TODO: nicer code && do row_expand 1244 # TODO: nicer code && do row_expand
1075 my @col_expand = @{$self->{col_expand}}; 1245 my @col_expand = @{$self->{col_expand}};
1076 @col_expand = (1) x @$ws unless @col_expand; 1246 @col_expand = (1) x @$ws unless @col_expand;
1077 my $col_expand = (sum @col_expand) || 1; 1247 my $col_expand = (sum @col_expand) || 1;
… …
1131 } 1301 }
1132} 1302}
1133 1303
1134############################################################################# 1304#############################################################################
1135 1305
1136package CFClient::UI::HBox; 1306package CFClient::UI::Box;
1137
1138# TODO: wrap into common Box base class
1139 1307
1140our @ISA = CFClient::UI::Container::; 1308our @ISA = CFClient::UI::Container::;
1141 1309
1142sub size_request { 1310sub size_request {
1143 my ($self) = @_; 1311 my ($self) = @_;
1144 1312
1145 my @alloc = map [$_->size_request], @{$self->{children}}; 1313 $self->{vertical}
1146 1314 ? (
1147 ( 1315 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1148 (List::Util::sum map $_->[0], @alloc), 1316 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1149 (List::Util::max map $_->[1], @alloc), 1317 )
1150 ) 1318 : (
1319 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1320 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1321 )
1151} 1322}
1152 1323
1153sub size_allocate { 1324sub size_allocate {
1154 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
1155 1326
1156 ($h, $w) = ($w, $h); 1327 my $space = $self->{vertical} ? $h : $w;
1157
1158 my $children = $self->{children}; 1328 my $children = $self->{children};
1159 1329
1160 my @h = map $_->{req_w}, @$children; 1330 my @req;
1161 1331
1162 my $req_h = List::Util::sum @h; 1332 if ($self->{homogeneous}) {
1163 1333 @req = ($space / (@$children || 1)) x @$children;
1164 if ($req_h > $h) {
1165 # ah well, not enough space
1166 $_ *= $h / $req_h for @h;
1167 } else { 1334 } else {
1335 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1336 my $req = List::Util::sum @req;
1337
1338 if ($req > $space) {
1339 # ah well, not enough space
1340 $_ *= $space / $req for @req;
1341 } else {
1168 my $exp = List::Util::sum map $_->{expand}, @$children; 1342 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1169 $exp ||= 1;
1170 1343
1344 $space = ($space - $req) / $expand; # remaining space to give away
1345
1346 $req[$_] += $space * $children->[$_]{expand}
1171 for (0 .. $#$children) { 1347 for 0 .. $#$children;
1172 my $child = $children->[$_];
1173
1174 my $alloc_h = $h[$_];
1175 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1176 $h[$_] = $alloc_h;
1177 } 1348 }
1178 } 1349 }
1179 1350
1180 CFClient::UI::harmonize \@h; 1351 CFClient::UI::harmonize \@req;
1181 1352
1182 my $y = 0; 1353 my $pos = 0;
1183 for (0 .. $#$children) { 1354 for (0 .. $#$children) {
1184 my $child = $children->[$_];
1185 my $h = $h[$_]; 1355 my $alloc = $req[$_];
1186 $child->configure ($y, 0, $h, $w); 1356 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1187 1357
1188 $y += $h; 1358 $pos += $alloc;
1189 } 1359 }
1190 1360
1191 1 1361 1
1192} 1362}
1193 1363
1194############################################################################# 1364#############################################################################
1195 1365
1366package CFClient::UI::HBox;
1367
1368our @ISA = CFClient::UI::Box::;
1369
1370sub new {
1371 my $class = shift;
1372
1373 $class->SUPER::new (
1374 vertical => 0,
1375 @_,
1376 )
1377}
1378
1379#############################################################################
1380
1196package CFClient::UI::VBox; 1381package CFClient::UI::VBox;
1197 1382
1198# TODO: wrap into common Box base class
1199
1200our @ISA = CFClient::UI::Container::; 1383our @ISA = CFClient::UI::Box::;
1201 1384
1202sub size_request { 1385sub new {
1203 my ($self) = @_; 1386 my $class = shift;
1204 1387
1205 my @alloc = map [$_->size_request], @{$self->{children}}; 1388 $class->SUPER::new (
1206 1389 vertical => 1,
1207 ( 1390 @_,
1208 (List::Util::max map $_->[0], @alloc),
1209 (List::Util::sum map $_->[1], @alloc),
1210 ) 1391 )
1211} 1392}
1212 1393
1213sub size_allocate {
1214 my ($self, $w, $h) = @_;
1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1218 my $children = $self->{children};
1219
1220 my @h = map $_->{req_h}, @$children;
1221
1222 my $req_h = List::Util::sum @h;
1223
1224 if ($req_h > $h) {
1225 # ah well, not enough space
1226 $_ *= $h / $req_h for @h;
1227 } else {
1228 my $exp = List::Util::sum map $_->{expand}, @$children;
1229 $exp ||= 1;
1230
1231 for (0 .. $#$children) {
1232 my $child = $children->[$_];
1233
1234 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1235 }
1236 }
1237
1238 CFClient::UI::harmonize \@h;
1239
1240 my $y = 0;
1241 for (0 .. $#$children) {
1242 my $child = $children->[$_];
1243 my $h = $h[$_];
1244 $child->configure (0, $y, $w, $h);
1245
1246 $y += $h;
1247 }
1248
1249 1
1250}
1251
1252############################################################################# 1394#############################################################################
1253 1395
1254package CFClient::UI::Label; 1396package CFClient::UI::Label;
1255 1397
1256our @ISA = CFClient::UI::Base::; 1398our @ISA = CFClient::UI::DrawBG::;
1257 1399
1258use CFClient::OpenGL; 1400use CFClient::OpenGL;
1259 1401
1260sub new { 1402sub new {
1261 my ($class, %arg) = @_; 1403 my ($class, %arg) = @_;
1262 1404
1263 my $self = $class->SUPER::new ( 1405 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1406 fg => [1, 1, 1],
1407 #bg => none
1408 #active_bg => none
1265 #font => default_font 1409 #font => default_font
1266 #text => initial text 1410 #text => initial text
1267 #markup => initial narkup 1411 #markup => initial narkup
1412 #max_w => maximum pixel width
1413 ellipsise => 3, # end
1268 layout => (new CFClient::Layout), 1414 layout => (new CFClient::Layout),
1269 fontsize => 1, 1415 fontsize => 1,
1270 align => -1, 1416 align => -1,
1271 valign => -1, 1417 valign => -1,
1272 padding => 2, 1418 padding => 2,
… …
1287 } 1433 }
1288 1434
1289 $self 1435 $self
1290} 1436}
1291 1437
1292sub escape { 1438sub escape($) {
1293 local $_ = $_[1]; 1439 local $_ = $_[0];
1294 1440
1295 s/&/&amp;/g; 1441 s/&/&amp;/g;
1296 s/>/&gt;/g; 1442 s/>/&gt;/g;
1297 s/</&lt;/g; 1443 s/</&lt;/g;
1298 1444
1299 $_[1] 1445 $_
1300} 1446}
1301 1447
1302sub update { 1448sub update {
1303 my ($self) = @_; 1449 my ($self) = @_;
1304 1450
… …
1337sub size_request { 1483sub size_request {
1338 my ($self) = @_; 1484 my ($self) = @_;
1339 1485
1340 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1486 $self->{layout}->set_font ($self->{font}) if $self->{font};
1341 $self->{layout}->set_width ($self->{max_w} || -1); 1487 $self->{layout}->set_width ($self->{max_w} || -1);
1488 $self->{layout}->set_ellipsise ($self->{ellipsise});
1489 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1342 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1490 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1491
1344 my ($w, $h) = $self->{layout}->size; 1492 my ($w, $h) = $self->{layout}->size;
1345 1493
1346 if (exists $self->{template}) { 1494 if (exists $self->{template}) {
… …
1376} 1524}
1377 1525
1378sub _draw { 1526sub _draw {
1379 my ($self) = @_; 1527 my ($self) = @_;
1380 1528
1529 $self->SUPER::_draw; # draw background, if applicable
1530
1381 my $tex = $self->{texture} ||= do { 1531 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}}); 1532 $self->{layout}->set_foreground (@{$self->{fg}});
1383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1533 $self->{layout}->set_font ($self->{font}) if $self->{font};
1384 $self->{layout}->set_width ($self->{w}); 1534 $self->{layout}->set_width ($self->{w});
1535 $self->{layout}->set_ellipsise ($self->{ellipsise});
1536 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1537 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1386 1538
1387 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1539 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388 1540
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1541 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1542 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5; 1543 : ($self->{w} - $tex->{w}) * 0.5);
1392 1544
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1545 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1546 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5; 1547 : ($self->{h} - $tex->{h}) * 0.5);
1396 1548
1397 $tex 1549 $tex
1398 }; 1550 };
1399 1551
1400 glEnable GL_TEXTURE_2D; 1552 glEnable GL_TEXTURE_2D;
… …
1428 active_fg => [0, 0, 0], 1580 active_fg => [0, 0, 0],
1429 can_hover => 1, 1581 can_hover => 1,
1430 can_focus => 1, 1582 can_focus => 1,
1431 valign => 0, 1583 valign => 0,
1432 can_events => 1, 1584 can_events => 1,
1585 #text => ...
1433 @_ 1586 @_
1434 ) 1587 )
1435} 1588}
1436 1589
1437sub _set_text { 1590sub _set_text {
… …
1447 $self->{text} = $text; 1600 $self->{text} = $text;
1448 1601
1449 $text =~ s/./*/g if $self->{hidden}; 1602 $text =~ s/./*/g if $self->{hidden};
1450 $self->{layout}->set_text ("$text "); 1603 $self->{layout}->set_text ("$text ");
1451 1604
1452 $self->emit (changed => $self->{text}); 1605 $self->_emit (changed => $self->{text});
1453} 1606}
1454 1607
1455sub set_text { 1608sub set_text {
1456 my ($self, $text) = @_; 1609 my ($self, $text) = @_;
1457 1610
1458 $self->{cursor} = length $text; 1611 $self->{cursor} = length $text;
1459 $self->_set_text ($text); 1612 $self->_set_text ($text);
1613 $self->update;
1460 $self->check_size; 1614 $self->check_size;
1461 $self->update;
1462} 1615}
1463 1616
1464sub get_text { 1617sub get_text {
1465 $_[0]{text} 1618 $_[0]{text}
1466} 1619}
… …
1469 my ($self) = @_; 1622 my ($self) = @_;
1470 1623
1471 my ($w, $h) = $self->SUPER::size_request; 1624 my ($w, $h) = $self->SUPER::size_request;
1472 1625
1473 ($w + 1, $h) # add 1 for cursor 1626 ($w + 1, $h) # add 1 for cursor
1474}
1475
1476sub size_allocate {
1477 my ($self, $w, $h) = @_;
1478
1479 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1480} 1627}
1481 1628
1482sub key_down { 1629sub key_down {
1483 my ($self, $ev) = @_; 1630 my ($self, $ev) = @_;
1484 1631
… …
1486 my $sym = $ev->{sym}; 1633 my $sym = $ev->{sym};
1487 my $uni = $ev->{unicode}; 1634 my $uni = $ev->{unicode};
1488 1635
1489 my $text = $self->get_text; 1636 my $text = $self->get_text;
1490 1637
1491 if ($sym == 8) { 1638 if ($uni == 8) {
1492 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1639 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493 } elsif ($sym == 127) { 1640 } elsif ($uni == 127) {
1494 substr $text, $self->{cursor}, 1, ""; 1641 substr $text, $self->{cursor}, 1, "";
1495 } elsif ($sym == CFClient::SDLK_LEFT) { 1642 } elsif ($sym == CFClient::SDLK_LEFT) {
1496 --$self->{cursor} if $self->{cursor}; 1643 --$self->{cursor} if $self->{cursor};
1497 } elsif ($sym == CFClient::SDLK_RIGHT) { 1644 } elsif ($sym == CFClient::SDLK_RIGHT) {
1498 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1645 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1499 } elsif ($sym == CFClient::SDLK_HOME) { 1646 } elsif ($sym == CFClient::SDLK_HOME) {
1500 $self->{cursor} = 0; 1647 $self->{cursor} = 0;
1501 } elsif ($sym == CFClient::SDLK_END) { 1648 } elsif ($sym == CFClient::SDLK_END) {
1502 $self->{cursor} = length $text; 1649 $self->{cursor} = length $text;
1503 } elsif ($sym == 27) { 1650 } elsif ($uni == 27) {
1504 $self->emit ('escape'); 1651 $self->_emit ('escape');
1505 } elsif ($uni) { 1652 } elsif ($uni) {
1506 substr $text, $self->{cursor}++, 0, chr $uni; 1653 substr $text, $self->{cursor}++, 0, chr $uni;
1507 } 1654 }
1508 1655
1509 $self->_set_text ($text); 1656 $self->_set_text ($text);
1510 $self->update; 1657 $self->update;
1658 $self->check_size;
1511} 1659}
1512 1660
1513sub focus_in { 1661sub focus_in {
1514 my ($self) = @_; 1662 my ($self) = @_;
1515 1663
… …
1595 if ($sym == 13) { 1743 if ($sym == 13) {
1596 unshift @{$self->{history}}, 1744 unshift @{$self->{history}},
1597 my $txt = $self->get_text; 1745 my $txt = $self->get_text;
1598 $self->{history_pointer} = -1; 1746 $self->{history_pointer} = -1;
1599 $self->{history_saveback} = ''; 1747 $self->{history_saveback} = '';
1600 $self->emit (activate => $txt); 1748 $self->_emit (activate => $txt);
1601 $self->update; 1749 $self->update;
1602 1750
1603 } elsif ($sym == CFClient::SDLK_UP) { 1751 } elsif ($sym == CFClient::SDLK_UP) {
1604 if ($self->{history_pointer} < 0) { 1752 if ($self->{history_pointer} < 0) {
1605 $self->{history_saveback} = $self->get_text; 1753 $self->{history_saveback} = $self->get_text;
… …
1644 my $class = shift; 1792 my $class = shift;
1645 1793
1646 $class->SUPER::new ( 1794 $class->SUPER::new (
1647 padding => 4, 1795 padding => 4,
1648 fg => [1, 1, 1], 1796 fg => [1, 1, 1],
1649 bg => [1, 1, 1, 0.2],
1650 active_fg => [0, 0, 1], 1797 active_fg => [0, 0, 1],
1651 can_hover => 1, 1798 can_hover => 1,
1652 align => 0, 1799 align => 0,
1653 valign => 0, 1800 valign => 0,
1654 can_events => 1, 1801 can_events => 1,
1655 @_ 1802 @_
1656 ) 1803 )
1657} 1804}
1658 1805
1806sub activate { }
1807
1659sub button_up { 1808sub button_up {
1660 my ($self, $ev, $x, $y) = @_; 1809 my ($self, $ev, $x, $y) = @_;
1661 1810
1811 $self->emit ("activate")
1662 if ($x >= 0 && $x < $self->{w} 1812 if $x >= 0 && $x < $self->{w}
1663 && $y >= 0 && $y < $self->{h}) { 1813 && $y >= 0 && $y < $self->{h};
1664 $self->emit ("activate");
1665 }
1666} 1814}
1667 1815
1668sub _draw { 1816sub _draw {
1669 my ($self) = @_; 1817 my ($self) = @_;
1670 1818
… …
1672 1820
1673 if ($GRAB == $self) { 1821 if ($GRAB == $self) {
1674 $self->{fg} = $self->{active_fg}; 1822 $self->{fg} = $self->{active_fg};
1675 } 1823 }
1676 1824
1677 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679 glEnable GL_TEXTURE_2D; 1825 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1826 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681 glColor 0, 0, 0, 1; 1827 glColor 0, 0, 0, 1;
1682 1828
1683 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1829 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1684 1830
1685 glDisable GL_TEXTURE_2D; 1831 glDisable GL_TEXTURE_2D;
1686 glDisable GL_BLEND;
1687 1832
1688 $self->SUPER::_draw; 1833 $self->SUPER::_draw;
1689} 1834}
1690 1835
1691############################################################################# 1836#############################################################################
… …
1705 1850
1706 $class->SUPER::new ( 1851 $class->SUPER::new (
1707 padding => 2, 1852 padding => 2,
1708 fg => [1, 1, 1], 1853 fg => [1, 1, 1],
1709 active_fg => [1, 1, 0], 1854 active_fg => [1, 1, 0],
1855 bg => [0, 0, 0, 0.2],
1856 active_bg => [1, 1, 1, 0.5],
1710 state => 0, 1857 state => 0,
1711 can_hover => 1, 1858 can_hover => 1,
1712 @_ 1859 @_
1713 ) 1860 )
1714} 1861}
… …
1723 my ($self, $ev, $x, $y) = @_; 1870 my ($self, $ev, $x, $y) = @_;
1724 1871
1725 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1872 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1726 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1873 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1727 $self->{state} = !$self->{state}; 1874 $self->{state} = !$self->{state};
1728 $self->emit (changed => $self->{state}); 1875 $self->_emit (changed => $self->{state});
1729 } 1876 }
1730} 1877}
1731 1878
1732sub _draw { 1879sub _draw {
1733 my ($self) = @_; 1880 my ($self) = @_;
… …
1738 1885
1739 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1886 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1740 1887
1741 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1888 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1742 1889
1743 glEnable GL_BLEND; 1890 my $tex = $self->{state} ? $tex[1] : $tex[0];
1891
1744 glEnable GL_TEXTURE_2D; 1892 glEnable GL_TEXTURE_2D;
1745 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1746
1747 my $tex = $self->{state} ? $tex[1] : $tex[0];
1748
1749 $tex->draw_quad (0, 0, $s, $s); 1893 $tex->draw_quad_alpha (0, 0, $s, $s);
1750
1751 glDisable GL_TEXTURE_2D; 1894 glDisable GL_TEXTURE_2D;
1752 glDisable GL_BLEND;
1753} 1895}
1754 1896
1755############################################################################# 1897#############################################################################
1756 1898
1757package CFClient::UI::Image; 1899package CFClient::UI::Image;
… …
1800 glTranslate 0, -$self->{w}, 0; 1942 glTranslate 0, -$self->{w}, 0;
1801 1943
1802 ($w, $h) = ($h, $w); 1944 ($w, $h) = ($h, $w);
1803 } 1945 }
1804 1946
1805 glEnable GL_BLEND;
1806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1807 glEnable GL_TEXTURE_2D; 1947 glEnable GL_TEXTURE_2D;
1808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1809 1949
1810 $tex->draw_quad (0, 0, $w, $h); 1950 $tex->draw_quad_alpha (0, 0, $w, $h);
1811 1951
1812 glDisable GL_BLEND;
1813 glDisable GL_TEXTURE_2D; 1952 glDisable GL_TEXTURE_2D;
1814} 1953}
1815 1954
1816############################################################################# 1955#############################################################################
1817 1956
… …
2006 qw(s1_slider.png s1_slider_bg.png); 2145 qw(s1_slider.png s1_slider_bg.png);
2007 2146
2008sub new { 2147sub new {
2009 my $class = shift; 2148 my $class = shift;
2010 2149
2011 # range [value, low, high, page] 2150 # range [value, low, high, page, unit]
2012 2151
2013 # TODO: 0-width page 2152 # TODO: 0-width page
2014 # TODO: req_w/h are wrong with vertical 2153 # TODO: req_w/h are wrong with vertical
2015 # TODO: calculations are off 2154 # TODO: calculations are off
2016 my $self = $class->SUPER::new ( 2155 my $self = $class->SUPER::new (
2017 fg => [1, 1, 1], 2156 fg => [1, 1, 1],
2018 active_fg => [0, 0, 0], 2157 active_fg => [0, 0, 0],
2158 bg => [0, 0, 0, 0.2],
2159 active_bg => [1, 1, 1, 0.5],
2019 range => [0, 0, 100, 10], 2160 range => [0, 0, 100, 10, 0],
2020 req_w => $::WIDTH / 80, 2161 req_w => $::WIDTH / 80,
2021 req_h => $::WIDTH / 80, 2162 req_h => $::WIDTH / 80,
2022 vertical => 0, 2163 vertical => 0,
2023 can_hover => 1, 2164 can_hover => 1,
2024 inner_pad => 5, 2165 inner_pad => 0.02,
2025 @_ 2166 @_
2026 ); 2167 );
2027 2168
2169 $self->set_value ($self->{range}[0]);
2170 $self->update;
2171
2028 $self 2172 $self
2173}
2174
2175sub set_range {
2176 my ($self, $range) = @_;
2177
2178 ($range, $self->{range}) = ($self->{range}, $range);
2179
2180 $self->update
2181 if "@$range" ne "@{$self->{range}}";
2182}
2183
2184sub set_value {
2185 my ($self, $value) = @_;
2186
2187 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2188
2189 $hi = $lo + 1 if $hi <= $lo;
2190
2191 $page = $hi - $lo if $page > $hi - $lo;
2192
2193 $value = $lo if $value < $lo;
2194 $value = $hi - $page if $value > $hi - $page;
2195
2196 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2197 if $unit;
2198
2199 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2200
2201 if ($value != $old_value) {
2202 $self->_emit (changed => $value);
2203 $self->update;
2204 }
2029} 2205}
2030 2206
2031sub size_request { 2207sub size_request {
2032 my ($self) = @_; 2208 my ($self) = @_;
2033 2209
… …
2039 2215
2040sub button_down { 2216sub button_down {
2041 my ($self, $ev, $x, $y) = @_; 2217 my ($self, $ev, $x, $y) = @_;
2042 2218
2043 $self->SUPER::button_down ($ev, $x, $y); 2219 $self->SUPER::button_down ($ev, $x, $y);
2220
2221 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2222
2044 $self->mouse_motion ($ev, $x, $y); 2223 $self->mouse_motion ($ev, $x, $y);
2045} 2224}
2046 2225
2047sub mouse_motion { 2226sub mouse_motion {
2048 my ($self, $ev, $x, $y) = @_; 2227 my ($self, $ev, $x, $y) = @_;
2049 2228
2050 if ($GRAB == $self) { 2229 if ($GRAB == $self) {
2230 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2231
2232 my (undef, $lo, $hi, $page) = @{$self->{range}};
2233
2234 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2235
2236 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2237 }
2238}
2239
2240sub update {
2241 my ($self) = @_;
2242
2243 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2244 $self->set_value ($self->{range}[0]);
2245
2051 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2246 my ($value, $lo, $hi, $page) = @{$self->{range}};
2247 my $range = ($hi - $page - $lo) || 1e-100;
2052 2248
2053 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2249 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2054 2250
2055 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2251 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2056 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2252 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2057 2253
2058 $x -= $inner_pad_px; # substract the padding 2254 $value = ($value - $lo) / $range;
2059 $x = $x * ($hi - $lo) / $inner_w + $lo; 2255 $value = $value * $self->{scale} + $self->{offset};
2060 $x = $lo if $x < $lo;
2061 $x = $hi - $page if $x > $hi - $page;
2062 $self->{range}[0] = $x;
2063 2256
2064 $self->emit (changed => $x); 2257 $self->{knob_x} = $value - $knob_w * 0.5;
2065 $self->update; 2258 $self->{knob_w} = $knob_w;
2066 } 2259 });
2067}
2068 2260
2069# the inner_* stuff is for generating a padding for the slider handle, 2261 $self->SUPER::update;
2070# so that the handle doesn't leave the texture. This calculation isn't 100%
2071# correct propably, but it does the job for now
2072sub _calc_inner_pad_px {
2073 my ($self, $w) = @_;
2074 ($w / 100) * $self->{inner_pad} # % to pixels
2075} 2262}
2076 2263
2077sub _draw { 2264sub _draw {
2078 my ($self) = @_; 2265 my ($self) = @_;
2079 2266
2080 $self->SUPER::_draw (); 2267 $self->SUPER::_draw ();
2081 2268
2082 my ($w, $h) = @$self{qw(w h)}; 2269 glScale $self->{w}, $self->{h};
2083 2270
2084 if ($self->{vertical}) { 2271 if ($self->{vertical}) {
2085 # draw a vertical slider like a rotated horizontal slider 2272 # draw a vertical slider like a rotated horizontal slider
2086 2273
2274 glTranslate 1, 0, 0;
2087 glRotate 90, 0, 0, 1; 2275 glRotate 90, 0, 0, 1;
2088 glTranslate 0, -$self->{w}, 0;
2089
2090 ($w, $h) = ($h, $w);
2091 } 2276 }
2092 2277
2093 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2278 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2094 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2279 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2095 2280
2096 my ($value, $lo, $hi, $page) = @{$self->{range}};
2097
2098 $hi = $value + 1 if $lo == $hi;
2099
2100 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2101 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2102
2103 $page = int $page * $inner_w / ($hi - $lo);
2104 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2105
2106 $w -= $page;
2107 $page &= ~1;
2108 glTranslate $page * 0.5, 0, 0;
2109 $page ||= 2;
2110
2111 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2112 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2113
2114 glEnable GL_BLEND;
2115 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2116 glEnable GL_TEXTURE_2D; 2281 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2283
2119 # draw background 2284 # draw background
2120 $tex[1]->draw_quad (0, 0, $w, $h); 2285 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2121 2286
2122 # draw handle 2287 # draw handle
2123 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2288 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2124 2289
2125 glDisable GL_BLEND;
2126 glDisable GL_TEXTURE_2D; 2290 glDisable GL_TEXTURE_2D;
2127} 2291}
2292
2293#############################################################################
2294
2295package CFClient::UI::ValSlider;
2296
2297our @ISA = CFClient::UI::HBox::;
2298
2299sub new {
2300 my ($class, %arg) = @_;
2301
2302 my $range = delete $arg{range};
2303
2304 my $self = $class->SUPER::new (
2305 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2306 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2307 to_value => sub { shift },
2308 from_value => sub { shift },
2309 %arg,
2310 );
2311
2312 $self->{slider}->connect (changed => sub {
2313 my ($self, $value) = @_;
2314 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2315 $self->{parent}->emit (changed => $value);
2316 });
2317
2318# $self->{entry}->connect (changed => sub {
2319# my ($self, $value) = @_;
2320# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2321# $self->{parent}->emit (changed => $value);
2322# });
2323
2324 $self->add ($self->{slider}, $self->{entry});
2325
2326 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2327
2328 $self
2329}
2330
2331sub set_range { shift->{slider}->set_range (@_) }
2332sub set_value { shift->{slider}->set_value (@_) }
2128 2333
2129############################################################################# 2334#############################################################################
2130 2335
2131package CFClient::UI::TextView; 2336package CFClient::UI::TextView;
2132 2337
… …
2141 fontsize => 1, 2346 fontsize => 1,
2142 can_events => 0, 2347 can_events => 0,
2143 #font => default_font 2348 #font => default_font
2144 @_, 2349 @_,
2145 2350
2146 layout => (new CFClient::Layout), 2351 layout => (new CFClient::Layout 1),
2147 par => [], 2352 par => [],
2148 height => 0, 2353 height => 0,
2149 children => [ 2354 children => [
2150 (new CFClient::UI::Empty expand => 1), 2355 (new CFClient::UI::Empty expand => 1),
2151 (new CFClient::UI::Slider vertical => 1), 2356 (new CFClient::UI::Slider vertical => 1),
… …
2162 2367
2163 $self->{fontsize} = $fontsize; 2368 $self->{fontsize} = $fontsize;
2164 $self->reflow; 2369 $self->reflow;
2165} 2370}
2166 2371
2167sub text_height {
2168 my ($self, $text) = @_;
2169
2170 my $layout = $self->{layout};
2171
2172 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2173 $layout->set_width ($self->{children}[0]{w});
2174 $layout->set_text ($text);
2175
2176 ($layout->size)[1]
2177}
2178
2179sub reflow {
2180 my ($self) = @_;
2181
2182 $self->{need_reflow}++;
2183 $self->update;
2184}
2185
2186sub size_allocate { 2372sub size_allocate {
2187 my ($self, $w, $h) = @_; 2373 my ($self, $w, $h) = @_;
2188 2374
2189 $self->SUPER::size_allocate ($w, $h); 2375 $self->SUPER::size_allocate ($w, $h);
2190 2376
… …
2193 $self->{layout}->set_width ($self->{children}[0]{w}); 2379 $self->{layout}->set_width ($self->{children}[0]{w});
2194 2380
2195 $self->reflow; 2381 $self->reflow;
2196} 2382}
2197 2383
2384sub text_size {
2385 my ($self, $text, $indent) = @_;
2386
2387 my $layout = $self->{layout};
2388
2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2390 $layout->set_width ($self->{children}[0]{w} - $indent);
2391 $layout->set_markup ($text);
2392
2393 $layout->size
2394}
2395
2396sub reflow {
2397 my ($self) = @_;
2398
2399 $self->{need_reflow}++;
2400 $self->update;
2401}
2402
2403sub set_offset {
2404 my ($self, $offset) = @_;
2405
2406 # todo: base offset on lines or so, not on pixels
2407 $self->{children}[1]->set_value ($offset);
2408}
2409
2410sub clear {
2411 my ($self) = @_;
2412
2413 $self->{par} = [];
2414 $self->{height} = 0;
2415 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2416}
2417
2198sub add_paragraph { 2418sub add_paragraph {
2199 my ($self, $color, $text) = @_; 2419 my ($self, $color, $text, $indent) = @_;
2200 2420
2201 #TODO: intelligently "reformat" paragraph 2421 for my $line (split /\n/, $text) {
2202 2422 my ($w, $h) = $self->text_size ($line);
2203 my $height = $self->text_height ($text);
2204
2205 $self->{height} += $height; 2423 $self->{height} += $h;
2424 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2425 }
2206 2426
2207 push @{$self->{par}}, [$height, $color, $text];
2208
2209 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2427 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2210 $self->{children}[1]->update;
2211} 2428}
2212 2429
2213sub update { 2430sub update {
2214 my ($self) = @_; 2431 my ($self) = @_;
2215 2432
… …
2217 2434
2218 return unless $self->{h} > 0; 2435 return unless $self->{h} > 0;
2219 2436
2220 delete $self->{texture}; 2437 delete $self->{texture};
2221 2438
2222 $ROOT->on_refresh ($self, sub { 2439 $ROOT->on_post_alloc ($self, sub {
2440 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2441
2223 if (delete $self->{need_reflow}) { 2442 if (delete $self->{need_reflow}) {
2224 my $height = 0; 2443 my $height = 0;
2225 2444
2226 $height += $_->[0] = $self->text_height ($_->[2]) 2445 my $layout = $self->{layout};
2446
2447 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2448
2227 for @{$self->{par}}; 2449 for (@{$self->{par}}) {
2450 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2451 $layout->set_width ($W - $_->[3]);
2452 $layout->set_markup ($_->[4]);
2453 my ($w, $h) = $layout->size;
2454 $_->[0] = $w + $_->[3];
2455 $_->[1] = $h;
2456 }
2457
2458 $height += $_->[1];
2459 }
2228 2460
2229 $self->{height} = $height; 2461 $self->{height} = $height;
2230 2462
2231 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2463 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2232 2464
2233 delete $self->{texture}; 2465 delete $self->{texture};
2234 } 2466 }
2235 2467
2236 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2468 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2237 glClearColor 0, 0, 0, 0; 2469 glClearColor 0.5, 0.5, 0.5, 0;
2238 glClear GL_COLOR_BUFFER_BIT; 2470 glClear GL_COLOR_BUFFER_BIT;
2239 2471
2472 my $top = int $self->{children}[1]{range}[0];
2473
2474 my $y0 = $top;
2475 my $y1 = $top + $H;
2476
2477 my $y = 0;
2478
2479 my $layout = $self->{layout};
2480
2481 $layout->set_font ($self->{font}) if $self->{font};
2482
2240 glEnable GL_BLEND; 2483 glEnable GL_BLEND;
2484 #TODO# not correct in windows where rgba is forced off
2241 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2485 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2242 glEnable GL_TEXTURE_2D;
2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245 my $top = int $self->{children}[1]{range}[0];
2246
2247 my $y0 = $top;
2248 my $y1 = $top + $self->{h};
2249
2250 my $y = 0;
2251
2252 my $layout = $self->{layout};
2253
2254 $layout->set_font ($self->{font}) if $self->{font};
2255 2486
2256 for my $par (@{$self->{par}}) { 2487 for my $par (@{$self->{par}}) {
2257 my $h = $par->[0]; 2488 my $h = $par->[1];
2258 2489
2259 if ($y0 < $y + $h && $y < $y1) { 2490 if ($y0 < $y + $h && $y < $y1) {
2491 $layout->set_foreground (@{ $par->[2] });
2492 $layout->set_width ($W - $par->[3]);
2260 $layout->set_text ($par->[2]); 2493 $layout->set_markup ($par->[4]);
2261 2494
2262 glColor @{ $par->[1] }; 2495 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2263 my ($W, $H) = $layout->size; 2496
2264 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2497 glRasterPos $par->[3], $y - $y0;
2498 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265 } 2499 }
2266 2500
2267 $y += $h; 2501 $y += $h;
2268 } 2502 }
2269 2503
2270 glDisable GL_TEXTURE_2D;
2271 glDisable GL_BLEND; 2504 glDisable GL_BLEND;
2272 }; 2505 };
2273 }); 2506 });
2274} 2507}
2275 2508
2276sub _draw { 2509sub _draw {
2277 my ($self) = @_; 2510 my ($self) = @_;
2278 2511
2279 glEnable GL_BLEND;
2280 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2281 glEnable GL_TEXTURE_2D; 2512 glEnable GL_TEXTURE_2D;
2282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2283 glColor 1, 1, 1, 1; 2514 glColor 1, 1, 1, 1;
2284 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2515 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2285 glDisable GL_TEXTURE_2D; 2516 glDisable GL_TEXTURE_2D;
2286 glDisable GL_BLEND;
2287 2517
2288 $self->{children}[1]->draw; 2518 $self->{children}[1]->draw;
2289 2519
2290} 2520}
2291 2521
… …
2339 2569
2340sub new { 2570sub new {
2341 my $class = shift; 2571 my $class = shift;
2342 2572
2343 my $self = $class->SUPER::new ( 2573 my $self = $class->SUPER::new (
2344 state => 0, 2574 state => 0,
2345 connect_activate => \&toggle_flopper, 2575 on_activate => \&toggle_flopper,
2346 @_ 2576 @_
2347 ); 2577 );
2348 2578
2349 if ($self->{state}) {
2350 $self->{state} = 0;
2351 $self->toggle_flopper;
2352 }
2353
2354 $self 2579 $self
2355} 2580}
2356 2581
2357sub toggle_flopper { 2582sub toggle_flopper {
2358 my ($self) = @_; 2583 my ($self) = @_;
2359 2584
2360 # TODO: use animation 2585 $self->{other}->toggle_visibility;
2361 if ($self->{state} = !$self->{state}) {
2362 $CFClient::UI::ROOT->add ($self->{other});
2363 $self->{other}->move ($self->coord2global (0, $self->{h}));
2364 $self->emit ("open");
2365 } else {
2366 $CFClient::UI::ROOT->remove ($self->{other});
2367 $self->emit ("close");
2368 }
2369
2370 $self->emit (changed => $self->{state});
2371} 2586}
2372 2587
2373############################################################################# 2588#############################################################################
2374 2589
2375package CFClient::UI::Tooltip; 2590package CFClient::UI::Tooltip;
… …
2385 @_, 2600 @_,
2386 can_events => 0, 2601 can_events => 0,
2387 ) 2602 )
2388} 2603}
2389 2604
2390sub set_markup { 2605sub set_tooltip_from {
2391 my ($self, $text) = @_; 2606 my ($self, $widget) = @_;
2392 2607
2393 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2608 $self->add (new CFClient::UI::Label
2394 $self->{label}->set_markup ($text); 2609 markup => $widget->{tooltip},
2395 $self->add ($self->{label}); 2610 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2611 fontsize => 0.8,
2612 fg => [0, 0, 0, 1],
2613 ellipsise => 0,
2614 font => ($widget->{tooltip_font} || $::FONT_PROP),
2615 );
2396} 2616}
2397 2617
2398sub size_request { 2618sub size_request {
2399 my ($self) = @_; 2619 my ($self) = @_;
2400
2401 $self->child->set_max_size ($::WIDTH * 0.3);
2402 2620
2403 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2621 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2404 2622
2405 ($w + 4, $h + 4) 2623 ($w + 4, $h + 4)
2406} 2624}
… …
2412} 2630}
2413 2631
2414sub _draw { 2632sub _draw {
2415 my ($self) = @_; 2633 my ($self) = @_;
2416 2634
2417 glPushMatrix;
2418 glTranslate 0.375, 0.375; 2635 glTranslate 0.375, 0.375;
2419 2636
2420 my ($w, $h) = @$self{qw(w h)}; 2637 my ($w, $h) = @$self{qw(w h)};
2421 2638
2422 glColor 1, 0.8, 0.4; 2639 glColor 1, 0.8, 0.4;
… …
2433 glVertex 0 , $h; 2650 glVertex 0 , $h;
2434 glVertex $w, $h; 2651 glVertex $w, $h;
2435 glVertex $w, 0; 2652 glVertex $w, 0;
2436 glEnd; 2653 glEnd;
2437 2654
2438 glPopMatrix; 2655 glTranslate 2 - 0.375, 2 - 0.375;
2439
2440 glTranslate 2, 2;
2441 $self->SUPER::_draw; 2656 $self->SUPER::_draw;
2442} 2657}
2443 2658
2444############################################################################# 2659#############################################################################
2445 2660
… …
2450use CFClient::OpenGL; 2665use CFClient::OpenGL;
2451 2666
2452sub new { 2667sub new {
2453 my $class = shift; 2668 my $class = shift;
2454 2669
2455 $class->SUPER::new ( 2670 my $self = $class->SUPER::new (
2456 aspect => 1, 2671 aspect => 1,
2672 can_events => 0,
2457 @_, 2673 @_,
2458 ) 2674 );
2675
2676 if ($self->{anim} && $self->{animspeed}) {
2677 Scalar::Util::weaken (my $widget = $self);
2678
2679 $self->{timer} = Event->timer (
2680 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2681 hard => 1,
2682 interval => $self->{animspeed},
2683 cb => sub {
2684 ++$widget->{frame};
2685 $widget->update;
2686 },
2687 );
2688 }
2689
2690 $self
2459} 2691}
2460 2692
2461sub size_request { 2693sub size_request {
2462 (32, 8) 2694 (32, 8)
2463} 2695}
2464 2696
2697sub update {
2698 my ($self) = @_;
2699
2700 return unless $self->{visible};
2701
2702 $self->SUPER::update;
2703}
2704
2465sub _draw { 2705sub _draw {
2466 my ($self) = @_; 2706 my ($self) = @_;
2467 2707
2468 return unless $::CONN;#d# manage and cache textures differently 2708 return unless $::CONN;
2709
2710 my $face;
2711
2712 if ($self->{frame}) {
2713 my $anim = $::CONN->{anim}[$self->{anim}];
2714
2715 $face = $anim->[ $self->{frame} % @$anim ]
2716 if $anim && @$anim;
2717 }
2718
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2719 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2470 2720
2471 # TODO animation
2472 if ($tex) { 2721 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D; 2722 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1; 2724 glColor 1, 1, 1, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2725 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D; 2726 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND;
2481 } 2727 }
2482} 2728}
2483 2729
2484############################################################################# 2730sub DESTROY {
2731 my ($self) = @_;
2485 2732
2733 $self->{timer}->cancel
2734 if $self->{timer};
2735
2736 $self->SUPER::DESTROY;
2737}
2738
2739#############################################################################
2740
2486package CFClient::UI::InventoryItem; 2741package CFClient::UI::Inventory;
2487 2742
2488our @ISA = CFClient::UI::HBox::; 2743our @ISA = CFClient::UI::ScrolledWindow::;
2489 2744
2490sub new { 2745sub new {
2491 my $class = shift; 2746 my $class = shift;
2492 2747
2493 my %args = @_;
2494
2495 my $item = delete $args{item};
2496
2497 my $desc = $item->{nrof} < 2
2498 ? $item->{name}
2499 : "$item->{nrof} $item->{name_pl}";
2500
2501
2502 my $self = $class->SUPER::new ( 2748 my $self = $class->SUPER::new (
2503 can_hover => 1, 2749 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2504 can_events => 1,
2505 tooltip => (CFClient::UI::Label->escape ($desc)
2506 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2507 connect_button_down => sub {
2508 my ($self, $ev, $x, $y) = @_;
2509
2510 # todo: maybe put examine on 1? but should just be a tooltip :(
2511 if ($ev->{button} == 1) {
2512 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2513 } elsif ($ev->{button} == 2) {
2514 $::CONN->send ("apply $item->{tag}");
2515 } elsif ($ev->{button} == 3) {
2516 CFClient::UI::Menu->new (
2517 items => [
2518 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2519 [
2520 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2521 sub { $::CONN->send ("lock $item->{tag}") },
2522 ],
2523 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2524 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2525 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2526 ],
2527 )->popup ($ev);
2528 }
2529
2530 1
2531 },
2532 %args
2533 );
2534
2535 $self->add (new CFClient::UI::Face
2536 can_events => 0,
2537 face => $item->{face},
2538 anim => $item->{anim},
2539 animspeed => $item->{animspeed},
2540 );
2541
2542 $self->add (new CFClient::UI::Label
2543 can_events => 0,
2544 text => $desc,
2545 );
2546
2547 $self
2548}
2549
2550#############################################################################
2551
2552package CFClient::UI::Inventory;
2553
2554our @ISA = CFClient::UI::ScrolledWindow::;
2555
2556sub new {
2557 my $class = shift;
2558
2559 my $self = $class->SUPER::new (
2560 scrolled => (new CFClient::UI::VBox),
2561 @_, 2750 @_,
2562 ); 2751 );
2563 2752
2564 $self 2753 $self
2565} 2754}
… …
2568 my ($self, $items) = @_; 2757 my ($self, $items) = @_;
2569 2758
2570 $self->{scrolled}->clear; 2759 $self->{scrolled}->clear;
2571 return unless $items; 2760 return unless $items;
2572 2761
2573 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2762 my @items = sort {
2763 ($a->{type} <=> $b->{type})
2764 or ($a->{name} cmp $b->{name})
2765 } @$items;
2574 2766
2575 $self->{real_items} = \@items; 2767 $self->{real_items} = \@items;
2576 2768
2769 my $row = 0;
2577 for my $item (@items) { 2770 for my $item (@items) {
2578 my $desc = $item->{nrof} < 2 2771 CFClient::Item::update_widgets $item;
2579 ? $item->{name}
2580 : "$item->{nrof} $item->{name_pl}";
2581 2772
2582 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2773 $self->{scrolled}->add (0, $row, $item->{face_widget});
2583 } 2774 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2775 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2584 2776
2585# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2777 $row++;
2586} 2778 }
2587
2588sub size_request {
2589 my ($self) = @_;
2590 ($self->{req_w}, $self->{req_h});
2591} 2779}
2592 2780
2593############################################################################# 2781#############################################################################
2594 2782
2595package CFClient::UI::Menu; 2783package CFClient::UI::Menu;
… …
2630 2818
2631# popup given the event (must be a mouse button down event currently) 2819# popup given the event (must be a mouse button down event currently)
2632sub popup { 2820sub popup {
2633 my ($self, $ev) = @_; 2821 my ($self, $ev) = @_;
2634 2822
2635 $self->emit ("popdown"); 2823 $self->_emit ("popdown");
2636 2824
2637 # maybe save $GRAB? must be careful about events... 2825 # maybe save $GRAB? must be careful about events...
2638 $GRAB = $self; 2826 $GRAB = $self;
2639 $self->{button} = $ev->{button}; 2827 $self->{button} = $ev->{button};
2640 2828
… …
2655 2843
2656 if ($ev->{button} == $self->{button}) { 2844 if ($ev->{button} == $self->{button}) {
2657 undef $GRAB; 2845 undef $GRAB;
2658 $self->hide; 2846 $self->hide;
2659 2847
2660 $self->emit ("popdown"); 2848 $self->_emit ("popdown");
2661 $self->{hover}[1]->() if $self->{hover}; 2849 $self->{hover}[1]->() if $self->{hover};
2662 } 2850 }
2663} 2851}
2664 2852
2665############################################################################# 2853#############################################################################
2666 2854
2667package CFClient::UI::Statusbox; 2855package CFClient::UI::Statusbox;
2668 2856
2669our @ISA = CFClient::UI::VBox::; 2857our @ISA = CFClient::UI::VBox::;
2858
2859sub new {
2860 my $class = shift;
2861
2862 $class->SUPER::new (
2863 fontsize => 0.8,
2864 @_,
2865 )
2866}
2670 2867
2671sub reorder { 2868sub reorder {
2672 my ($self) = @_; 2869 my ($self) = @_;
2673 my $NOW = time; 2870 my $NOW = time;
2674 2871
2675 while (my ($k, $v) = each %{ $self->{item} }) { 2872 while (my ($k, $v) = each %{ $self->{item} }) {
2676 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2873 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2677 } 2874 }
2678 2875
2679 my @widgets; 2876 my @widgets;
2680 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 2877
2878 my @items = sort {
2879 $a->{pri} <=> $b->{pri}
2880 or $b->{id} <=> $a->{id}
2881 } values %{ $self->{item} };
2882
2681 my $count = 10 + 1; 2883 my $count = 10 + 1;
2682 for my $item (@items) { 2884 for my $item (@items) {
2683 last unless --$count; 2885 last unless --$count;
2684 2886
2685 push @widgets, $item->{label} ||= do { 2887 push @widgets, $item->{label} ||= do {
2686 # TODO: doesn't handle markup well (read as: at all) 2888 # TODO: doesn't handle markup well (read as: at all)
2687 my $short = delete $item->{text}; 2889 my $short = $item->{count} > 1
2890 ? "<b>$item->{count} ×</b> $item->{text}"
2891 : $item->{text};
2892
2688 for ($short) { 2893 for ($short) {
2689 s/^\s+//; 2894 s/^\s+//;
2690 s/\012.*//s; 2895 s/\s+/ /g;
2691 my $len = int 30 / $item->{fontsize};
2692 substr $_, $len, length, "…" if $len < length;
2693 } 2896 }
2694 2897
2695 new CFClient::UI::Label 2898 new CFClient::UI::Label
2696 markup => $short, 2899 markup => $short,
2697 tooltip => delete $item->{tooltip}, 2900 tooltip => $item->{tooltip},
2698 fontsize => delete $item->{fontsize}, 2901 tooltip_font => $::FONT_PROP,
2699 color => delete $item->{color}, 2902 tooltip_width => 0.67,
2903 fontsize => $item->{fontsize} || $self->{fontsize},
2904 max_w => $::WIDTH * 0.44,
2905 fg => $item->{fg},
2700 can_events => 1, 2906 can_events => 1,
2701 can_hover => 1, 2907 can_hover => 1
2702 }; 2908 };
2703 } 2909 }
2704 2910
2705 $self->clear; 2911 $self->clear;
2706 $self->SUPER::add (@widgets); 2912 $self->SUPER::add (reverse @widgets);
2707} 2913}
2708 2914
2709sub add { 2915sub add {
2710 my ($self, $text, %arg) = @_; 2916 my ($self, $text, %arg) = @_;
2711 2917
2712 my $item = { 2918 $text =~ s/^\s+//;
2713 time => time, 2919 $text =~ s/\s+$//;
2920
2921 return unless $text;
2922
2923 my $timeout = time + ((delete $arg{timeout}) || 60);
2924
2925 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2926
2927 if (my $item = $self->{item}{$group}) {
2928 if ($item->{text} eq $text) {
2929 $item->{count}++;
2930 } else {
2931 $item->{count} = 1;
2932 $item->{text} = $item->{tooltip} = $text;
2933 }
2934 $item->{id} = ++$self->{id};
2935 $item->{timeout} = $timeout;
2936 delete $item->{label};
2937 } else {
2938 $self->{item}{$group} = {
2939 id => ++$self->{id},
2714 text => $text, 2940 text => $text,
2715 timeout => 60, 2941 timeout => $timeout,
2716 tooltip => $text, 2942 tooltip => $text,
2717 fontsize => 0.8,
2718 color => [0.8, 0.8, 0.8, 0.8], 2943 fg => [0.8, 0.8, 0.8, 0.8],
2944 pri => 0,
2945 count => 1,
2719 %arg, 2946 %arg,
2947 };
2720 }; 2948 }
2721
2722 $item->{timeout} += time;
2723 $item->{group} ||= $item+0;
2724
2725 $item = $self->{item}{$item->{group}} ||= $item;
2726 2949
2727 $self->reorder; 2950 $self->reorder;
2951}
2952
2953sub reconfigure {
2954 my ($self) = @_;
2955
2956 delete $_->{label}
2957 for values %{ $self->{item} || {} };
2958
2959 $self->reorder;
2960 $self->SUPER::reconfigure;
2728} 2961}
2729 2962
2730############################################################################# 2963#############################################################################
2731 2964
2732package CFClient::UI::Root; 2965package CFClient::UI::Root;
… …
2737 2970
2738sub new { 2971sub new {
2739 my $class = shift; 2972 my $class = shift;
2740 2973
2741 $class->SUPER::new ( 2974 $class->SUPER::new (
2975 visible => 1,
2742 @_, 2976 @_,
2743 ) 2977 )
2744} 2978}
2745 2979
2746sub configure { 2980sub configure {
… …
2764} 2998}
2765 2999
2766sub size_allocate { 3000sub size_allocate {
2767 my ($self, $w, $h) = @_; 3001 my ($self, $w, $h) = @_;
2768 3002
2769 my $old_w = $self->{old_w};
2770 my $old_h = $self->{old_h};
2771
2772 if ($old_w && $old_h) {
2773 for my $child ($self->children) {
2774 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2775 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2776 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2777 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2778 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2779 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2780 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2781 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2782 }
2783 }
2784
2785 for my $child ($self->children) { 3003 for my $child ($self->children) {
2786 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3004 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2787 3005
3006 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3007 if exists $child->{req_x};
3008
3009 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3010 if exists $child->{req_y};
3011
3012 delete @$child{qw(req_x req_y)};
3013
2788 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3014 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2789 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3015 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3016
2790 $child->configure ($X, $Y, $W, $H); 3017 $child->configure ($X, $Y, $W, $H);
2791 } 3018 }
2792
2793 $self->{old_w} = $w;
2794 $self->{old_h} = $h;
2795} 3019}
2796 3020
2797sub coord2local { 3021sub coord2local {
2798 my ($self, $x, $y) = @_; 3022 my ($self, $x, $y) = @_;
2799 3023
… …
2812 $self->check_size; 3036 $self->check_size;
2813 $::WANT_REFRESH++; 3037 $::WANT_REFRESH++;
2814} 3038}
2815 3039
2816sub add { 3040sub add {
2817 my ($self, $child) = @_; 3041 my ($self, @children) = @_;
2818 3042
3043 for my $child (@children) {
3044 $child->{is_toplevel} = 1;
3045
2819 # integerise window positions 3046 # integerise window positions
2820 $child->{x} = int $child->{x}; 3047 $child->{x} = int $child->{x};
2821 $child->{y} = int $child->{y}; 3048 $child->{y} = int $child->{y};
3049 }
2822 3050
2823 $self->SUPER::add ($child); 3051 $self->SUPER::add (@children);
3052
3053 for (my @widgets = @children; my $w = pop @widgets; ) {
3054 push @widgets, $w->children;
3055 $w->set_visible;
3056 }
3057
3058}
3059
3060sub remove {
3061 my ($self, @children) = @_;
3062
3063 $self->SUPER::remove (@children);
3064
3065 while (@children) {
3066 my $w = pop @children;
3067 push @children, $w->children;
3068 $w->set_invisible;
3069 }
2824} 3070}
2825 3071
2826sub on_refresh { 3072sub on_refresh {
2827 my ($self, $id, $cb) = @_; 3073 my ($self, $id, $cb) = @_;
2828 3074
2829 $self->{refresh_hook}{$id} = $cb; 3075 $self->{refresh_hook}{$id} = $cb;
2830} 3076}
2831 3077
3078sub on_post_alloc {
3079 my ($self, $id, $cb) = @_;
3080
3081 $self->{post_alloc_hook}{$id} = $cb;
3082}
3083
2832sub draw { 3084sub draw {
2833 my ($self) = @_; 3085 my ($self) = @_;
2834 3086
3087 while ($self->{refresh_hook}) {
3088 $_->()
3089 for values %{delete $self->{refresh_hook}};
3090 }
3091
2835 if ($self->{check_size}) { 3092 if ($self->{check_size}) {
2836 my @queue = ([], []); 3093 my @queue;
2837 3094
2838 for (;;) { 3095 for (;;) {
2839 if ($self->{check_size}) { 3096 if ($self->{check_size}) {
2840 # heuristic: check containers last 3097 #TODO use array-of-depth approach
2841 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3098
3099 @queue = sort { $a->{visible} <=> $b->{visible} }
2842 for values %{delete $self->{check_size}} 3100 @queue, values %{delete $self->{check_size}};
2843 } 3101 }
2844 3102
2845 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3103 my $widget = pop @queue || last;
2846 3104
3105 defined $widget->{visible} or last; # do not resize invisible widgets
3106
2847 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3107 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2848 ? @$widget{qw(user_w user_h)} 3108 ? @$widget{qw(def_w def_h)}
2849 : $widget->size_request; 3109 : $widget->size_request;
2850 3110
3111 if (delete $widget->{force_alloc}
2851 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 3112 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2852 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3113 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2853 3114
2854 $widget->{req_w} = $w; 3115 $widget->{req_w} = $w;
2855 $widget->{req_h} = $h; 3116 $widget->{req_h} = $h;
2856 3117
2857 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 3118 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2858 3119
2859 $widget->{parent}->check_size 3120 $widget->{parent}->check_size
2860 if $widget->{parent}; 3121 if $widget->{parent};
2861 } 3122 }
2862 } 3123 }
… …
2869 $w = 0 if $w < 0; 3130 $w = 0 if $w < 0;
2870 $h = 0 if $h < 0; 3131 $h = 0 if $h < 0;
2871 3132
2872 $widget->{w} = $w; 3133 $widget->{w} = $w;
2873 $widget->{h} = $h; 3134 $widget->{h} = $h;
2874 $widget->size_allocate ($w, $h);
2875 $widget->emit (size_allocate => $w, $h); 3135 $widget->emit (size_allocate => $w, $h);
2876 } 3136 }
2877 } 3137 }
2878 3138
2879 while ($self->{refresh_hook}) { 3139 while ($self->{post_alloc_hook}) {
2880 $_->() 3140 $_->()
2881 for values %{delete $self->{refresh_hook}}; 3141 for values %{delete $self->{post_alloc_hook}};
2882 } 3142 }
2883 3143
2884 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3144 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2885 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3145 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2886 glClear GL_COLOR_BUFFER_BIT; 3146 glClear GL_COLOR_BUFFER_BIT;
2887 3147
2888 glMatrixMode GL_PROJECTION; 3148 glMatrixMode GL_PROJECTION;
2889 glLoadIdentity; 3149 glLoadIdentity;
2890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3150 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2891 glMatrixMode GL_MODELVIEW; 3151 glMatrixMode GL_MODELVIEW;
2892 glLoadIdentity; 3152 glLoadIdentity;
2893 3153
2894 $self->_draw; 3154 $self->_draw;
2895} 3155}
… …
2897############################################################################# 3157#############################################################################
2898 3158
2899package CFClient::UI; 3159package CFClient::UI;
2900 3160
2901$ROOT = new CFClient::UI::Root; 3161$ROOT = new CFClient::UI::Root;
2902$TOOLTIP = new CFClient::UI::Tooltip; 3162$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2903 3163
29041 31641
2905 3165

Diff Legend

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