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.236 by root, Thu May 25 16:54:29 2006 UTC vs.
Revision 1.261 by elmex, Tue May 30 14:45:56 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;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
18 43
19sub check_tooltip { 44sub check_tooltip {
20 if (!$GRAB) { 45 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
23 48
24 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
25 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
26 53
27 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
28 55
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 57
31 $TOOLTIP->set_tooltip_from ($widget); 58 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 59 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 60 }
43 61
44 return; 62 return;
45 } 63 }
46 } 64 }
… …
152sub rescale_widgets { 170sub rescale_widgets {
153 my ($sx, $sy) = @_; 171 my ($sx, $sy) = @_;
154 172
155 for my $widget (values %WIDGET) { 173 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
165 } 188 }
166 } 189 }
167 190
168 reconfigure_widgets; 191 reconfigure_widgets;
169} 192}
… …
178 201
179sub new { 202sub new {
180 my $class = shift; 203 my $class = shift;
181 204
182 my $self = bless { 205 my $self = bless {
183 x => 0, 206 x => "center",
184 y => 0, 207 y => "center",
185 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
186 can_events => 1, 211 can_events => 1,
187 @_ 212 @_
188 }, $class; 213 }, $class;
189 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
190 for (keys %$self) { 217 for (keys %$self) {
191 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
193 } 220 }
194 } 221 }
195 222
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
197 234
198 $self 235 $self
199} 236}
200 237
201sub destroy { 238sub destroy {
… …
205 %$self = (); 242 %$self = ();
206} 243}
207 244
208sub show { 245sub show {
209 my ($self) = @_; 246 my ($self) = @_;
247
210 return if $self->{parent}; 248 return if $self->{parent};
211 249
212 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
213} 251}
214 252
215sub show_centered { 253sub set_visible {
216 my ($self) = @_; 254 my ($self) = @_;
255
217 return if $self->{parent}; 256 return if $self->{visible};
218 257
219 $self->show; 258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
220 260
221 $CFClient::UI::ROOT->on_post_alloc ( 261 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 262
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 263 $self->realloc if !exists $self->{req_w};
224 }, 264
225 ); 265 $_->set_visible for $self->children;
226} 266}
227 267
228sub set_invisible { 268sub set_invisible {
229 my ($self) = @_; 269 my ($self) = @_;
230 270
231 # broken show/hide model 271 return unless $self->{visible};
232 272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
233 delete $self->{visible}; 276 delete $self->{visible};
234 277
235 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
237 280
238 CFClient::UI::check_tooltip 281 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 282 if $TOOLTIP->{owner} == $self;
240 283
241 $self->focus_out; 284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
242} 304}
243 305
244sub hide { 306sub hide {
245 my ($self) = @_; 307 my ($self) = @_;
246 308
… …
248 310
249 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
250 if $self->{parent}; 312 if $self->{parent};
251} 313}
252 314
253sub move { 315sub move_abs {
254 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
255 317
256 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
257 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
258 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
259 321
260 $self->update; 322 $self->update;
261} 323}
262 324
263sub set_size { 325sub set_size {
264 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
265 327
266 $self->{user_w} = $w; 328 $self->{force_w} = $w;
267 $self->{user_h} = $h; 329 $self->{force_h} = $h;
268 330
269 $self->check_size; 331 $self->realloc;
270} 332}
271 333
272sub size_request { 334sub size_request {
273 require Carp; 335 require Carp;
274 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
276 338
277sub configure { 339sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
279 341
280 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
283 347
284 # use alignment to adjust x, y 348 # use alignment to adjust x, y
285 349
286 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 352 }
291 353
292 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 355 $self->{x} = $x;
294 $self->{y} = $y; 356 $self->{y} = $y;
295 $self->update; 357 $self->update;
296 } 358 }
297 359
298 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 361 return unless $self->{visible};
362
363 $self->{alloc_w} = $w;
364 $self->{alloc_h} = $h;
365
366 $self->{root}{size_alloc}{$self+0} = $self;
300 } 367 }
301} 368}
302 369
303sub size_allocate { 370sub size_allocate {
304 # nothing to be done 371 # nothing to be done
305}
306
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312} 372}
313 373
314sub children { 374sub children {
315} 375}
316 376
… …
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
398sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459
460sub find_widget {
461 my ($self, $x, $y) = @_;
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471
472sub set_parent {
473 my ($self, $parent) = @_;
474
475 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500}
501
502sub realloc {
503 my ($self) = @_;
504
505 if ($self->{visible}) {
506 return if $self->{root}{realloc}{$self+0};
507
508 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update;
510 } else {
511 delete $self->{req_w};
512 delete $self->{req_h};
513 }
514}
515
516sub update {
517 my ($self) = @_;
518
519 $self->{parent}->update
520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
528}
399 529
400sub draw { 530sub draw {
401 my ($self) = @_; 531 my ($self) = @_;
402 532
403 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
420 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
421 glEnd; 551 glEnd;
422 glDisable GL_BLEND; 552 glDisable GL_BLEND;
423 } 553 }
424 554
425 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 556 glPushMatrix;
427 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
429 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 560 glVertex 0 , 0;
… …
441 my ($self) = @_; 571 my ($self) = @_;
442 572
443 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
444} 574}
445 575
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size
465 unless exists $self->{req_w};
466
467 $self->show;
468}
469
470sub check_size {
471 my ($self, $forced) = @_;
472
473 $self->{force_alloc} = 1 if $forced;
474 $CFClient::UI::ROOT->{check_size}{$self} = $self;
475}
476
477sub update {
478 my ($self) = @_;
479
480 $self->{parent}->update
481 if $self->{parent};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub DESTROY { 576sub DESTROY {
504 my ($self) = @_; 577 my ($self) = @_;
505 578
506 delete $WIDGET{$self+0}; 579 delete $WIDGET{$self+0};
507 #$self->deactivate; 580 #$self->deactivate;
… …
563 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
564 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
565} 638}
566 639
567sub size_request { 640sub size_request {
568 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
569} 644}
570 645
571sub draw { } 646sub draw { }
572 647
573############################################################################# 648#############################################################################
… …
602 $self->{children} = [ 677 $self->{children} = [
603 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
604 @{$self->{children}}, @widgets 679 @{$self->{children}}, @widgets
605 ]; 680 ];
606 681
607 $self->check_size (1); 682 $self->realloc;
608 $self->update;
609} 683}
610 684
611sub children { 685sub children {
612 @{ $_[0]{children} } 686 @{ $_[0]{children} }
613} 687}
… …
618 delete $child->{parent}; 692 delete $child->{parent};
619 $child->hide; 693 $child->hide;
620 694
621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622 696
623 $self->check_size (1); 697 $self->realloc;
624 $self->update;
625} 698}
626 699
627sub clear { 700sub clear {
628 my ($self) = @_; 701 my ($self) = @_;
629 702
… …
633 for (@$children) { 706 for (@$children) {
634 delete $_->{parent}; 707 delete $_->{parent};
635 $_->hide; 708 $_->hide;
636 } 709 }
637 710
638 $self->check_size; 711 $self->realloc;
639 $self->update;
640} 712}
641 713
642sub find_widget { 714sub find_widget {
643 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
644 716
… …
781} 853}
782 854
783sub size_request { 855sub size_request {
784 my ($self) = @_; 856 my ($self) = @_;
785 857
786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
787 859
788 @$self{qw(child_w child_h)} 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
789} 864}
790 865
791sub size_allocate { 866sub size_allocate {
792 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
793 868
869 my $child = $self->child;
870
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
796 873
797 $self->child->configure (0, 0, $w, $h); 874 $self->child->configure (0, 0, $w, $h);
798 $self->update; 875 $self->update;
799} 876}
800 877
… …
853 my $class = shift; 930 my $class = shift;
854 931
855 my $self; 932 my $self;
856 933
857 my $slider = new CFClient::UI::Slider 934 my $slider = new CFClient::UI::Slider
858 vertical => 1, 935 vertical => 1,
859 range => [0, 0, 1, 0.01], # HACK fix 936 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 937 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 938 $self->{vp}->set_offset (0, $_[1]);
862 }, 939 },
863 ; 940 ;
864 941
865 $self = $class->SUPER::new ( 942 $self = $class->SUPER::new (
… …
871 $self->{vp}->add ($self->{scrolled}); 948 $self->{vp}->add ($self->{scrolled});
872 $self->add ($self->{vp}); 949 $self->add ($self->{vp});
873 $self->add ($self->{slider}); 950 $self->add ($self->{slider});
874 951
875 $self 952 $self
953}
954
955sub update {
956 my ($self) = @_;
957
958 $self->SUPER::update;
959
960 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
876} 963}
877 964
878sub size_allocate { 965sub size_allocate {
879 my ($self, $w, $h) = @_; 966 my ($self, $w, $h) = @_;
880 967
… …
933 1020
934our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
935 1022
936use CFClient::OpenGL; 1023use CFClient::OpenGL;
937 1024
938my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941 1032
942sub new { 1033sub new {
943 my $class = shift; 1034 my $class = shift;
944
945 # TODO: user_x, user_y, overwrite moveto?
946 1035
947 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
948 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
949 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
950 border => 0.6, 1039 border => 0.6,
951 is_toplevel => 1,
952 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
953 @_ 1043 @_
954 ); 1044 );
955 1045
956 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
957 align => 0, 1047 align => 0,
… …
1010 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
1011 1101
1012 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
1014 1104
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
1108 $self->realloc;
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018 $self->check_size;
1019 }; 1110 };
1020 1111
1021 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1025 $self->{motion} = sub { 1116 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
1027 1118
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1120
1030 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031 $self->update;
1032 }; 1122 };
1033 } 1123 }
1034} 1124}
1035 1125
1036sub button_up { 1126sub button_up {
… …
1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056 1146
1057 my $border = $self->border; 1147 my $border = $self->border;
1058 1148
1059 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064 1154
1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
1067 1157
1068 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
1069 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
1070 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
1071
1072 glColor @{ $self->{bg} };
1073
1074 $bg->{s} = $rep_x;
1075 $bg->{t} = $rep_y;
1076 $bg->{wrap_mode} = 1;
1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 } 1163 }
1079 1164
1080 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
1081 1166
… …
1111 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1112 1197
1113 $child->set_parent ($self); 1198 $child->set_parent ($self);
1114 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1115 1200
1116 $self->check_size (1); 1201 $self->realloc;
1117} 1202}
1118 1203
1119# TODO: move to container class maybe? send children a signal on removal? 1204# TODO: move to container class maybe? send children a signal on removal?
1120sub clear { 1205sub clear {
1121 my ($self) = @_; 1206 my ($self) = @_;
… …
1126 for (@children) { 1211 for (@children) {
1127 delete $_->{parent}; 1212 delete $_->{parent};
1128 $_->hide; 1213 $_->hide;
1129 } 1214 }
1130 1215
1131 $self->check_size (1); 1216 $self->realloc;
1132 $self->update;
1133} 1217}
1134 1218
1135sub get_wh { 1219sub get_wh {
1136 my ($self) = @_; 1220 my ($self) = @_;
1137 1221
… …
1168sub size_allocate { 1252sub size_allocate {
1169 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
1170 1254
1171 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1172 1256
1173 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
1174 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
1175 1259
1176 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
1177 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
1178 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
1179 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1233 } 1317 }
1234} 1318}
1235 1319
1236############################################################################# 1320#############################################################################
1237 1321
1238package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1239
1240# TODO: wrap into common Box base class
1241 1323
1242our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1243 1325
1244sub size_request { 1326sub size_request {
1245 my ($self) = @_; 1327 my ($self) = @_;
1246 1328
1247 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1248 1330 ? (
1249 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1250 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1251 (List::Util::max map $_->[1], @alloc), 1333 )
1252 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1253} 1338}
1254 1339
1255sub size_allocate { 1340sub size_allocate {
1256 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1257 1342
1258 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1259
1260 my $children = $self->{children}; 1344 my $children = $self->{children};
1261 1345
1262 my @h = map $_->{req_w}, @$children; 1346 my @req;
1263 1347
1264 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1265 1349 @req = ($space / (@$children || 1)) x @$children;
1266 if ($req_h > $h) {
1267 # ah well, not enough space
1268 $_ *= $h / $req_h for @h;
1269 } else { 1350 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1352 my $req = List::Util::sum @req;
1353
1354 if ($req > $space) {
1355 # ah well, not enough space
1356 $_ *= $space / $req for @req;
1357 } else {
1270 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1271 $exp ||= 1;
1272 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1273 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1274 my $child = $children->[$_];
1275
1276 my $alloc_h = $h[$_];
1277 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1278 $h[$_] = $alloc_h;
1279 } 1364 }
1280 } 1365 }
1281 1366
1282 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1283 1368
1284 my $y = 0; 1369 my $pos = 0;
1285 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1286 my $child = $children->[$_];
1287 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1288 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1289 1373
1290 $y += $h; 1374 $pos += $alloc;
1291 } 1375 }
1292 1376
1293 1 1377 1
1294} 1378}
1295 1379
1296############################################################################# 1380#############################################################################
1297 1381
1382package CFClient::UI::HBox;
1383
1384our @ISA = CFClient::UI::Box::;
1385
1386sub new {
1387 my $class = shift;
1388
1389 $class->SUPER::new (
1390 vertical => 0,
1391 @_,
1392 )
1393}
1394
1395#############################################################################
1396
1298package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1299 1398
1300# TODO: wrap into common Box base class
1301
1302our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1303 1400
1304sub size_request { 1401sub new {
1305 my ($self) = @_; 1402 my $class = shift;
1306 1403
1307 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1308 1405 vertical => 1,
1309 ( 1406 @_,
1310 (List::Util::max map $_->[0], @alloc),
1311 (List::Util::sum map $_->[1], @alloc),
1312 ) 1407 )
1313}
1314
1315sub size_allocate {
1316 my ($self, $w, $h) = @_;
1317
1318 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1319
1320 my $children = $self->{children};
1321
1322 my @h = map $_->{req_h}, @$children;
1323
1324 my $req_h = List::Util::sum @h;
1325
1326 if ($req_h > $h) {
1327 # ah well, not enough space
1328 $_ *= $h / $req_h for @h;
1329 } else {
1330 my $exp = List::Util::sum map $_->{expand}, @$children;
1331 $exp ||= 1;
1332
1333 for (0 .. $#$children) {
1334 my $child = $children->[$_];
1335
1336 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1337 }
1338 }
1339
1340 CFClient::UI::harmonize \@h;
1341
1342 my $y = 0;
1343 for (0 .. $#$children) {
1344 my $child = $children->[$_];
1345 my $h = $h[$_];
1346 $child->configure (0, $y, $w, $h);
1347
1348 $y += $h;
1349 }
1350
1351 1
1352} 1408}
1353 1409
1354############################################################################# 1410#############################################################################
1355 1411
1356package CFClient::UI::Label; 1412package CFClient::UI::Label;
… …
1373 ellipsise => 3, # end 1429 ellipsise => 3, # end
1374 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1375 fontsize => 1, 1431 fontsize => 1,
1376 align => -1, 1432 align => -1,
1377 valign => -1, 1433 valign => -1,
1378 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1379 can_events => 0, 1436 can_events => 0,
1380 %arg 1437 %arg
1381 ); 1438 );
1382 1439
1383 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1419 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1420 1477
1421 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1422 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1423 1480
1481 $self->realloc;
1424 $self->update; 1482 $self->update;
1425 $self->check_size;
1426} 1483}
1427 1484
1428sub set_markup { 1485sub set_markup {
1429 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1430 1487
… …
1434 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1435 1492
1436 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1437 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1438 1495
1496 $self->realloc;
1439 $self->update; 1497 $self->update;
1440 $self->check_size;
1441} 1498}
1442 1499
1443sub size_request { 1500sub size_request {
1444 my ($self) = @_; 1501 my ($self) = @_;
1445 1502
… …
1459 1516
1460 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1461 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1462 } 1519 }
1463 1520
1464 ( 1521 ($w, $h)
1465 $w + $self->{padding} * 2,
1466 $h + $self->{padding} * 2,
1467 )
1468} 1522}
1469 1523
1470sub size_allocate { 1524sub size_allocate {
1471 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1472 1526
… …
1477 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1478 1532
1479 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1480 delete $self->{texture}; 1534 delete $self->{texture};
1481 1535
1482 $self->update; 1536 $self->realloc;
1483 $self->check_size;
1484} 1537}
1485 1538
1486sub _draw { 1539sub _draw {
1487 my ($self) = @_; 1540 my ($self) = @_;
1488 1541
… …
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1551
1499 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1500 1553
1501 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1502 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1503 : ($self->{w} - $tex->{w}) * 0.5); 1556 : ($self->{w} - $tex->{w}) * 0.5);
1504 1557
1505 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1506 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1507 : ($self->{h} - $tex->{h}) * 0.5); 1560 : ($self->{h} - $tex->{h}) * 0.5);
1508 1561
1509 $tex 1562 $tex
1510 }; 1563 };
1511 1564
… …
1568sub set_text { 1621sub set_text {
1569 my ($self, $text) = @_; 1622 my ($self, $text) = @_;
1570 1623
1571 $self->{cursor} = length $text; 1624 $self->{cursor} = length $text;
1572 $self->_set_text ($text); 1625 $self->_set_text ($text);
1573 $self->update; 1626
1574 $self->check_size; 1627 $self->realloc;
1575} 1628}
1576 1629
1577sub get_text { 1630sub get_text {
1578 $_[0]{text} 1631 $_[0]{text}
1579} 1632}
… …
1612 } elsif ($uni) { 1665 } elsif ($uni) {
1613 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1614 } 1667 }
1615 1668
1616 $self->_set_text ($text); 1669 $self->_set_text ($text);
1617 $self->update; 1670
1618 $self->check_size; 1671 $self->realloc;
1619} 1672}
1620 1673
1621sub focus_in { 1674sub focus_in {
1622 my ($self) = @_; 1675 my ($self) = @_;
1623 1676
… …
1750 1803
1751sub new { 1804sub new {
1752 my $class = shift; 1805 my $class = shift;
1753 1806
1754 $class->SUPER::new ( 1807 $class->SUPER::new (
1755 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1756 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1757 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1758 can_hover => 1, 1812 can_hover => 1,
1759 align => 0, 1813 align => 0,
1760 valign => 0, 1814 valign => 0,
… …
1807 1861
1808sub new { 1862sub new {
1809 my $class = shift; 1863 my $class = shift;
1810 1864
1811 $class->SUPER::new ( 1865 $class->SUPER::new (
1812 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1813 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1814 active_fg => [1, 1, 0], 1869 active_fg => [1, 1, 0],
1815 bg => [0, 0, 0, 0.2], 1870 bg => [0, 0, 0, 0.2],
1816 active_bg => [1, 1, 1, 0.5], 1871 active_bg => [1, 1, 1, 0.5],
1817 state => 0, 1872 state => 0,
… …
1821} 1876}
1822 1877
1823sub size_request { 1878sub size_request {
1824 my ($self) = @_; 1879 my ($self) = @_;
1825 1880
1826 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1827} 1882}
1828 1883
1829sub button_down { 1884sub button_down {
1830 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1831 1886
1832 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1833 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1834 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1835 $self->_emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1836 } 1891 }
1837} 1892}
1838 1893
1839sub _draw { 1894sub _draw {
1840 my ($self) = @_; 1895 my ($self) = @_;
1841 1896
1842 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1843 1898
1844 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1845 1900
1846 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1901 my ($w, $h) = @$self{qw(w h)};
1902
1903 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1847 1904
1848 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1849 1906
1850 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1851 1908
… …
2116 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
2117 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2118 bg => [0, 0, 0, 0.2], 2175 bg => [0, 0, 0, 0.2],
2119 active_bg => [1, 1, 1, 0.5], 2176 active_bg => [1, 1, 1, 0.5],
2120 range => [0, 0, 100, 10, 0], 2177 range => [0, 0, 100, 10, 0],
2121 req_w => $::WIDTH / 80, 2178 min_w => $::WIDTH / 80,
2122 req_h => $::WIDTH / 80, 2179 min_h => $::WIDTH / 80,
2123 vertical => 0, 2180 vertical => 0,
2124 can_hover => 1, 2181 can_hover => 1,
2125 inner_pad => 0.02, 2182 inner_pad => 0.02,
2126 @_ 2183 @_
2127 ); 2184 );
… …
2130 $self->update; 2187 $self->update;
2131 2188
2132 $self 2189 $self
2133} 2190}
2134 2191
2192sub changed { }
2193
2135sub set_range { 2194sub set_range {
2136 my ($self, $range) = @_; 2195 my ($self, $range) = @_;
2137 2196
2138 $self->{range} = $range; 2197 ($range, $self->{range}) = ($self->{range}, $range);
2139 2198
2140 $self->update; 2199 $self->update
2200 if "@$range" ne "@{$self->{range}}";
2141} 2201}
2142 2202
2143sub set_value { 2203sub set_value {
2144 my ($self, $value) = @_; 2204 my ($self, $value) = @_;
2145 2205
… …
2164} 2224}
2165 2225
2166sub size_request { 2226sub size_request {
2167 my ($self) = @_; 2227 my ($self) = @_;
2168 2228
2169 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
2170 my $h = $self->{req_h};
2171
2172 $self->{vertical} ? ($h, $w) : ($w, $h)
2173} 2230}
2174 2231
2175sub button_down { 2232sub button_down {
2176 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
2177 2234
… …
2528 2585
2529sub new { 2586sub new {
2530 my $class = shift; 2587 my $class = shift;
2531 2588
2532 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2533 state => 0, 2590 state => 0,
2534 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2535 @_ 2592 @_
2536 ); 2593 );
2537 2594
2538 if ($self->{state}) {
2539 $self->{state} = 0;
2540 $self->toggle_flopper;
2541 }
2542
2543 $self 2595 $self
2544} 2596}
2545 2597
2546sub toggle_flopper { 2598sub toggle_flopper {
2547 my ($self) = @_; 2599 my ($self) = @_;
2548 2600
2549 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2550 if ($self->{state} = !$self->{state}) {
2551 $CFClient::UI::ROOT->add ($self->{other});
2552 $self->{other}->move ($self->coord2global (0, $self->{h}));
2553 $self->_emit ("open");
2554 } else {
2555 $CFClient::UI::ROOT->remove ($self->{other});
2556 $self->_emit ("close");
2557 }
2558
2559 $self->_emit (changed => $self->{state});
2560} 2602}
2561 2603
2562############################################################################# 2604#############################################################################
2563 2605
2564package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2577} 2619}
2578 2620
2579sub set_tooltip_from { 2621sub set_tooltip_from {
2580 my ($self, $widget) = @_; 2622 my ($self, $widget) = @_;
2581 2623
2624 my $tooltip = $widget->{tooltip};
2625
2626 if ($ENV{CFPLUS_DEBUG} & 2) {
2627 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}";
2631 }
2632
2582 $self->add (new CFClient::UI::Label 2633 $self->add (new CFClient::UI::Label
2583 markup => $widget->{tooltip}, 2634 markup => $tooltip,
2584 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2585 fontsize => 0.8, 2636 fontsize => 0.8,
2586 fg => [0, 0, 0, 1], 2637 fg => [0, 0, 0, 1],
2587 ellipsise => 0, 2638 ellipsise => 0,
2588 font => ($widget->{tooltip_font} || $::FONT_PROP), 2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2599 2650
2600sub size_allocate { 2651sub size_allocate {
2601 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2602 2653
2603 $self->SUPER::size_allocate ($w - 4, $h - 4); 2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2655}
2656
2657sub visibility_change {
2658 my ($self, $visible) = @_;
2659
2660 return unless $visible;
2661
2662 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner}
2664 or return;
2665
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH;
2670
2671 $self->move_abs ($x, $y);
2672 });
2604} 2673}
2605 2674
2606sub _draw { 2675sub _draw {
2607 my ($self) = @_; 2676 my ($self) = @_;
2608 2677
… …
2625 glVertex $w, $h; 2694 glVertex $w, $h;
2626 glVertex $w, 0; 2695 glVertex $w, 0;
2627 glEnd; 2696 glEnd;
2628 2697
2629 glTranslate 2 - 0.375, 2 - 0.375; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2699
2630 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2631} 2701}
2632 2702
2633############################################################################# 2703#############################################################################
2634 2704
… …
2748 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2749 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2750 2820
2751 $row++; 2821 $row++;
2752 } 2822 }
2753
2754# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2755}
2756
2757sub size_request {
2758 my ($self) = @_;
2759 ($self->{req_w}, $self->{req_h});
2760} 2823}
2761 2824
2762############################################################################# 2825#############################################################################
2763 2826
2764package CFClient::UI::Menu; 2827package CFClient::UI::Menu;
… …
2806 # maybe save $GRAB? must be careful about events... 2869 # maybe save $GRAB? must be careful about events...
2807 $GRAB = $self; 2870 $GRAB = $self;
2808 $self->{button} = $ev->{button}; 2871 $self->{button} = $ev->{button};
2809 2872
2810 $self->show; 2873 $self->show;
2811 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2812} 2875}
2813 2876
2814sub mouse_motion { 2877sub mouse_motion {
2815 my ($self, $ev, $x, $y) = @_; 2878 my ($self, $ev, $x, $y) = @_;
2816 2879
… …
2950use CFClient::OpenGL; 3013use CFClient::OpenGL;
2951 3014
2952sub new { 3015sub new {
2953 my $class = shift; 3016 my $class = shift;
2954 3017
2955 $class->SUPER::new ( 3018 my $self = $class->SUPER::new (
3019 visible => 1,
2956 @_, 3020 @_,
2957 ) 3021 );
2958}
2959 3022
2960sub configure { 3023 Scalar::Util::weaken ($self->{root} = $self);
2961 my ($self, $x, $y, $w, $h) = @_;
2962 3024
2963 $self->{w} = $w; 3025 $self
2964 $self->{h} = $h;
2965}
2966
2967sub check_size {
2968 my ($self) = @_;
2969
2970 $self->size_allocate ($self->{w}, $self->{h})
2971 if $self->{w};
2972} 3026}
2973 3027
2974sub size_request { 3028sub size_request {
2975 my ($self) = @_; 3029 my ($self) = @_;
2976 3030
2977 ($self->{w}, $self->{h}) 3031 ($self->{w}, $self->{h})
3032}
3033
3034sub _to_pixel {
3035 my ($coord, $size, $max) = @_;
3036
3037 $coord =
3038 $coord eq "center" ? ($max - $size) * 0.5
3039 : $coord eq "max" ? $max
3040 : $coord;
3041
3042 $coord = 0 if $coord < 0;
3043 $coord = $max - $size if $coord > $max - $size;
3044
3045 int $coord + 0.5
2978} 3046}
2979 3047
2980sub size_allocate { 3048sub size_allocate {
2981 my ($self, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2982 3050
2983 for my $child ($self->children) { 3051 for my $child ($self->children) {
2984 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2985 3053
2986 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3054 $X = $child->{force_x} if exists $child->{force_x};
2987 if exists $child->{req_x}; 3055 $Y = $child->{force_y} if exists $child->{force_y};
2988 3056
2989 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3057 $X = _to_pixel $X, $W, $self->{w};
2990 if exists $child->{req_y}; 3058 $Y = _to_pixel $Y, $H, $self->{h};
2991
2992 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2993 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2994 3059
2995 $child->configure ($X, $Y, $W, $H); 3060 $child->configure ($X, $Y, $W, $H);
2996 } 3061 }
2997} 3062}
2998 3063
… …
3009} 3074}
3010 3075
3011sub update { 3076sub update {
3012 my ($self) = @_; 3077 my ($self) = @_;
3013 3078
3014 $self->check_size;
3015 $::WANT_REFRESH++; 3079 $::WANT_REFRESH++;
3016} 3080}
3017 3081
3018sub add { 3082sub add {
3019 my ($self, @children) = @_; 3083 my ($self, @children) = @_;
3020 3084
3021 for (my @widgets = @children; my $w = pop @widgets; ) {
3022 push @widgets, $w->children;
3023 $w->{root} = $self;
3024 $w->{visible} = 1;
3025 }
3026
3027 for my $child (@children) {
3028 $child->{is_toplevel} = 1; 3085 $_->{is_toplevel} = 1
3029 3086 for @children;
3030 # integerise window positions
3031 $child->{x} = int $child->{x};
3032 $child->{y} = int $child->{y};
3033 }
3034 3087
3035 $self->SUPER::add (@children); 3088 $self->SUPER::add (@children);
3036} 3089}
3037 3090
3038sub remove { 3091sub remove {
3039 my ($self, @children) = @_; 3092 my ($self, @children) = @_;
3040 3093
3041 $self->SUPER::remove (@children); 3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3042 3098
3043 while (@children) { 3099 while (@children) {
3044 my $w = pop @children; 3100 my $w = pop @children;
3045 push @children, $w->children; 3101 push @children, $w->children;
3046 $w->set_invisible; 3102 $w->set_invisible;
… …
3065 while ($self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
3066 $_->() 3122 $_->()
3067 for values %{delete $self->{refresh_hook}}; 3123 for values %{delete $self->{refresh_hook}};
3068 } 3124 }
3069 3125
3070 if ($self->{check_size}) { 3126 if ($self->{realloc}) {
3071 my @queue = ([], []); 3127 my @queue;
3072 3128
3073 for (;;) { 3129 while () {
3074 if ($self->{check_size}) { 3130 if ($self->{realloc}) {
3075 # heuristic: check containers last 3131 #TODO use array-of-depth approach
3076 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3132
3077 for values %{delete $self->{check_size}} 3133 use sort 'stable';
3134
3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3136 @queue, values %{delete $self->{realloc}};
3078 } 3137 }
3079 3138
3080 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3139 my $widget = pop @queue || last;
3081 3140
3082 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3141 $widget->{visible} or last; # do not resize invisible widgets
3083 ? @$widget{qw(user_w user_h)} 3142
3084 : $widget->size_request; 3143 my ($w, $h) = $widget->size_request;
3085 3144
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3147
3148 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h};
3150
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3086 if (delete $widget->{force_alloc} 3152 || delete $widget->{force_realloc}) {
3087 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3088 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3089
3090 $widget->{req_w} = $w; 3153 $widget->{req_w} = $w;
3091 $widget->{req_h} = $h; 3154 $widget->{req_h} = $h;
3092 3155
3093 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3156 $self->{size_alloc}{$widget+0} = $widget;
3094 3157
3095 $widget->{parent}->check_size
3096 if $widget->{parent}; 3158 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent;
3160 #unshift @queue, $parent;
3161 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent;
3163 }
3097 } 3164 }
3165
3166 delete $self->{realloc}{$widget+0};
3098 } 3167 }
3099 } 3168 }
3100 3169
3101 while ($self->{size_alloc}) { 3170 while (my $size_alloc = delete $self->{size_alloc}) {
3102 for (values %{delete $self->{size_alloc}}) { 3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3103 my ($widget, $w, $h) = @$_; 3172 values %$size_alloc;
3173
3174 while () {
3175 my $widget = pop @queue || last;
3176
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3104 3178
3105 $w = 0 if $w < 0; 3179 $w = 0 if $w < 0;
3106 $h = 0 if $h < 0; 3180 $h = 0 if $h < 0;
3107 3181
3182 $w = int $w + 0.5;
3183 $h = int $h + 0.5;
3184
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3108 $widget->{w} = $w; 3186 $widget->{w} = $w;
3109 $widget->{h} = $h; 3187 $widget->{h} = $h;
3188
3110 $widget->emit (size_allocate => $w, $h); 3189 $widget->emit (size_allocate => $w, $h);
3190 }
3111 } 3191 }
3112 } 3192 }
3113 3193
3114 while ($self->{post_alloc_hook}) { 3194 while ($self->{post_alloc_hook}) {
3115 $_->() 3195 $_->()
3116 for values %{delete $self->{post_alloc_hook}}; 3196 for values %{delete $self->{post_alloc_hook}};
3117 } 3197 }
3198
3118 3199
3119 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3120 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3121 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
3122 3203
… …
3129 $self->_draw; 3210 $self->_draw;
3130} 3211}
3131 3212
3132############################################################################# 3213#############################################################################
3133 3214
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226
3227 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228 text => "start recording",
3229 tooltip => "Start/Stops recording of actions."
3230 ."All subsequent actions after the recording started will be captured."
3231 ."The actions are displayed after the record was stopped."
3232 ."To bind the action you have to click on the 'Bind' button",
3233 on_activate => sub {
3234 unless ($self->{recording}) {
3235 $self->start;
3236 } else {
3237 $self->stop;
3238 }
3239 });
3240
3241 $vb->add (new CFClient::UI::Label text => "Actions:");
3242 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3245 $vb->add (my $hb = new CFClient::UI::HBox);
3246 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247 $hb->add (new CFClient::UI::Button
3248 text => "bind",
3249 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250 on_activate => sub {
3251 $self->ask_for_bind;
3252 });
3253
3254 $vb->add (my $hb = new CFClient::UI::HBox);
3255 $hb->add (new CFClient::UI::Button
3256 text => "ok",
3257 expand => 1,
3258 tooltip => "This closes the binding editor and saves the binding",
3259 on_activate => sub {
3260 $self->hide;
3261 $self->commit;
3262 });
3263
3264 $hb->add (new CFClient::UI::Button
3265 text => "cancel",
3266 expand => 1,
3267 tooltip => "This closes the binding editor without saving",
3268 on_activate => sub {
3269 $self->hide;
3270 $self->{binding_cancel}->()
3271 if $self->{binding_cancel};
3272 });
3273
3274 $self->update_binding_widgets;
3275
3276 $self
3277}
3278
3279sub commit {
3280 my ($self) = @_;
3281 my ($mod, $sym, $cmds) = $self->get_binding;
3282 if ($sym != 0 && @$cmds > 0) {
3283 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3284 ."'. Don't forget 'Save Config'!");
3285 $self->{binding_change}->($mod, $sym, $cmds)
3286 if $self->{binding_change};
3287 } else {
3288 $::STATUSBOX->add ("No action bound, no key or action specified!");
3289 $self->{binding_cancel}->()
3290 if $self->{binding_cancel};
3291 }
3292}
3293
3294sub start {
3295 my ($self) = @_;
3296
3297 $self->{rec_btn}->set_text ("stop recording");
3298 $self->{recording} = 1;
3299 $self->clear_command_list;
3300 $::CONN->start_record if $::CONN;
3301}
3302
3303sub stop {
3304 my ($self) = @_;
3305
3306 $self->{rec_btn}->set_text ("start recording");
3307 $self->{recording} = 0;
3308
3309 my $rec;
3310 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec);
3313}
3314
3315sub ask_for_bind {
3316 my ($self, $commit) = @_;
3317
3318 CFClient::Binder::open_binding_dialog (sub {
3319 my ($mod, $sym) = @_;
3320 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3321 $self->update_binding_widgets;
3322 $self->commit if $commit;
3323 });
3324}
3325
3326sub set_binding {
3327 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3328
3329 $self->clear_command_list;
3330 $self->{recording} = 0;
3331 $self->{rec_btn}->set_text ("start recording");
3332
3333 $self->{binding} = [$mod, $sym];
3334 $self->{commands} = $cmds;
3335
3336 $self->{binding_change} = $cb;
3337 $self->{binding_cancel} = $ccb;
3338
3339 $self->update_binding_widgets;
3340}
3341
3342sub update_binding_widgets {
3343 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding;
3345 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3346 $self->set_command_list ($cmds);
3347}
3348
3349sub get_binding {
3350 my ($self) = @_;
3351 return (
3352 $self->{binding}->[0],
3353 $self->{binding}->[1],
3354 [ grep { defined $_ } @{$self->{commands}} ]
3355 );
3356}
3357
3358sub clear_command_list {
3359 my ($self) = @_;
3360 $self->{cmdbox}->clear ();
3361}
3362
3363sub set_command_list {
3364 my ($self, $cmds) = @_;
3365
3366 $self->{cmdbox}->clear ();
3367 $self->{commands} = $cmds;
3368
3369 my $idx = 0;
3370
3371 for (@$cmds) {
3372 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3373
3374 my $i = $idx;
3375 $hb->add (new CFClient::UI::Button
3376 text => "delete",
3377 tooltip => "Deletes the action from the record",
3378 on_activate => sub {
3379 $self->{cmdbox}->remove ($hb);
3380 $cmds->[$i] = undef;
3381 });
3382
3383 $hb->add (new CFClient::UI::Label text => $_);
3384
3385 $idx++
3386 }
3387}
3388
3389
3390#############################################################################
3391
3134package CFClient::UI; 3392package CFClient::UI;
3135 3393
3136$ROOT = new CFClient::UI::Root; 3394$ROOT = new CFClient::UI::Root;
3137$TOOLTIP = new CFClient::UI::Tooltip z => 900; 3395$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3138 3396

Diff Legend

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