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

Diff Legend

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