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.195 by root, Thu May 11 23:54:31 2006 UTC vs.
Revision 1.250 by root, Sun May 28 02:31:03 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}, $widget->{tooltip_font}); 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
165} 224}
166 225
167sub destroy { 226sub destroy {
168 my ($self) = @_; 227 my ($self) = @_;
… …
177 return if $self->{parent}; 236 return if $self->{parent};
178 237
179 $CFClient::UI::ROOT->add ($self); 238 $CFClient::UI::ROOT->add ($self);
180} 239}
181 240
182sub hide { 241sub center {
183 my ($self) = @_; 242 my ($self) = @_;
243
244 $CFClient::UI::ROOT->on_post_alloc (
245 "center_$self" => sub {
246 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
247 },
248 );
249
250 $self->update;
251}
252
253sub set_visible {
254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262}
263
264sub set_invisible {
265 my ($self) = @_;
266
267 return unless $self->{visible};
268
269 # broken show/hide model
270
271 delete $self->{root};
272 delete $self->{visible};
184 273
185 undef $GRAB if $GRAB == $self; 274 undef $GRAB if $GRAB == $self;
186 undef $HOVER if $HOVER == $self; 275 undef $HOVER if $HOVER == $self;
276
277 CFClient::UI::check_tooltip
278 if $CFClient::UI::TOOLTIP->{owner} == $self;
279
280 $self->focus_out;
281
282 $self->emit (visibility_change => 0);
283}
284
285sub set_visibility {
286 my ($self, $visible) = @_;
287
288 return if $self->{visible} == $visible;
289
290 $visible ? $self->hide
291 : $self->show;
292}
293
294sub toggle_visibility {
295 my ($self) = @_;
296
297 $self->{visible}
298 ? $self->hide
299 : $self->show;
300}
301
302sub hide {
303 my ($self) = @_;
304
305 $self->set_invisible;
187 306
188 $self->{parent}->remove ($self) 307 $self->{parent}->remove ($self)
189 if $self->{parent}; 308 if $self->{parent};
190} 309}
191 310
… …
200} 319}
201 320
202sub set_size { 321sub set_size {
203 my ($self, $w, $h) = @_; 322 my ($self, $w, $h) = @_;
204 323
205 $self->{user_w} = $w; 324 $self->{def_w} = $w;
206 $self->{user_h} = $h; 325 $self->{def_h} = $h;
207 326
208 $self->check_size; 327 $self->check_size;
209} 328}
210 329
211sub size_request { 330sub size_request {
… …
233 $self->{y} = $y; 352 $self->{y} = $y;
234 $self->update; 353 $self->update;
235 } 354 }
236 355
237 if ($self->{w} != $w || $self->{h} != $h) { 356 if ($self->{w} != $w || $self->{h} != $h) {
238 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 357 $CFClient::UI::ROOT->{size_alloc}{$self+0} = [$self, $w, $h];
239 } 358 }
240} 359}
241 360
242sub size_allocate { 361sub size_allocate {
243 # nothing to be done 362 # nothing to be done
244} 363}
245 364
365sub reconfigure {
366 my ($self) = @_;
367
368 $self->check_size (1);
369 $self->update;
370}
371
246sub children { 372sub 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} 373}
260 374
261sub set_max_size { 375sub set_max_size {
262 my ($self, $w, $h) = @_; 376 my ($self, $w, $h) = @_;
263 377
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 378 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 379 delete $self->{max_h}; $self->{max_h} = $h if $h;
380}
381
382sub set_tooltip {
383 my ($self, $tooltip) = @_;
384
385 $tooltip =~ s/^\s+//;
386 $tooltip =~ s/\s+$//;
387
388 return if $self->{tooltip} eq $tooltip;
389
390 $self->{tooltip} = $tooltip;
391
392 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
393 delete $CFClient::UI::TOOLTIP->{owner};
394 CFClient::UI::check_tooltip;
395 }
266} 396}
267 397
268# translate global coordinates to local coordinate system 398# translate global coordinates to local coordinate system
269sub coord2local { 399sub coord2local {
270 my ($self, $x, $y) = @_; 400 my ($self, $x, $y) = @_;
… …
285 return if $FOCUS == $self; 415 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 416 return unless $self->{can_focus};
287 417
288 my $focus = $FOCUS; $FOCUS = $self; 418 my $focus = $FOCUS; $FOCUS = $self;
289 419
290 $self->emit (focus_in => $focus); 420 $self->_emit (focus_in => $focus);
291 421
292 $focus->update if $focus; 422 $focus->update if $focus;
293 $FOCUS->update; 423 $FOCUS->update;
294} 424}
295 425
… …
298 428
299 return unless $FOCUS == $self; 429 return unless $FOCUS == $self;
300 430
301 my $focus = $FOCUS; undef $FOCUS; 431 my $focus = $FOCUS; undef $FOCUS;
302 432
303 $self->emit (focus_out => $focus); 433 $self->_emit (focus_out => $focus);
304 434
305 $focus->update if $focus; #? 435 $focus->update if $focus; #?
436
437 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
438 unless $FOCUS;
306} 439}
307 440
308sub mouse_motion { } 441sub mouse_motion { }
309sub button_up { } 442sub button_up { }
310sub key_down { } 443sub key_down { }
311sub key_up { } 444sub key_up { }
312 445
313sub button_down { 446sub button_down {
314 my ($self, $ev, $x, $y) = @_; 447 my ($self, $ev, $x, $y) = @_;
315 448
316 $self->focus_in; 449 $self->focus_in;
… …
350 if ($ENV{PCLIENT_DEBUG}) { 483 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix; 484 glPushMatrix;
352 glColor 1, 1, 0, 1; 485 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 486 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP; 487 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0; 488 glVertex 0 , 0;
356 glVertex $self->{w}, 0; 489 glVertex $self->{w} - 1, 0;
357 glVertex $self->{w}, $self->{h}; 490 glVertex $self->{w} - 1, $self->{h} - 1;
358 glVertex 0 , $self->{h}; 491 glVertex 0 , $self->{h} - 1;
359 glEnd; 492 glEnd;
360 glPopMatrix; 493 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 494 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 } 495 }
363} 496}
364 497
365sub _draw { 498sub _draw {
366 my ($self) = @_; 499 my ($self) = @_;
… …
383sub set_parent { 516sub set_parent {
384 my ($self, $parent) = @_; 517 my ($self, $parent) = @_;
385 518
386 Scalar::Util::weaken ($self->{parent} = $parent); 519 Scalar::Util::weaken ($self->{parent} = $parent);
387 520
521 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
522
388 $self->check_size 523 $self->check_size;
389 unless exists $self->{req_w};
390} 524}
391 525
392sub check_size { 526sub check_size {
393 my ($self) = @_; 527 my ($self, $forced) = @_;
394 528
529 $self->{force_alloc} = 1 if $forced;
395 $CFClient::UI::ROOT->{check_size}{$self} = $self; 530 $CFClient::UI::ROOT->{check_size}{$self} = $self;
396} 531}
397 532
398sub update { 533sub update {
399 my ($self) = @_; 534 my ($self) = @_;
… …
406 my ($self, $signal, $cb) = @_; 541 my ($self, $signal, $cb) = @_;
407 542
408 push @{ $self->{signal_cb}{$signal} }, $cb; 543 push @{ $self->{signal_cb}{$signal} }, $cb;
409} 544}
410 545
546sub _emit {
547 my ($self, $signal, @args) = @_;
548
549 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
550}
551
411sub emit { 552sub emit {
412 my ($self, $signal, @args) = @_; 553 my ($self, $signal, @args) = @_;
413 554
414 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 555 $self->_emit ($signal, @args)
556 || $self->$signal (@args);
557}
558
559sub visibility_change {
560 #my ($self, $visible) = @_;
415} 561}
416 562
417sub DESTROY { 563sub DESTROY {
418 my ($self) = @_; 564 my ($self) = @_;
419 565
566 delete $WIDGET{$self+0};
420 #$self->deactivate; 567 #$self->deactivate;
421} 568}
422 569
423############################################################################# 570#############################################################################
424 571
… …
433 my $class = shift; 580 my $class = shift;
434 581
435 # range [value, low, high, page] 582 # range [value, low, high, page]
436 583
437 $class->SUPER::new ( 584 $class->SUPER::new (
438 bg => [0, 0, 0, 0.2], 585 #bg => [0, 0, 0, 0.2],
439 active_bg => [1, 1, 1, 0.5], 586 #active_bg => [1, 1, 1, 0.5],
440 @_ 587 @_
441 ) 588 )
442} 589}
443 590
444sub _draw { 591sub _draw {
445 my ($self) = @_; 592 my ($self) = @_;
446 593
594 my $color = $FOCUS == $self && $self->{active_bg}
595 ? $self->{active_bg}
596 : $self->{bg};
597
598 if ($color && (@$color < 4 || $color->[3])) {
447 my ($w, $h) = @$self{qw(w h)}; 599 my ($w, $h) = @$self{qw(w h)};
448 600
449 glEnable GL_BLEND; 601 glEnable GL_BLEND;
450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 602 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 603 glColor @$color;
452 604
453 glBegin GL_QUADS; 605 glBegin GL_QUADS;
454 glVertex 0 , 0; 606 glVertex 0 , 0;
455 glVertex 0 , $h; 607 glVertex 0 , $h;
456 glVertex $w, $h; 608 glVertex $w, $h;
457 glVertex $w, 0; 609 glVertex $w, 0;
458 glEnd; 610 glEnd;
459 611
460 glDisable GL_BLEND; 612 glDisable GL_BLEND;
613 }
461} 614}
462 615
463############################################################################# 616#############################################################################
464 617
465package CFClient::UI::Empty; 618package CFClient::UI::Empty;
… …
509 $self->{children} = [ 662 $self->{children} = [
510 sort { $a->{z} <=> $b->{z} } 663 sort { $a->{z} <=> $b->{z} }
511 @{$self->{children}}, @widgets 664 @{$self->{children}}, @widgets
512 ]; 665 ];
513 666
514 $self->check_size; 667 $self->check_size (1);
515 $self->update; 668 $self->update;
516} 669}
517 670
518sub children { 671sub children {
519 @{ $_[0]{children} } 672 @{ $_[0]{children} }
… …
525 delete $child->{parent}; 678 delete $child->{parent};
526 $child->hide; 679 $child->hide;
527 680
528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529 682
530 $self->check_size; 683 $self->check_size (1);
531 $self->update; 684 $self->update;
532} 685}
533 686
534sub clear { 687sub clear {
535 my ($self) = @_; 688 my ($self) = @_;
… …
626} 779}
627 780
628sub update { 781sub update {
629 my ($self) = @_; 782 my ($self) = @_;
630 783
631 $ROOT->on_refresh ($self => sub { $self->render_child }); 784 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->SUPER::update; 785 $self->SUPER::update;
633} 786}
634 787
635sub size_allocate { 788sub size_allocate {
636 my ($self, $w, $h) = @_; 789 my ($self, $w, $h) = @_;
… …
649 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 802 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
650 glClearColor 0, 0, 0, 0; 803 glClearColor 0, 0, 0, 0;
651 glClear GL_COLOR_BUFFER_BIT; 804 glClear GL_COLOR_BUFFER_BIT;
652 805
653 $self->_render; 806 $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 }; 807 };
662} 808}
663 809
664sub _draw { 810sub _draw {
665 my ($self) = @_; 811 my ($self) = @_;
… …
669 my $tex = $self->{texture} 815 my $tex = $self->{texture}
670 or return; 816 or return;
671 817
672 glEnable GL_TEXTURE_2D; 818 glEnable GL_TEXTURE_2D;
673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
674 glColor 0, 0, 0, 1; 820 glColor 1, 1, 1, 1;
675 821
676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
677 823
678 glDisable GL_TEXTURE_2D; 824 glDisable GL_TEXTURE_2D;
679} 825}
… …
682 828
683package CFClient::UI::ViewPort; 829package CFClient::UI::ViewPort;
684 830
685our @ISA = CFClient::UI::Window::; 831our @ISA = CFClient::UI::Window::;
686 832
833sub new {
834 my $class = shift;
835
836 $class->SUPER::new (
837 scroll_x => 0,
838 scroll_y => 1,
839 @_,
840 )
841}
842
687sub size_request { 843sub size_request {
688 my ($self) = @_; 844 my ($self) = @_;
689 845
690 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 846 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 847
693 @$self{qw(child_w child_h)} 848 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y};
850
851 ($w, $h)
694} 852}
695 853
696sub size_allocate { 854sub size_allocate {
697 my ($self, $w, $h) = @_; 855 my ($self, $w, $h) = @_;
698 856
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
859
860 $self->child->configure (0, 0, $w, $h);
699 $self->update; 861 $self->update;
700} 862}
701 863
702sub set_offset { 864sub set_offset {
703 my ($self, $x, $y) = @_; 865 my ($self, $x, $y) = @_;
… …
754 my $class = shift; 916 my $class = shift;
755 917
756 my $self; 918 my $self;
757 919
758 my $slider = new CFClient::UI::Slider 920 my $slider = new CFClient::UI::Slider
759 vertical => 1, 921 vertical => 1,
760 range => [0, 0, 1, 0.01], # HACK fix 922 range => [0, 0, 1, 0.01], # HACK fix
761 connect_changed => sub { 923 on_changed => sub {
762 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 924 $self->{vp}->set_offset (0, $_[1]);
763 }, 925 },
764 ; 926 ;
765 927
766 $self = $class->SUPER::new ( 928 $self = $class->SUPER::new (
767 vp => (new CFClient::UI::ViewPort), 929 vp => (new CFClient::UI::ViewPort expand => 1),
768 slider => $slider, 930 slider => $slider,
769 @_, 931 @_,
770 ); 932 );
771 933
772 $self->{vp}->add ($self->{scrolled}); 934 $self->{vp}->add ($self->{scrolled});
… …
774 $self->add ($self->{slider}); 936 $self->add ($self->{slider});
775 937
776 $self 938 $self
777} 939}
778 940
941sub update {
942 my ($self) = @_;
943
944 $self->SUPER::update;
945
946 # todo: overwrite size_allocate of child
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949}
950
951sub size_allocate {
952 my ($self, $w, $h) = @_;
953
954 $self->SUPER::size_allocate ($w, $h);
955
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958}
959
779#TODO# update range on size_allocate depeneing on child 960#TODO# update range on size_allocate depending on child
780# update viewport offset on scroll 961# update viewport offset on scroll
781 962
782############################################################################# 963#############################################################################
783 964
784package CFClient::UI::Frame; 965package CFClient::UI::Frame;
… …
788use CFClient::OpenGL; 969use CFClient::OpenGL;
789 970
790sub new { 971sub new {
791 my $class = shift; 972 my $class = shift;
792 973
793 my $self = $class->SUPER::new ( 974 $class->SUPER::new (
794 bg => [1, 1, 1, 1], 975 bg => undef,
795 border_bg => [1, 1, 1, 1],
796 border => 0.8,
797 @_ 976 @_,
798 ); 977 )
799
800 $self
801} 978}
802 979
803sub _draw { 980sub _draw {
804 my ($self) = @_; 981 my ($self) = @_;
805 982
806 my ($w, $h) = ($self->{w}, $self->{h}); 983 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)};
807 985
808 glEnable GL_BLEND; 986 glEnable GL_BLEND;
809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810 glEnable GL_TEXTURE_2D; 988 glColor @{ $self->{bg} };
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812 989
813# glBegin GL_QUADS; 990 glBegin GL_QUADS;
814# glColor 0, 0, 0, 0;
815# glVertex 0 , 0; 991 glVertex 0 , 0;
816# glVertex 0 , $h; 992 glVertex 0 , $h;
817# glVertex $w, $h; 993 glVertex $w, $h;
818# glVertex $w, 0; 994 glVertex $w, 0;
819# glEnd; 995 glEnd;
820 996
821
822 $self->child->draw;
823 glDisable GL_BLEND; 997 glDisable GL_BLEND;
824 glDisable GL_TEXTURE_2D; 998 }
999
1000 $self->SUPER::_draw;
825} 1001}
826 1002
827############################################################################# 1003#############################################################################
828 1004
829package CFClient::UI::FancyFrame; 1005package CFClient::UI::FancyFrame;
… …
837 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
838 1014
839sub new { 1015sub new {
840 my $class = shift; 1016 my $class = shift;
841 1017
842 # TODO: user_x, user_y, overwrite moveto?
843
844 my $self = $class->SUPER::new ( 1018 my $self = $class->SUPER::new (
845 bg => [1, 1, 1, 1], 1019 bg => [1, 1, 1, 1],
846 border_bg => [1, 1, 1, 1], 1020 border_bg => [1, 1, 1, 1],
847 border => 0.6, 1021 border => 0.6,
1022 is_toplevel => 1,
848 can_events => 1, 1023 can_events => 1,
849 @_ 1024 @_
850 ); 1025 );
851 1026
852 $self->{title} &&= new CFClient::UI::Label 1027 $self->{title} &&= new CFClient::UI::Label
853 align => 0, 1028 align => 0,
… …
877 my ($self, $w, $h) = @_; 1052 my ($self, $w, $h) = @_;
878 1053
879 $h -= List::Util::max 0, $self->border * 2; 1054 $h -= List::Util::max 0, $self->border * 2;
880 $w -= List::Util::max 0, $self->border * 2; 1055 $w -= List::Util::max 0, $self->border * 2;
881 1056
882 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
883 if $self->{title}; 1058 if $self->{title};
884 1059
885 $self->child->configure ($self->border, $self->border, $w, $h); 1060 $self->child->configure ($self->border, $self->border, $w, $h);
886} 1061}
887 1062
… …
906 my ($ev, $x, $y) = @_; 1081 my ($ev, $x, $y) = @_;
907 1082
908 my $dx = $ev->{x} - $ox; 1083 my $dx = $ev->{x} - $ox;
909 my $dy = $ev->{y} - $oy; 1084 my $dy = $ev->{y} - $oy;
910 1085
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
911 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
912 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
913 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1090 $self->move ($self->{user_x}, $self->{user_y});
914 $self->check_size; 1091 $self->check_size;
915 }; 1092 };
916 1093
917 } elsif ($lr ^ $td) { 1094 } elsif ($lr ^ $td) {
918 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1095 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
921 $self->{motion} = sub { 1098 $self->{motion} = sub {
922 my ($ev, $x, $y) = @_; 1099 my ($ev, $x, $y) = @_;
923 1100
924 ($x, $y) = ($ev->{x}, $ev->{y}); 1101 ($x, $y) = ($ev->{x}, $ev->{y});
925 1102
926 $self->move ($bx + $x - $ox, $by + $y - $oy); 1103 $self->{user_x} = $bx + $x - $ox;
1104 $self->{user_y} = $by + $y - $oy;
1105
1106 $self->move ($self->{user_x}, $self->{user_y});
927 $self->update; 1107 $self->update;
928 }; 1108 };
929 } 1109 }
930} 1110}
931 1111
… …
945 my ($self) = @_; 1125 my ($self) = @_;
946 1126
947 my ($w, $h ) = ($self->{w}, $self->{h}); 1127 my ($w, $h ) = ($self->{w}, $self->{h});
948 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1128 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
949 1129
950 glEnable GL_BLEND;
951 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952 glEnable GL_TEXTURE_2D; 1130 glEnable GL_TEXTURE_2D;
953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954 1132
955 my $border = $self->border; 1133 my $border = $self->border;
956 1134
957 glColor @{ $self->{border_bg} }; 1135 glColor @{ $self->{border_bg} };
958 $tex[1]->draw_quad (0, 0, $w, $border); 1136 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
959 $tex[3]->draw_quad (0, $border, $border, $ch); 1137 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1138 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1139 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
962 1140
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1141 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964 my $bg = $tex[0]; 1142 my $bg = $tex[0];
965 1143
966 # TODO: repeat texture not scale 1144 # TODO: repeat texture not scale
… …
970 glColor @{ $self->{bg} }; 1148 glColor @{ $self->{bg} };
971 1149
972 $bg->{s} = $rep_x; 1150 $bg->{s} = $rep_x;
973 $bg->{t} = $rep_y; 1151 $bg->{t} = $rep_y;
974 $bg->{wrap_mode} = 1; 1152 $bg->{wrap_mode} = 1;
975 $bg->draw_quad ($border, $border, $cw, $ch); 1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154 }
976 1155
977 glDisable GL_TEXTURE_2D; 1156 glDisable GL_TEXTURE_2D;
978 glDisable GL_BLEND;
979 }
980 1157
981 $self->{title}->draw if $self->{title}; 1158 $self->{title}->draw if $self->{title};
982 1159
983 $self->child->draw; 1160 $self->child->draw;
984} 1161}
… …
996sub new { 1173sub new {
997 my $class = shift; 1174 my $class = shift;
998 1175
999 $class->SUPER::new ( 1176 $class->SUPER::new (
1000 col_expand => [], 1177 col_expand => [],
1001 @_ 1178 @_,
1002 ) 1179 )
1180}
1181
1182sub children {
1183 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1003} 1184}
1004 1185
1005sub add { 1186sub add {
1006 my ($self, $x, $y, $child) = @_; 1187 my ($self, $x, $y, $child) = @_;
1007 1188
1008 $child->set_parent ($self); 1189 $child->set_parent ($self);
1009 $self->{children}[$y][$x] = $child; 1190 $self->{children}[$y][$x] = $child;
1010 1191
1011 $child->check_size; 1192 $self->check_size (1);
1012} 1193}
1013 1194
1014sub children {
1015 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1016}
1017
1018# TODO: move to container class maybe? send childs a signal on removal? 1195# TODO: move to container class maybe? send children a signal on removal?
1019sub clear { 1196sub clear {
1020 my ($self) = @_; 1197 my ($self) = @_;
1021 1198
1022 my @children = $self->children; 1199 my @children = $self->children;
1023 delete $self->{children}; 1200 delete $self->{children};
… …
1025 for (@children) { 1202 for (@children) {
1026 delete $_->{parent}; 1203 delete $_->{parent};
1027 $_->hide; 1204 $_->hide;
1028 } 1205 }
1029 1206
1207 $self->check_size (1);
1030 $self->update; 1208 $self->update;
1031} 1209}
1032 1210
1033sub get_wh { 1211sub get_wh {
1034 my ($self) = @_; 1212 my ($self) = @_;
… …
1066sub size_allocate { 1244sub size_allocate {
1067 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h) = @_;
1068 1246
1069 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
1070 1248
1071 my $req_w = sum @$ws; 1249 my $req_w = (sum @$ws) || 1;
1072 my $req_h = sum @$hs; 1250 my $req_h = (sum @$hs) || 1;
1073 1251
1074 # TODO: nicer code && do row_expand 1252 # TODO: nicer code && do row_expand
1075 my @col_expand = @{$self->{col_expand}}; 1253 my @col_expand = @{$self->{col_expand}};
1076 @col_expand = (1) x @$ws unless @col_expand; 1254 @col_expand = (1) x @$ws unless @col_expand;
1077 my $col_expand = (sum @col_expand) || 1; 1255 my $col_expand = (sum @col_expand) || 1;
… …
1131 } 1309 }
1132} 1310}
1133 1311
1134############################################################################# 1312#############################################################################
1135 1313
1136package CFClient::UI::HBox; 1314package CFClient::UI::Box;
1137
1138# TODO: wrap into common Box base class
1139 1315
1140our @ISA = CFClient::UI::Container::; 1316our @ISA = CFClient::UI::Container::;
1141 1317
1142sub size_request { 1318sub size_request {
1143 my ($self) = @_; 1319 my ($self) = @_;
1144 1320
1145 my @alloc = map [$_->size_request], @{$self->{children}}; 1321 $self->{vertical}
1146 1322 ? (
1147 ( 1323 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1148 (List::Util::sum map $_->[0], @alloc), 1324 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1149 (List::Util::max map $_->[1], @alloc), 1325 )
1150 ) 1326 : (
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 )
1151} 1330}
1152 1331
1153sub size_allocate { 1332sub size_allocate {
1154 my ($self, $w, $h) = @_; 1333 my ($self, $w, $h) = @_;
1155 1334
1156 ($h, $w) = ($w, $h); 1335 my $space = $self->{vertical} ? $h : $w;
1157
1158 my $children = $self->{children}; 1336 my $children = $self->{children};
1159 1337
1160 my @h = map $_->{req_w}, @$children; 1338 my @req;
1161 1339
1162 my $req_h = List::Util::sum @h; 1340 if ($self->{homogeneous}) {
1163 1341 @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 { 1342 } else {
1343 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1344 my $req = List::Util::sum @req;
1345
1346 if ($req > $space) {
1347 # ah well, not enough space
1348 $_ *= $space / $req for @req;
1349 } else {
1168 my $exp = List::Util::sum map $_->{expand}, @$children; 1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1169 $exp ||= 1;
1170 1351
1352 $space = ($space - $req) / $expand; # remaining space to give away
1353
1354 $req[$_] += $space * $children->[$_]{expand}
1171 for (0 .. $#$children) { 1355 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 } 1356 }
1178 } 1357 }
1179 1358
1180 CFClient::UI::harmonize \@h; 1359 CFClient::UI::harmonize \@req;
1181 1360
1182 my $y = 0; 1361 my $pos = 0;
1183 for (0 .. $#$children) { 1362 for (0 .. $#$children) {
1184 my $child = $children->[$_];
1185 my $h = $h[$_]; 1363 my $alloc = $req[$_];
1186 $child->configure ($y, 0, $h, $w); 1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1187 1365
1188 $y += $h; 1366 $pos += $alloc;
1189 } 1367 }
1190 1368
1191 1 1369 1
1192} 1370}
1193 1371
1194############################################################################# 1372#############################################################################
1195 1373
1374package CFClient::UI::HBox;
1375
1376our @ISA = CFClient::UI::Box::;
1377
1378sub new {
1379 my $class = shift;
1380
1381 $class->SUPER::new (
1382 vertical => 0,
1383 @_,
1384 )
1385}
1386
1387#############################################################################
1388
1196package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1197 1390
1198# TODO: wrap into common Box base class
1199
1200our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1201 1392
1202sub size_request { 1393sub new {
1203 my ($self) = @_; 1394 my $class = shift;
1204 1395
1205 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1206 1397 vertical => 1,
1207 ( 1398 @_,
1208 (List::Util::max map $_->[0], @alloc),
1209 (List::Util::sum map $_->[1], @alloc),
1210 ) 1399 )
1211} 1400}
1212 1401
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############################################################################# 1402#############################################################################
1253 1403
1254package CFClient::UI::Label; 1404package CFClient::UI::Label;
1255 1405
1256our @ISA = CFClient::UI::Base::; 1406our @ISA = CFClient::UI::DrawBG::;
1257 1407
1258use CFClient::OpenGL; 1408use CFClient::OpenGL;
1259 1409
1260sub new { 1410sub new {
1261 my ($class, %arg) = @_; 1411 my ($class, %arg) = @_;
1262 1412
1263 my $self = $class->SUPER::new ( 1413 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1414 fg => [1, 1, 1],
1415 #bg => none
1416 #active_bg => none
1265 #font => default_font 1417 #font => default_font
1266 #text => initial text 1418 #text => initial text
1267 #markup => initial narkup 1419 #markup => initial narkup
1420 #max_w => maximum pixel width
1421 ellipsise => 3, # end
1268 layout => (new CFClient::Layout), 1422 layout => (new CFClient::Layout),
1269 fontsize => 1, 1423 fontsize => 1,
1270 align => -1, 1424 align => -1,
1271 valign => -1, 1425 valign => -1,
1272 padding => 2, 1426 padding => 2,
… …
1287 } 1441 }
1288 1442
1289 $self 1443 $self
1290} 1444}
1291 1445
1292sub escape { 1446sub escape($) {
1293 local $_ = $_[1]; 1447 local $_ = $_[0];
1294 1448
1295 s/&/&amp;/g; 1449 s/&/&amp;/g;
1296 s/>/&gt;/g; 1450 s/>/&gt;/g;
1297 s/</&lt;/g; 1451 s/</&lt;/g;
1298 1452
1299 $_[1] 1453 $_
1300} 1454}
1301 1455
1302sub update { 1456sub update {
1303 my ($self) = @_; 1457 my ($self) = @_;
1304 1458
… …
1337sub size_request { 1491sub size_request {
1338 my ($self) = @_; 1492 my ($self) = @_;
1339 1493
1340 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1494 $self->{layout}->set_font ($self->{font}) if $self->{font};
1341 $self->{layout}->set_width ($self->{max_w} || -1); 1495 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1342 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1499
1344 my ($w, $h) = $self->{layout}->size; 1500 my ($w, $h) = $self->{layout}->size;
1345 1501
1346 if (exists $self->{template}) { 1502 if (exists $self->{template}) {
… …
1376} 1532}
1377 1533
1378sub _draw { 1534sub _draw {
1379 my ($self) = @_; 1535 my ($self) = @_;
1380 1536
1537 $self->SUPER::_draw; # draw background, if applicable
1538
1381 my $tex = $self->{texture} ||= do { 1539 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}}); 1540 $self->{layout}->set_foreground (@{$self->{fg}});
1383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1541 $self->{layout}->set_font ($self->{font}) if $self->{font};
1384 $self->{layout}->set_width ($self->{w}); 1542 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1386 1546
1387 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1547 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388 1548
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5; 1551 : ($self->{w} - $tex->{w}) * 0.5);
1392 1552
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5; 1555 : ($self->{h} - $tex->{h}) * 0.5);
1396 1556
1397 $tex 1557 $tex
1398 }; 1558 };
1399 1559
1400 glEnable GL_TEXTURE_2D; 1560 glEnable GL_TEXTURE_2D;
… …
1428 active_fg => [0, 0, 0], 1588 active_fg => [0, 0, 0],
1429 can_hover => 1, 1589 can_hover => 1,
1430 can_focus => 1, 1590 can_focus => 1,
1431 valign => 0, 1591 valign => 0,
1432 can_events => 1, 1592 can_events => 1,
1593 #text => ...
1433 @_ 1594 @_
1434 ) 1595 )
1435} 1596}
1436 1597
1437sub _set_text { 1598sub _set_text {
… …
1447 $self->{text} = $text; 1608 $self->{text} = $text;
1448 1609
1449 $text =~ s/./*/g if $self->{hidden}; 1610 $text =~ s/./*/g if $self->{hidden};
1450 $self->{layout}->set_text ("$text "); 1611 $self->{layout}->set_text ("$text ");
1451 1612
1452 $self->emit (changed => $self->{text}); 1613 $self->_emit (changed => $self->{text});
1453} 1614}
1454 1615
1455sub set_text { 1616sub set_text {
1456 my ($self, $text) = @_; 1617 my ($self, $text) = @_;
1457 1618
1458 $self->{cursor} = length $text; 1619 $self->{cursor} = length $text;
1459 $self->_set_text ($text); 1620 $self->_set_text ($text);
1621 $self->update;
1460 $self->check_size; 1622 $self->check_size;
1461 $self->update;
1462} 1623}
1463 1624
1464sub get_text { 1625sub get_text {
1465 $_[0]{text} 1626 $_[0]{text}
1466} 1627}
… …
1469 my ($self) = @_; 1630 my ($self) = @_;
1470 1631
1471 my ($w, $h) = $self->SUPER::size_request; 1632 my ($w, $h) = $self->SUPER::size_request;
1472 1633
1473 ($w + 1, $h) # add 1 for cursor 1634 ($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} 1635}
1481 1636
1482sub key_down { 1637sub key_down {
1483 my ($self, $ev) = @_; 1638 my ($self, $ev) = @_;
1484 1639
… …
1486 my $sym = $ev->{sym}; 1641 my $sym = $ev->{sym};
1487 my $uni = $ev->{unicode}; 1642 my $uni = $ev->{unicode};
1488 1643
1489 my $text = $self->get_text; 1644 my $text = $self->get_text;
1490 1645
1491 if ($sym == 8) { 1646 if ($uni == 8) {
1492 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1647 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493 } elsif ($sym == 127) { 1648 } elsif ($uni == 127) {
1494 substr $text, $self->{cursor}, 1, ""; 1649 substr $text, $self->{cursor}, 1, "";
1495 } elsif ($sym == CFClient::SDLK_LEFT) { 1650 } elsif ($sym == CFClient::SDLK_LEFT) {
1496 --$self->{cursor} if $self->{cursor}; 1651 --$self->{cursor} if $self->{cursor};
1497 } elsif ($sym == CFClient::SDLK_RIGHT) { 1652 } elsif ($sym == CFClient::SDLK_RIGHT) {
1498 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1653 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1499 } elsif ($sym == CFClient::SDLK_HOME) { 1654 } elsif ($sym == CFClient::SDLK_HOME) {
1500 $self->{cursor} = 0; 1655 $self->{cursor} = 0;
1501 } elsif ($sym == CFClient::SDLK_END) { 1656 } elsif ($sym == CFClient::SDLK_END) {
1502 $self->{cursor} = length $text; 1657 $self->{cursor} = length $text;
1503 } elsif ($sym == 27) { 1658 } elsif ($uni == 27) {
1504 $self->emit ('escape'); 1659 $self->_emit ('escape');
1505 } elsif ($uni) { 1660 } elsif ($uni) {
1506 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1507 } 1662 }
1508 1663
1509 $self->_set_text ($text); 1664 $self->_set_text ($text);
1510 $self->update; 1665 $self->update;
1666 $self->check_size;
1511} 1667}
1512 1668
1513sub focus_in { 1669sub focus_in {
1514 my ($self) = @_; 1670 my ($self) = @_;
1515 1671
… …
1595 if ($sym == 13) { 1751 if ($sym == 13) {
1596 unshift @{$self->{history}}, 1752 unshift @{$self->{history}},
1597 my $txt = $self->get_text; 1753 my $txt = $self->get_text;
1598 $self->{history_pointer} = -1; 1754 $self->{history_pointer} = -1;
1599 $self->{history_saveback} = ''; 1755 $self->{history_saveback} = '';
1600 $self->emit (activate => $txt); 1756 $self->_emit (activate => $txt);
1601 $self->update; 1757 $self->update;
1602 1758
1603 } elsif ($sym == CFClient::SDLK_UP) { 1759 } elsif ($sym == CFClient::SDLK_UP) {
1604 if ($self->{history_pointer} < 0) { 1760 if ($self->{history_pointer} < 0) {
1605 $self->{history_saveback} = $self->get_text; 1761 $self->{history_saveback} = $self->get_text;
… …
1644 my $class = shift; 1800 my $class = shift;
1645 1801
1646 $class->SUPER::new ( 1802 $class->SUPER::new (
1647 padding => 4, 1803 padding => 4,
1648 fg => [1, 1, 1], 1804 fg => [1, 1, 1],
1649 bg => [1, 1, 1, 0.2],
1650 active_fg => [0, 0, 1], 1805 active_fg => [0, 0, 1],
1651 can_hover => 1, 1806 can_hover => 1,
1652 align => 0, 1807 align => 0,
1653 valign => 0, 1808 valign => 0,
1654 can_events => 1, 1809 can_events => 1,
1655 @_ 1810 @_
1656 ) 1811 )
1657} 1812}
1658 1813
1814sub activate { }
1815
1659sub button_up { 1816sub button_up {
1660 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1661 1818
1819 $self->emit ("activate")
1662 if ($x >= 0 && $x < $self->{w} 1820 if $x >= 0 && $x < $self->{w}
1663 && $y >= 0 && $y < $self->{h}) { 1821 && $y >= 0 && $y < $self->{h};
1664 $self->emit ("activate");
1665 }
1666} 1822}
1667 1823
1668sub _draw { 1824sub _draw {
1669 my ($self) = @_; 1825 my ($self) = @_;
1670 1826
… …
1702 1858
1703 $class->SUPER::new ( 1859 $class->SUPER::new (
1704 padding => 2, 1860 padding => 2,
1705 fg => [1, 1, 1], 1861 fg => [1, 1, 1],
1706 active_fg => [1, 1, 0], 1862 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5],
1707 state => 0, 1865 state => 0,
1708 can_hover => 1, 1866 can_hover => 1,
1709 @_ 1867 @_
1710 ) 1868 )
1711} 1869}
… …
1720 my ($self, $ev, $x, $y) = @_; 1878 my ($self, $ev, $x, $y) = @_;
1721 1879
1722 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1723 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1724 $self->{state} = !$self->{state}; 1882 $self->{state} = !$self->{state};
1725 $self->emit (changed => $self->{state}); 1883 $self->_emit (changed => $self->{state});
1726 } 1884 }
1727} 1885}
1728 1886
1729sub _draw { 1887sub _draw {
1730 my ($self) = @_; 1888 my ($self) = @_;
… …
1735 1893
1736 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1894 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1737 1895
1738 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1739 1897
1898 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899
1740 glEnable GL_TEXTURE_2D; 1900 glEnable GL_TEXTURE_2D;
1741
1742 my $tex = $self->{state} ? $tex[1] : $tex[0];
1743
1744 $tex->draw_quad_alpha (0, 0, $s, $s); 1901 $tex->draw_quad_alpha (0, 0, $s, $s);
1745
1746 glDisable GL_TEXTURE_2D; 1902 glDisable GL_TEXTURE_2D;
1747} 1903}
1748 1904
1749############################################################################# 1905#############################################################################
1750 1906
… …
1997 qw(s1_slider.png s1_slider_bg.png); 2153 qw(s1_slider.png s1_slider_bg.png);
1998 2154
1999sub new { 2155sub new {
2000 my $class = shift; 2156 my $class = shift;
2001 2157
2002 # range [value, low, high, page] 2158 # range [value, low, high, page, unit]
2003 2159
2004 # TODO: 0-width page 2160 # TODO: 0-width page
2005 # TODO: req_w/h are wrong with vertical 2161 # TODO: req_w/h are wrong with vertical
2006 # TODO: calculations are off 2162 # TODO: calculations are off
2007 my $self = $class->SUPER::new ( 2163 my $self = $class->SUPER::new (
2008 fg => [1, 1, 1], 2164 fg => [1, 1, 1],
2009 active_fg => [0, 0, 0], 2165 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5],
2010 range => [0, 0, 100, 10], 2168 range => [0, 0, 100, 10, 0],
2011 req_w => $::WIDTH / 80, 2169 req_w => $::WIDTH / 80,
2012 req_h => $::WIDTH / 80, 2170 req_h => $::WIDTH / 80,
2013 vertical => 0, 2171 vertical => 0,
2014 can_hover => 1, 2172 can_hover => 1,
2015 inner_pad => 5, 2173 inner_pad => 0.02,
2016 @_ 2174 @_
2017 ); 2175 );
2018 2176
2177 $self->set_value ($self->{range}[0]);
2178 $self->update;
2179
2019 $self 2180 $self
2181}
2182
2183sub set_range {
2184 my ($self, $range) = @_;
2185
2186 ($range, $self->{range}) = ($self->{range}, $range);
2187
2188 $self->update
2189 if "@$range" ne "@{$self->{range}}";
2190}
2191
2192sub set_value {
2193 my ($self, $value) = @_;
2194
2195 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2196
2197 $hi = $lo + 1 if $hi <= $lo;
2198
2199 $page = $hi - $lo if $page > $hi - $lo;
2200
2201 $value = $lo if $value < $lo;
2202 $value = $hi - $page if $value > $hi - $page;
2203
2204 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2205 if $unit;
2206
2207 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2208
2209 if ($value != $old_value) {
2210 $self->_emit (changed => $value);
2211 $self->update;
2212 }
2020} 2213}
2021 2214
2022sub size_request { 2215sub size_request {
2023 my ($self) = @_; 2216 my ($self) = @_;
2024 2217
… …
2030 2223
2031sub button_down { 2224sub button_down {
2032 my ($self, $ev, $x, $y) = @_; 2225 my ($self, $ev, $x, $y) = @_;
2033 2226
2034 $self->SUPER::button_down ($ev, $x, $y); 2227 $self->SUPER::button_down ($ev, $x, $y);
2228
2229 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2230
2035 $self->mouse_motion ($ev, $x, $y); 2231 $self->mouse_motion ($ev, $x, $y);
2036} 2232}
2037 2233
2038sub mouse_motion { 2234sub mouse_motion {
2039 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
2040 2236
2041 if ($GRAB == $self) { 2237 if ($GRAB == $self) {
2238 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2239
2240 my (undef, $lo, $hi, $page) = @{$self->{range}};
2241
2242 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2243
2244 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2245 }
2246}
2247
2248sub update {
2249 my ($self) = @_;
2250
2251 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2252 $self->set_value ($self->{range}[0]);
2253
2042 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2254 my ($value, $lo, $hi, $page) = @{$self->{range}};
2255 my $range = ($hi - $page - $lo) || 1e-100;
2043 2256
2044 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2257 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2045 2258
2046 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2259 $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 2260 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2048 2261
2049 $x -= $inner_pad_px; # substract the padding 2262 $value = ($value - $lo) / $range;
2050 $x = $x * ($hi - $lo) / $inner_w + $lo; 2263 $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 2264
2055 $self->emit (changed => $x); 2265 $self->{knob_x} = $value - $knob_w * 0.5;
2056 $self->update; 2266 $self->{knob_w} = $knob_w;
2057 } 2267 });
2058}
2059 2268
2060# the inner_* stuff is for generating a padding for the slider handle, 2269 $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} 2270}
2067 2271
2068sub _draw { 2272sub _draw {
2069 my ($self) = @_; 2273 my ($self) = @_;
2070 2274
2071 $self->SUPER::_draw (); 2275 $self->SUPER::_draw ();
2072 2276
2073 my ($w, $h) = @$self{qw(w h)}; 2277 glScale $self->{w}, $self->{h};
2074 2278
2075 if ($self->{vertical}) { 2279 if ($self->{vertical}) {
2076 # draw a vertical slider like a rotated horizontal slider 2280 # draw a vertical slider like a rotated horizontal slider
2077 2281
2282 glTranslate 1, 0, 0;
2078 glRotate 90, 0, 0, 1; 2283 glRotate 90, 0, 0, 1;
2079 glTranslate 0, -$self->{w}, 0;
2080
2081 ($w, $h) = ($h, $w);
2082 } 2284 }
2083 2285
2084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2286 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2287 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086 2288
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_TEXTURE_2D; 2289 glEnable GL_TEXTURE_2D;
2106 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2290 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2107 2291
2108 # draw background 2292 # draw background
2109 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2293 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2110 2294
2111 # draw handle 2295 # draw handle
2112 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2296 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2113 2297
2114 glDisable GL_TEXTURE_2D; 2298 glDisable GL_TEXTURE_2D;
2115} 2299}
2300
2301#############################################################################
2302
2303package CFClient::UI::ValSlider;
2304
2305our @ISA = CFClient::UI::HBox::;
2306
2307sub new {
2308 my ($class, %arg) = @_;
2309
2310 my $range = delete $arg{range};
2311
2312 my $self = $class->SUPER::new (
2313 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2314 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2315 to_value => sub { shift },
2316 from_value => sub { shift },
2317 %arg,
2318 );
2319
2320 $self->{slider}->connect (changed => sub {
2321 my ($self, $value) = @_;
2322 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2323 $self->{parent}->emit (changed => $value);
2324 });
2325
2326# $self->{entry}->connect (changed => sub {
2327# my ($self, $value) = @_;
2328# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2329# $self->{parent}->emit (changed => $value);
2330# });
2331
2332 $self->add ($self->{slider}, $self->{entry});
2333
2334 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2335
2336 $self
2337}
2338
2339sub set_range { shift->{slider}->set_range (@_) }
2340sub set_value { shift->{slider}->set_value (@_) }
2116 2341
2117############################################################################# 2342#############################################################################
2118 2343
2119package CFClient::UI::TextView; 2344package CFClient::UI::TextView;
2120 2345
… …
2150 2375
2151 $self->{fontsize} = $fontsize; 2376 $self->{fontsize} = $fontsize;
2152 $self->reflow; 2377 $self->reflow;
2153} 2378}
2154 2379
2155sub text_height {
2156 my ($self, $text) = @_;
2157
2158 my $layout = $self->{layout};
2159
2160 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2161 $layout->set_width ($self->{children}[0]{w});
2162 $layout->set_markup ($text);
2163
2164 ($layout->size)[1]
2165}
2166
2167sub reflow {
2168 my ($self) = @_;
2169
2170 $self->{need_reflow}++;
2171 $self->update;
2172}
2173
2174sub size_allocate { 2380sub size_allocate {
2175 my ($self, $w, $h) = @_; 2381 my ($self, $w, $h) = @_;
2176 2382
2177 $self->SUPER::size_allocate ($w, $h); 2383 $self->SUPER::size_allocate ($w, $h);
2178 2384
… …
2181 $self->{layout}->set_width ($self->{children}[0]{w}); 2387 $self->{layout}->set_width ($self->{children}[0]{w});
2182 2388
2183 $self->reflow; 2389 $self->reflow;
2184} 2390}
2185 2391
2392sub text_size {
2393 my ($self, $text, $indent) = @_;
2394
2395 my $layout = $self->{layout};
2396
2397 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2398 $layout->set_width ($self->{children}[0]{w} - $indent);
2399 $layout->set_markup ($text);
2400
2401 $layout->size
2402}
2403
2404sub reflow {
2405 my ($self) = @_;
2406
2407 $self->{need_reflow}++;
2408 $self->update;
2409}
2410
2411sub set_offset {
2412 my ($self, $offset) = @_;
2413
2414 # todo: base offset on lines or so, not on pixels
2415 $self->{children}[1]->set_value ($offset);
2416}
2417
2418sub clear {
2419 my ($self) = @_;
2420
2421 $self->{par} = [];
2422 $self->{height} = 0;
2423 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2424}
2425
2186sub add_paragraph { 2426sub add_paragraph {
2187 my ($self, $color, $text) = @_; 2427 my ($self, $color, $text, $indent) = @_;
2188 2428
2189 #TODO: intelligently "reformat" paragraph 2429 for my $line (split /\n/, $text) {
2190 2430 my ($w, $h) = $self->text_size ($line);
2191 my $height = $self->text_height ($text);
2192
2193 $self->{height} += $height; 2431 $self->{height} += $h;
2432 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2433 }
2194 2434
2195 push @{$self->{par}}, [$height, $color, $text];
2196
2197 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2435 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2198 $self->{children}[1]->update;
2199} 2436}
2200 2437
2201sub update { 2438sub update {
2202 my ($self) = @_; 2439 my ($self) = @_;
2203 2440
… …
2205 2442
2206 return unless $self->{h} > 0; 2443 return unless $self->{h} > 0;
2207 2444
2208 delete $self->{texture}; 2445 delete $self->{texture};
2209 2446
2210 $ROOT->on_refresh ($self, sub { 2447 $ROOT->on_post_alloc ($self, sub {
2448 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2449
2211 if (delete $self->{need_reflow}) { 2450 if (delete $self->{need_reflow}) {
2212 my $height = 0; 2451 my $height = 0;
2213 2452
2214 $height += $_->[0] = $self->text_height ($_->[2]) 2453 my $layout = $self->{layout};
2454
2455 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2456
2215 for @{$self->{par}}; 2457 for (@{$self->{par}}) {
2458 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2459 $layout->set_width ($W - $_->[3]);
2460 $layout->set_markup ($_->[4]);
2461 my ($w, $h) = $layout->size;
2462 $_->[0] = $w + $_->[3];
2463 $_->[1] = $h;
2464 }
2465
2466 $height += $_->[1];
2467 }
2216 2468
2217 $self->{height} = $height; 2469 $self->{height} = $height;
2218 2470
2219 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2471 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2220 2472
2221 delete $self->{texture}; 2473 delete $self->{texture};
2222 } 2474 }
2223 2475
2224 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2476 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2225 glClearColor 0, 0, 0, 0; 2477 glClearColor 0.5, 0.5, 0.5, 0;
2226 glClear GL_COLOR_BUFFER_BIT; 2478 glClear GL_COLOR_BUFFER_BIT;
2227 2479
2228 glEnable GL_TEXTURE_2D;
2229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2230
2231 my $top = int $self->{children}[1]{range}[0]; 2480 my $top = int $self->{children}[1]{range}[0];
2232 2481
2233 my $y0 = $top; 2482 my $y0 = $top;
2234 my $y1 = $top + $self->{h}; 2483 my $y1 = $top + $H;
2235 2484
2236 my $y = 0; 2485 my $y = 0;
2237 2486
2238 my $layout = $self->{layout}; 2487 my $layout = $self->{layout};
2239 2488
2240 $layout->set_font ($self->{font}) if $self->{font}; 2489 $layout->set_font ($self->{font}) if $self->{font};
2241 2490
2491 glEnable GL_BLEND;
2492 #TODO# not correct in windows where rgba is forced off
2493 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2494
2242 for my $par (@{$self->{par}}) { 2495 for my $par (@{$self->{par}}) {
2243 my $h = $par->[0]; 2496 my $h = $par->[1];
2244 2497
2245 if ($y0 < $y + $h && $y < $y1) { 2498 if ($y0 < $y + $h && $y < $y1) {
2246 $layout->set_foreground (@{ $par->[1] }); 2499 $layout->set_foreground (@{ $par->[2] });
2500 $layout->set_width ($W - $par->[3]);
2247 $layout->set_markup ($par->[2]); 2501 $layout->set_markup ($par->[4]);
2248 2502
2249 my ($W, $H) = $layout->size; 2503 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2250 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2504
2505 glRasterPos $par->[3], $y - $y0;
2506 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2251 } 2507 }
2252 2508
2253 $y += $h; 2509 $y += $h;
2254 } 2510 }
2255 2511
2256 glDisable GL_TEXTURE_2D; 2512 glDisable GL_BLEND;
2257 }; 2513 };
2258 }); 2514 });
2259} 2515}
2260 2516
2261sub _draw { 2517sub _draw {
2262 my ($self) = @_; 2518 my ($self) = @_;
2263 2519
2264 glEnable GL_TEXTURE_2D; 2520 glEnable GL_TEXTURE_2D;
2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2266 glColor 1, 1, 1, 1; 2522 glColor 1, 1, 1, 1;
2267 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2523 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2268 glDisable GL_TEXTURE_2D; 2524 glDisable GL_TEXTURE_2D;
2269 2525
2270 $self->{children}[1]->draw; 2526 $self->{children}[1]->draw;
2271 2527
2272} 2528}
… …
2321 2577
2322sub new { 2578sub new {
2323 my $class = shift; 2579 my $class = shift;
2324 2580
2325 my $self = $class->SUPER::new ( 2581 my $self = $class->SUPER::new (
2326 state => 0, 2582 state => 0,
2327 connect_activate => \&toggle_flopper, 2583 on_activate => \&toggle_flopper,
2328 @_ 2584 @_
2329 ); 2585 );
2330 2586
2331 if ($self->{state}) {
2332 $self->{state} = 0;
2333 $self->toggle_flopper;
2334 }
2335
2336 $self 2587 $self
2337} 2588}
2338 2589
2339sub toggle_flopper { 2590sub toggle_flopper {
2340 my ($self) = @_; 2591 my ($self) = @_;
2341 2592
2342 # TODO: use animation 2593 $self->{other}->toggle_visibility;
2343 if ($self->{state} = !$self->{state}) {
2344 $CFClient::UI::ROOT->add ($self->{other});
2345 $self->{other}->move ($self->coord2global (0, $self->{h}));
2346 $self->emit ("open");
2347 } else {
2348 $CFClient::UI::ROOT->remove ($self->{other});
2349 $self->emit ("close");
2350 }
2351
2352 $self->emit (changed => $self->{state});
2353} 2594}
2354 2595
2355############################################################################# 2596#############################################################################
2356 2597
2357package CFClient::UI::Tooltip; 2598package CFClient::UI::Tooltip;
… …
2367 @_, 2608 @_,
2368 can_events => 0, 2609 can_events => 0,
2369 ) 2610 )
2370} 2611}
2371 2612
2372sub set_markup { 2613sub set_tooltip_from {
2373 my ($self, $text, $font) = @_; 2614 my ($self, $widget) = @_;
2374 2615
2375 $self->{label} = new CFClient::UI::Label 2616 $self->add (new CFClient::UI::Label
2617 markup => $widget->{tooltip},
2618 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2376 fontsize => 0.8, 2619 fontsize => 0.8,
2377 fg => [0, 0, 0], 2620 fg => [0, 0, 0, 1],
2621 ellipsise => 0,
2378 font => ($font || $::FONT_PROP); 2622 font => ($widget->{tooltip_font} || $::FONT_PROP),
2379 2623 );
2380 $self->{label}->set_max_size ($::WIDTH * 0.3);
2381 $self->{label}->set_markup ($text);
2382 $self->add ($self->{label});
2383} 2624}
2384 2625
2385sub size_request { 2626sub size_request {
2386 my ($self) = @_; 2627 my ($self) = @_;
2387 2628
… …
2397} 2638}
2398 2639
2399sub _draw { 2640sub _draw {
2400 my ($self) = @_; 2641 my ($self) = @_;
2401 2642
2402 glPushMatrix;
2403 glTranslate 0.375, 0.375; 2643 glTranslate 0.375, 0.375;
2404 2644
2405 my ($w, $h) = @$self{qw(w h)}; 2645 my ($w, $h) = @$self{qw(w h)};
2406 2646
2407 glColor 1, 0.8, 0.4; 2647 glColor 1, 0.8, 0.4;
… …
2418 glVertex 0 , $h; 2658 glVertex 0 , $h;
2419 glVertex $w, $h; 2659 glVertex $w, $h;
2420 glVertex $w, 0; 2660 glVertex $w, 0;
2421 glEnd; 2661 glEnd;
2422 2662
2423 glPopMatrix; 2663 glTranslate 2 - 0.375, 2 - 0.375;
2424
2425 glTranslate 2, 2;
2426 $self->SUPER::_draw; 2664 $self->SUPER::_draw;
2427} 2665}
2428 2666
2429############################################################################# 2667#############################################################################
2430 2668
… …
2435use CFClient::OpenGL; 2673use CFClient::OpenGL;
2436 2674
2437sub new { 2675sub new {
2438 my $class = shift; 2676 my $class = shift;
2439 2677
2440 $class->SUPER::new ( 2678 my $self = $class->SUPER::new (
2441 aspect => 1, 2679 aspect => 1,
2680 can_events => 0,
2442 @_, 2681 @_,
2443 ) 2682 );
2683
2684 if ($self->{anim} && $self->{animspeed}) {
2685 Scalar::Util::weaken (my $widget = $self);
2686
2687 $self->{timer} = Event->timer (
2688 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2689 hard => 1,
2690 interval => $self->{animspeed},
2691 cb => sub {
2692 ++$widget->{frame};
2693 $widget->update;
2694 },
2695 );
2696 }
2697
2698 $self
2444} 2699}
2445 2700
2446sub size_request { 2701sub size_request {
2447 (32, 8) 2702 (32, 8)
2448} 2703}
2449 2704
2705sub update {
2706 my ($self) = @_;
2707
2708 return unless $self->{visible};
2709
2710 $self->SUPER::update;
2711}
2712
2450sub _draw { 2713sub _draw {
2451 my ($self) = @_; 2714 my ($self) = @_;
2452 2715
2453 return unless $::CONN;#d# manage and cache textures differently 2716 return unless $::CONN;
2717
2718 my $face;
2719
2720 if ($self->{frame}) {
2721 my $anim = $::CONN->{anim}[$self->{anim}];
2722
2723 $face = $anim->[ $self->{frame} % @$anim ]
2724 if $anim && @$anim;
2725 }
2726
2454 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2727 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2455 2728
2456 # TODO animation
2457 if ($tex) { 2729 if ($tex) {
2458 glEnable GL_TEXTURE_2D; 2730 glEnable GL_TEXTURE_2D;
2459 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2731 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2460 glColor 1, 1, 1, 1; 2732 glColor 1, 1, 1, 1;
2461 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2733 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2462 glDisable GL_TEXTURE_2D; 2734 glDisable GL_TEXTURE_2D;
2463 } 2735 }
2464} 2736}
2465 2737
2466############################################################################# 2738sub DESTROY {
2739 my ($self) = @_;
2467 2740
2741 $self->{timer}->cancel
2742 if $self->{timer};
2743
2744 $self->SUPER::DESTROY;
2745}
2746
2747#############################################################################
2748
2468package CFClient::UI::InventoryItem; 2749package CFClient::UI::Inventory;
2469 2750
2470our @ISA = CFClient::UI::HBox::; 2751our @ISA = CFClient::UI::ScrolledWindow::;
2471 2752
2472sub new { 2753sub new {
2473 my $class = shift; 2754 my $class = shift;
2474 2755
2475 my %args = @_;
2476
2477 my $item = delete $args{item};
2478
2479 my $desc = $item->{nrof} < 2
2480 ? $item->{name}
2481 : "$item->{nrof} $item->{name_pl}";
2482
2483
2484 my $self = $class->SUPER::new ( 2756 my $self = $class->SUPER::new (
2485 can_hover => 1, 2757 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2486 can_events => 1,
2487 tooltip => (CFClient::UI::Label->escape ($desc)
2488 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2489 connect_button_down => sub {
2490 my ($self, $ev, $x, $y) = @_;
2491
2492 # todo: maybe put examine on 1? but should just be a tooltip :(
2493 if ($ev->{button} == 1) {
2494 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2495 } elsif ($ev->{button} == 2) {
2496 $::CONN->send ("apply $item->{tag}");
2497 } elsif ($ev->{button} == 3) {
2498 CFClient::UI::Menu->new (
2499 items => [
2500 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2501 [
2502 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2503 sub { $::CONN->send ("lock $item->{tag}") },
2504 ],
2505 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2506 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2507 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2508 ],
2509 )->popup ($ev);
2510 }
2511
2512 1
2513 },
2514 %args
2515 );
2516
2517 $self->add (new CFClient::UI::Face
2518 can_events => 0,
2519 face => $item->{face},
2520 anim => $item->{anim},
2521 animspeed => $item->{animspeed},
2522 );
2523
2524 $self->add (new CFClient::UI::Label
2525 can_events => 0,
2526 text => $desc,
2527 );
2528
2529 $self
2530}
2531
2532#############################################################################
2533
2534package CFClient::UI::Inventory;
2535
2536our @ISA = CFClient::UI::ScrolledWindow::;
2537
2538sub new {
2539 my $class = shift;
2540
2541 my $self = $class->SUPER::new (
2542 scrolled => (new CFClient::UI::VBox),
2543 @_, 2758 @_,
2544 ); 2759 );
2545 2760
2546 $self 2761 $self
2547} 2762}
… …
2550 my ($self, $items) = @_; 2765 my ($self, $items) = @_;
2551 2766
2552 $self->{scrolled}->clear; 2767 $self->{scrolled}->clear;
2553 return unless $items; 2768 return unless $items;
2554 2769
2555 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2770 my @items = sort {
2771 ($a->{type} <=> $b->{type})
2772 or ($a->{name} cmp $b->{name})
2773 } @$items;
2556 2774
2557 $self->{real_items} = \@items; 2775 $self->{real_items} = \@items;
2558 2776
2777 my $row = 0;
2559 for my $item (@items) { 2778 for my $item (@items) {
2560 my $desc = $item->{nrof} < 2 2779 CFClient::Item::update_widgets $item;
2561 ? $item->{name}
2562 : "$item->{nrof} $item->{name_pl}";
2563 2780
2564 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2781 $self->{scrolled}->add (0, $row, $item->{face_widget});
2565 } 2782 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2783 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2566 2784
2567# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2785 $row++;
2568} 2786 }
2569
2570sub size_request {
2571 my ($self) = @_;
2572 ($self->{req_w}, $self->{req_h});
2573} 2787}
2574 2788
2575############################################################################# 2789#############################################################################
2576 2790
2577package CFClient::UI::Menu; 2791package CFClient::UI::Menu;
… …
2612 2826
2613# popup given the event (must be a mouse button down event currently) 2827# popup given the event (must be a mouse button down event currently)
2614sub popup { 2828sub popup {
2615 my ($self, $ev) = @_; 2829 my ($self, $ev) = @_;
2616 2830
2617 $self->emit ("popdown"); 2831 $self->_emit ("popdown");
2618 2832
2619 # maybe save $GRAB? must be careful about events... 2833 # maybe save $GRAB? must be careful about events...
2620 $GRAB = $self; 2834 $GRAB = $self;
2621 $self->{button} = $ev->{button}; 2835 $self->{button} = $ev->{button};
2622 2836
… …
2637 2851
2638 if ($ev->{button} == $self->{button}) { 2852 if ($ev->{button} == $self->{button}) {
2639 undef $GRAB; 2853 undef $GRAB;
2640 $self->hide; 2854 $self->hide;
2641 2855
2642 $self->emit ("popdown"); 2856 $self->_emit ("popdown");
2643 $self->{hover}[1]->() if $self->{hover}; 2857 $self->{hover}[1]->() if $self->{hover};
2644 } 2858 }
2645} 2859}
2646 2860
2647############################################################################# 2861#############################################################################
2648 2862
2649package CFClient::UI::Statusbox; 2863package CFClient::UI::Statusbox;
2650 2864
2651our @ISA = CFClient::UI::VBox::; 2865our @ISA = CFClient::UI::VBox::;
2866
2867sub new {
2868 my $class = shift;
2869
2870 $class->SUPER::new (
2871 fontsize => 0.8,
2872 @_,
2873 )
2874}
2652 2875
2653sub reorder { 2876sub reorder {
2654 my ($self) = @_; 2877 my ($self) = @_;
2655 my $NOW = time; 2878 my $NOW = time;
2656 2879
2657 while (my ($k, $v) = each %{ $self->{item} }) { 2880 while (my ($k, $v) = each %{ $self->{item} }) {
2658 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2881 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2659 } 2882 }
2660 2883
2661 my @widgets; 2884 my @widgets;
2662 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 2885
2886 my @items = sort {
2887 $a->{pri} <=> $b->{pri}
2888 or $b->{id} <=> $a->{id}
2889 } values %{ $self->{item} };
2890
2663 my $count = 10 + 1; 2891 my $count = 10 + 1;
2664 for my $item (@items) { 2892 for my $item (@items) {
2665 last unless --$count; 2893 last unless --$count;
2666 2894
2667 push @widgets, $item->{label} ||= do { 2895 push @widgets, $item->{label} ||= do {
2668 # TODO: doesn't handle markup well (read as: at all) 2896 # TODO: doesn't handle markup well (read as: at all)
2669 my $short = delete $item->{text}; 2897 my $short = $item->{count} > 1
2898 ? "<b>$item->{count} ×</b> $item->{text}"
2899 : $item->{text};
2900
2670 for ($short) { 2901 for ($short) {
2671 s/^\s+//; 2902 s/^\s+//;
2672 s/\012.*//s; 2903 s/\s+/ /g;
2673 my $len = int 30 / $item->{fontsize};
2674 substr $_, $len, length, "…" if $len < length;
2675 } 2904 }
2676 2905
2677 new CFClient::UI::Label 2906 new CFClient::UI::Label
2678 markup => $short, 2907 markup => $short,
2679 tooltip => delete $item->{tooltip}, 2908 tooltip => $item->{tooltip},
2680 fontsize => delete $item->{fontsize}, 2909 tooltip_font => $::FONT_PROP,
2681 color => delete $item->{color}, 2910 tooltip_width => 0.67,
2911 fontsize => $item->{fontsize} || $self->{fontsize},
2912 max_w => $::WIDTH * 0.44,
2913 fg => $item->{fg},
2682 can_events => 1, 2914 can_events => 1,
2683 can_hover => 1, 2915 can_hover => 1
2684 }; 2916 };
2685 } 2917 }
2686 2918
2687 $self->clear; 2919 $self->clear;
2688 $self->SUPER::add (@widgets); 2920 $self->SUPER::add (reverse @widgets);
2689} 2921}
2690 2922
2691sub add { 2923sub add {
2692 my ($self, $text, %arg) = @_; 2924 my ($self, $text, %arg) = @_;
2693 2925
2694 my $item = { 2926 $text =~ s/^\s+//;
2695 time => time, 2927 $text =~ s/\s+$//;
2928
2929 return unless $text;
2930
2931 my $timeout = time + ((delete $arg{timeout}) || 60);
2932
2933 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2934
2935 if (my $item = $self->{item}{$group}) {
2936 if ($item->{text} eq $text) {
2937 $item->{count}++;
2938 } else {
2939 $item->{count} = 1;
2940 $item->{text} = $item->{tooltip} = $text;
2941 }
2942 $item->{id} = ++$self->{id};
2943 $item->{timeout} = $timeout;
2944 delete $item->{label};
2945 } else {
2946 $self->{item}{$group} = {
2947 id => ++$self->{id},
2696 text => $text, 2948 text => $text,
2697 timeout => 60, 2949 timeout => $timeout,
2698 tooltip => $text, 2950 tooltip => $text,
2699 fontsize => 0.8,
2700 color => [0.8, 0.8, 0.8, 0.8], 2951 fg => [0.8, 0.8, 0.8, 0.8],
2952 pri => 0,
2953 count => 1,
2701 %arg, 2954 %arg,
2955 };
2702 }; 2956 }
2703
2704 $item->{timeout} += time;
2705 $item->{group} ||= $item+0;
2706
2707 $item = $self->{item}{$item->{group}} ||= $item;
2708 2957
2709 $self->reorder; 2958 $self->reorder;
2959}
2960
2961sub reconfigure {
2962 my ($self) = @_;
2963
2964 delete $_->{label}
2965 for values %{ $self->{item} || {} };
2966
2967 $self->reorder;
2968 $self->SUPER::reconfigure;
2710} 2969}
2711 2970
2712############################################################################# 2971#############################################################################
2713 2972
2714package CFClient::UI::Root; 2973package CFClient::UI::Root;
… …
2719 2978
2720sub new { 2979sub new {
2721 my $class = shift; 2980 my $class = shift;
2722 2981
2723 $class->SUPER::new ( 2982 $class->SUPER::new (
2983 visible => 1,
2724 @_, 2984 @_,
2725 ) 2985 )
2726} 2986}
2727 2987
2728sub configure { 2988sub configure {
… …
2746} 3006}
2747 3007
2748sub size_allocate { 3008sub size_allocate {
2749 my ($self, $w, $h) = @_; 3009 my ($self, $w, $h) = @_;
2750 3010
2751 my $old_w = $self->{old_w};
2752 my $old_h = $self->{old_h};
2753
2754 if ($old_w && $old_h) {
2755 for my $child ($self->children) {
2756 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2757 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2758 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2759 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2760 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2761 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2762 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2763 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2764 }
2765 }
2766
2767 for my $child ($self->children) { 3011 for my $child ($self->children) {
2768 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3012 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2769 3013
3014 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3015 if exists $child->{req_x};
3016
3017 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3018 if exists $child->{req_y};
3019
3020 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3021
2770 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3022 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2771 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3023 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3024
2772 $child->configure ($X, $Y, $W, $H); 3025 $child->configure ($X, $Y, $W, $H);
2773 } 3026 }
2774
2775 $self->{old_w} = $w;
2776 $self->{old_h} = $h;
2777} 3027}
2778 3028
2779sub coord2local { 3029sub coord2local {
2780 my ($self, $x, $y) = @_; 3030 my ($self, $x, $y) = @_;
2781 3031
… …
2794 $self->check_size; 3044 $self->check_size;
2795 $::WANT_REFRESH++; 3045 $::WANT_REFRESH++;
2796} 3046}
2797 3047
2798sub add { 3048sub add {
2799 my ($self, $child) = @_; 3049 my ($self, @children) = @_;
2800 3050
3051 for my $child (@children) {
3052 $child->{is_toplevel} = 1;
3053
2801 # integerise window positions 3054 # integerise window positions
2802 $child->{x} = int $child->{x}; 3055 $child->{x} = int $child->{x};
2803 $child->{y} = int $child->{y}; 3056 $child->{y} = int $child->{y};
3057 }
2804 3058
2805 $self->SUPER::add ($child); 3059 $self->SUPER::add (@children);
3060
3061 for (my @widgets = @children; my $w = pop @widgets; ) {
3062 push @widgets, $w->children;
3063 $w->set_visible;
3064 }
3065
3066}
3067
3068sub remove {
3069 my ($self, @children) = @_;
3070
3071 $self->SUPER::remove (@children);
3072
3073 while (@children) {
3074 my $w = pop @children;
3075 push @children, $w->children;
3076 $w->set_invisible;
3077 }
2806} 3078}
2807 3079
2808sub on_refresh { 3080sub on_refresh {
2809 my ($self, $id, $cb) = @_; 3081 my ($self, $id, $cb) = @_;
2810 3082
2811 $self->{refresh_hook}{$id} = $cb; 3083 $self->{refresh_hook}{$id} = $cb;
2812} 3084}
2813 3085
3086sub on_post_alloc {
3087 my ($self, $id, $cb) = @_;
3088
3089 $self->{post_alloc_hook}{$id} = $cb;
3090}
3091
2814sub draw { 3092sub draw {
2815 my ($self) = @_; 3093 my ($self) = @_;
2816 3094
3095 while ($self->{refresh_hook}) {
3096 $_->()
3097 for values %{delete $self->{refresh_hook}};
3098 }
3099
2817 if ($self->{check_size}) { 3100 if ($self->{check_size}) {
2818 my @queue = ([], []); 3101 my @queue;
2819 3102
2820 for (;;) { 3103 while () {
2821 if ($self->{check_size}) { 3104 if ($self->{check_size}) {
2822 # heuristic: check containers last 3105 #TODO use array-of-depth approach
2823 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3106
3107 @queue = sort { $a->{visible} <=> $b->{visible} }
2824 for values %{delete $self->{check_size}} 3108 @queue, values %{delete $self->{check_size}};
2825 } 3109 }
2826 3110
2827 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3111 my $widget = pop @queue || last;
2828 3112
3113 defined $widget->{visible} or last; # do not resize invisible widgets
3114
2829 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3115 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2830 ? @$widget{qw(user_w user_h)} 3116 ? @$widget{qw(def_w def_h)}
2831 : $widget->size_request; 3117 : $widget->size_request;
2832 3118
3119 if (delete $widget->{force_alloc}
2833 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 3120 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2834 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3121 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2835 3122
2836 $widget->{req_w} = $w; 3123 $widget->{req_w} = $w;
2837 $widget->{req_h} = $h; 3124 $widget->{req_h} = $h;
2838 3125
2839 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 3126 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2840 3127
2841 $widget->{parent}->check_size 3128 $widget->{parent}->check_size
2842 if $widget->{parent}; 3129 if $widget->{parent};
2843 } 3130 }
2844 } 3131 }
2845 } 3132 }
2846 3133
2847 while ($self->{size_alloc}) { 3134 while (my $size_alloc = delete $self->{size_alloc}) {
2848 for (values %{delete $self->{size_alloc}}) { 3135 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
2849 my ($widget, $w, $h) = @$_; 3136 values %$size_alloc;
3137
3138 while () {
3139 my ($widget, $w, $h) = @{ pop @queue or last };
2850 3140
2851 $w = 0 if $w < 0; 3141 $w = 0 if $w < 0;
2852 $h = 0 if $h < 0; 3142 $h = 0 if $h < 0;
2853 3143
2854 $widget->{w} = $w; 3144 $widget->{w} = $w;
2855 $widget->{h} = $h; 3145 $widget->{h} = $h;
2856 $widget->size_allocate ($w, $h);
2857 $widget->emit (size_allocate => $w, $h); 3146 $widget->emit (size_allocate => $w, $h);
2858 } 3147 }
2859 } 3148 }
2860 3149
2861 while ($self->{refresh_hook}) { 3150 while ($self->{post_alloc_hook}) {
2862 $_->() 3151 $_->()
2863 for values %{delete $self->{refresh_hook}}; 3152 for values %{delete $self->{post_alloc_hook}};
2864 } 3153 }
2865 3154
2866 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3155 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2867 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3156 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2868 glClear GL_COLOR_BUFFER_BIT; 3157 glClear GL_COLOR_BUFFER_BIT;
2869 3158
2870 glMatrixMode GL_PROJECTION; 3159 glMatrixMode GL_PROJECTION;
2871 glLoadIdentity; 3160 glLoadIdentity;
2872 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3161 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2873 glMatrixMode GL_MODELVIEW; 3162 glMatrixMode GL_MODELVIEW;
2874 glLoadIdentity; 3163 glLoadIdentity;
2875 3164
2876 $self->_draw; 3165 $self->_draw;
2877} 3166}
… …
2879############################################################################# 3168#############################################################################
2880 3169
2881package CFClient::UI; 3170package CFClient::UI;
2882 3171
2883$ROOT = new CFClient::UI::Root; 3172$ROOT = new CFClient::UI::Root;
2884$TOOLTIP = new CFClient::UI::Tooltip; 3173$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2885 3174
28861 31751
2887 3176

Diff Legend

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