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.239 by root, Thu May 25 22:29:57 2006 UTC vs.
Revision 1.264 by root, Thu Jun 1 02:58:30 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 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
466 # TODO: req_w _does_change after ->reconfigure
467 $self->check_size
468 unless exists $self->{req_w};
469
470 $self->show;
471}
472
473sub check_size {
474 my ($self, $forced) = @_;
475
476 $self->{force_alloc} = 1 if $forced;
477 $CFClient::UI::ROOT->{check_size}{$self} = $self;
478}
479
480sub update {
481 my ($self) = @_;
482
483 $self->{parent}->update
484 if $self->{parent};
485}
486
487sub connect {
488 my ($self, $signal, $cb) = @_;
489
490 push @{ $self->{signal_cb}{$signal} }, $cb;
491}
492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
504}
505
506sub DESTROY { 576sub DESTROY {
507 my ($self) = @_; 577 my ($self) = @_;
508 578
509 delete $WIDGET{$self+0}; 579 delete $WIDGET{$self+0};
510 #$self->deactivate; 580 #$self->deactivate;
… …
566 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
567 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
568} 638}
569 639
570sub size_request { 640sub size_request {
571 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
572} 644}
573 645
574sub draw { } 646sub draw { }
575 647
576############################################################################# 648#############################################################################
… …
605 $self->{children} = [ 677 $self->{children} = [
606 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
607 @{$self->{children}}, @widgets 679 @{$self->{children}}, @widgets
608 ]; 680 ];
609 681
610 $self->check_size (1); 682 $self->realloc;
611 $self->update;
612} 683}
613 684
614sub children { 685sub children {
615 @{ $_[0]{children} } 686 @{ $_[0]{children} }
616} 687}
… …
621 delete $child->{parent}; 692 delete $child->{parent};
622 $child->hide; 693 $child->hide;
623 694
624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625 696
626 $self->check_size (1); 697 $self->realloc;
627 $self->update;
628} 698}
629 699
630sub clear { 700sub clear {
631 my ($self) = @_; 701 my ($self) = @_;
632 702
… …
636 for (@$children) { 706 for (@$children) {
637 delete $_->{parent}; 707 delete $_->{parent};
638 $_->hide; 708 $_->hide;
639 } 709 }
640 710
641 $self->check_size; 711 $self->realloc;
642 $self->update;
643} 712}
644 713
645sub find_widget { 714sub find_widget {
646 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
647 716
… …
784} 853}
785 854
786sub size_request { 855sub size_request {
787 my ($self) = @_; 856 my ($self) = @_;
788 857
789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
790 859
791 @$self{qw(child_w child_h)} 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
792} 864}
793 865
794sub size_allocate { 866sub size_allocate {
795 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
796 868
869 my $child = $self->child;
870
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
799 873
800 $self->child->configure (0, 0, $w, $h); 874 $self->child->configure (0, 0, $w, $h);
801 $self->update; 875 $self->update;
802} 876}
803 877
… …
856 my $class = shift; 930 my $class = shift;
857 931
858 my $self; 932 my $self;
859 933
860 my $slider = new CFClient::UI::Slider 934 my $slider = new CFClient::UI::Slider
861 vertical => 1, 935 vertical => 1,
862 range => [0, 0, 1, 0.01], # HACK fix 936 range => [0, 0, 1, 0.01], # HACK fix
863 connect_changed => sub { 937 on_changed => sub {
864 $self->{vp}->set_offset (0, $_[1]); 938 $self->{vp}->set_offset (0, $_[1]);
865 }, 939 },
866 ; 940 ;
867 941
868 $self = $class->SUPER::new ( 942 $self = $class->SUPER::new (
… …
946 1020
947our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
948 1022
949use CFClient::OpenGL; 1023use CFClient::OpenGL;
950 1024
951my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
952 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
953 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);
954 1032
955sub new { 1033sub new {
956 my $class = shift; 1034 my $class = shift;
957
958 # TODO: user_x, user_y, overwrite moveto?
959 1035
960 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
961 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
962 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
963 border => 0.6, 1039 border => 0.6,
964 is_toplevel => 1,
965 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
966 @_ 1043 @_
967 ); 1044 );
968 1045
969 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
970 align => 0, 1047 align => 0,
… …
1023 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
1024 1101
1025 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
1026 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
1027 1104
1028 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1029 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
1108 $self->realloc;
1030 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1031 $self->check_size;
1032 }; 1110 };
1033 1111
1034 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
1035 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1036 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1038 $self->{motion} = sub { 1116 $self->{motion} = sub {
1039 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
1040 1118
1041 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
1042 1120
1043 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1044 $self->update;
1045 }; 1122 };
1046 } 1123 }
1047} 1124}
1048 1125
1049sub button_up { 1126sub button_up {
… …
1068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1069 1146
1070 my $border = $self->border; 1147 my $border = $self->border;
1071 1148
1072 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
1073 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1074 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1075 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1076 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1077 1154
1078 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1079 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
1080 1157
1081 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
1082 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
1083 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
1084
1085 glColor @{ $self->{bg} };
1086
1087 $bg->{s} = $rep_x;
1088 $bg->{t} = $rep_y;
1089 $bg->{wrap_mode} = 1;
1090 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1091 } 1163 }
1092 1164
1093 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
1094 1166
… …
1124 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1125 1197
1126 $child->set_parent ($self); 1198 $child->set_parent ($self);
1127 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1128 1200
1129 $self->check_size (1); 1201 $self->realloc;
1130} 1202}
1131 1203
1132# 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?
1133sub clear { 1205sub clear {
1134 my ($self) = @_; 1206 my ($self) = @_;
… …
1139 for (@children) { 1211 for (@children) {
1140 delete $_->{parent}; 1212 delete $_->{parent};
1141 $_->hide; 1213 $_->hide;
1142 } 1214 }
1143 1215
1144 $self->check_size (1); 1216 $self->realloc;
1145 $self->update;
1146} 1217}
1147 1218
1148sub get_wh { 1219sub get_wh {
1149 my ($self) = @_; 1220 my ($self) = @_;
1150 1221
… …
1246 } 1317 }
1247} 1318}
1248 1319
1249############################################################################# 1320#############################################################################
1250 1321
1251package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1252
1253# TODO: wrap into common Box base class
1254 1323
1255our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1256 1325
1257sub size_request { 1326sub size_request {
1258 my ($self) = @_; 1327 my ($self) = @_;
1259 1328
1260 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1261 1330 ? (
1262 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1263 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1264 (List::Util::max map $_->[1], @alloc), 1333 )
1265 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1266} 1338}
1267 1339
1268sub size_allocate { 1340sub size_allocate {
1269 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1270 1342
1271 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1272
1273 my $children = $self->{children}; 1344 my $children = $self->{children};
1274 1345
1275 my @h = map $_->{req_w}, @$children; 1346 my @req;
1276 1347
1277 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1278 1349 @req = ($space / (@$children || 1)) x @$children;
1279 if ($req_h > $h) {
1280 # ah well, not enough space
1281 $_ *= $h / $req_h for @h;
1282 } 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 {
1283 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1284 $exp ||= 1;
1285 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1286 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1287 my $child = $children->[$_];
1288
1289 my $alloc_h = $h[$_];
1290 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1291 $h[$_] = $alloc_h;
1292 } 1364 }
1293 } 1365 }
1294 1366
1295 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1296 1368
1297 my $y = 0; 1369 my $pos = 0;
1298 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1299 my $child = $children->[$_];
1300 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1301 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1302 1373
1303 $y += $h; 1374 $pos += $alloc;
1304 } 1375 }
1305 1376
1306 1 1377 1
1307} 1378}
1308 1379
1309############################################################################# 1380#############################################################################
1310 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
1311package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1312 1398
1313# TODO: wrap into common Box base class
1314
1315our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1316 1400
1317sub size_request { 1401sub new {
1318 my ($self) = @_; 1402 my $class = shift;
1319 1403
1320 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1321 1405 vertical => 1,
1322 ( 1406 @_,
1323 (List::Util::max map $_->[0], @alloc),
1324 (List::Util::sum map $_->[1], @alloc),
1325 ) 1407 )
1326}
1327
1328sub size_allocate {
1329 my ($self, $w, $h) = @_;
1330
1331 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1332
1333 my $children = $self->{children};
1334
1335 my @h = map $_->{req_h}, @$children;
1336
1337 my $req_h = List::Util::sum @h;
1338
1339 if ($req_h > $h) {
1340 # ah well, not enough space
1341 $_ *= $h / $req_h for @h;
1342 } else {
1343 my $exp = List::Util::sum map $_->{expand}, @$children;
1344 $exp ||= 1;
1345
1346 for (0 .. $#$children) {
1347 my $child = $children->[$_];
1348
1349 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1350 }
1351 }
1352
1353 CFClient::UI::harmonize \@h;
1354
1355 my $y = 0;
1356 for (0 .. $#$children) {
1357 my $child = $children->[$_];
1358 my $h = $h[$_];
1359 $child->configure (0, $y, $w, $h);
1360
1361 $y += $h;
1362 }
1363
1364 1
1365} 1408}
1366 1409
1367############################################################################# 1410#############################################################################
1368 1411
1369package CFClient::UI::Label; 1412package CFClient::UI::Label;
… …
1386 ellipsise => 3, # end 1429 ellipsise => 3, # end
1387 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1388 fontsize => 1, 1431 fontsize => 1,
1389 align => -1, 1432 align => -1,
1390 valign => -1, 1433 valign => -1,
1391 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1392 can_events => 0, 1436 can_events => 0,
1393 %arg 1437 %arg
1394 ); 1438 );
1395 1439
1396 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1432 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1433 1477
1434 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1435 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1436 1480
1481 $self->realloc;
1437 $self->update; 1482 $self->update;
1438 $self->check_size;
1439} 1483}
1440 1484
1441sub set_markup { 1485sub set_markup {
1442 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1443 1487
… …
1447 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1448 1492
1449 $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;
1450 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1451 1495
1496 $self->realloc;
1452 $self->update; 1497 $self->update;
1453 $self->check_size;
1454} 1498}
1455 1499
1456sub size_request { 1500sub size_request {
1457 my ($self) = @_; 1501 my ($self) = @_;
1458 1502
… …
1472 1516
1473 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1474 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1475 } 1519 }
1476 1520
1477 ( 1521 ($w, $h)
1478 $w + $self->{padding} * 2,
1479 $h + $self->{padding} * 2,
1480 )
1481} 1522}
1482 1523
1483sub size_allocate { 1524sub size_allocate {
1484 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1485 1526
1486 delete $self->{texture}; 1527 delete $self->{texture}
1528 ;#d#
1487} 1529}
1488 1530
1489sub set_fontsize { 1531sub set_fontsize {
1490 my ($self, $fontsize) = @_; 1532 my ($self, $fontsize) = @_;
1491 1533
1492 $self->{fontsize} = $fontsize; 1534 $self->{fontsize} = $fontsize;
1493 delete $self->{texture}; 1535 delete $self->{texture};
1494 1536
1495 $self->update; 1537 $self->realloc;
1496 $self->check_size;
1497} 1538}
1498 1539
1499sub _draw { 1540sub _draw {
1500 my ($self) = @_; 1541 my ($self) = @_;
1501 1542
… …
1509 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1510 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1511 1552
1512 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1553 my $tex = new_from_layout CFClient::Texture $self->{layout};
1513 1554
1514 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1515 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1516 : ($self->{w} - $tex->{w}) * 0.5); 1557 : ($self->{w} - $tex->{w}) * 0.5);
1517 1558
1518 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1519 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1520 : ($self->{h} - $tex->{h}) * 0.5); 1561 : ($self->{h} - $tex->{h}) * 0.5);
1521 1562
1522 $tex 1563 $tex
1523 }; 1564 };
1524 1565
… …
1581sub set_text { 1622sub set_text {
1582 my ($self, $text) = @_; 1623 my ($self, $text) = @_;
1583 1624
1584 $self->{cursor} = length $text; 1625 $self->{cursor} = length $text;
1585 $self->_set_text ($text); 1626 $self->_set_text ($text);
1586 $self->update; 1627
1587 $self->check_size; 1628 $self->realloc;
1588} 1629}
1589 1630
1590sub get_text { 1631sub get_text {
1591 $_[0]{text} 1632 $_[0]{text}
1592} 1633}
… …
1625 } elsif ($uni) { 1666 } elsif ($uni) {
1626 substr $text, $self->{cursor}++, 0, chr $uni; 1667 substr $text, $self->{cursor}++, 0, chr $uni;
1627 } 1668 }
1628 1669
1629 $self->_set_text ($text); 1670 $self->_set_text ($text);
1630 $self->update; 1671
1631 $self->check_size; 1672 $self->realloc;
1632} 1673}
1633 1674
1634sub focus_in { 1675sub focus_in {
1635 my ($self) = @_; 1676 my ($self) = @_;
1636 1677
… …
1763 1804
1764sub new { 1805sub new {
1765 my $class = shift; 1806 my $class = shift;
1766 1807
1767 $class->SUPER::new ( 1808 $class->SUPER::new (
1768 padding => 4, 1809 padding_x => 4,
1810 padding_y => 4,
1769 fg => [1, 1, 1], 1811 fg => [1, 1, 1],
1770 active_fg => [0, 0, 1], 1812 active_fg => [0, 0, 1],
1771 can_hover => 1, 1813 can_hover => 1,
1772 align => 0, 1814 align => 0,
1773 valign => 0, 1815 valign => 0,
… …
1820 1862
1821sub new { 1863sub new {
1822 my $class = shift; 1864 my $class = shift;
1823 1865
1824 $class->SUPER::new ( 1866 $class->SUPER::new (
1825 padding => 2, 1867 padding_x => 2,
1868 padding_y => 2,
1826 fg => [1, 1, 1], 1869 fg => [1, 1, 1],
1827 active_fg => [1, 1, 0], 1870 active_fg => [1, 1, 0],
1828 bg => [0, 0, 0, 0.2], 1871 bg => [0, 0, 0, 0.2],
1829 active_bg => [1, 1, 1, 0.5], 1872 active_bg => [1, 1, 1, 0.5],
1830 state => 0, 1873 state => 0,
… …
1834} 1877}
1835 1878
1836sub size_request { 1879sub size_request {
1837 my ($self) = @_; 1880 my ($self) = @_;
1838 1881
1839 ($self->{padding} * 2 + 6) x 2 1882 (6) x 2
1840} 1883}
1841 1884
1842sub button_down { 1885sub button_down {
1843 my ($self, $ev, $x, $y) = @_; 1886 my ($self, $ev, $x, $y) = @_;
1844 1887
1845 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1846 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1847 $self->{state} = !$self->{state}; 1890 $self->{state} = !$self->{state};
1848 $self->_emit (changed => $self->{state}); 1891 $self->_emit (changed => $self->{state});
1849 } 1892 }
1850} 1893}
1851 1894
1852sub _draw { 1895sub _draw {
1853 my ($self) = @_; 1896 my ($self) = @_;
1854 1897
1855 $self->SUPER::_draw; 1898 $self->SUPER::_draw;
1856 1899
1857 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1900 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1858 1901
1859 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1902 my ($w, $h) = @$self{qw(w h)};
1903
1904 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1860 1905
1861 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1862 1907
1863 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1908 my $tex = $self->{state} ? $tex[1] : $tex[0];
1864 1909
… …
2129 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
2130 active_fg => [0, 0, 0], 2175 active_fg => [0, 0, 0],
2131 bg => [0, 0, 0, 0.2], 2176 bg => [0, 0, 0, 0.2],
2132 active_bg => [1, 1, 1, 0.5], 2177 active_bg => [1, 1, 1, 0.5],
2133 range => [0, 0, 100, 10, 0], 2178 range => [0, 0, 100, 10, 0],
2134 req_w => $::WIDTH / 80, 2179 min_w => $::WIDTH / 80,
2135 req_h => $::WIDTH / 80, 2180 min_h => $::WIDTH / 80,
2136 vertical => 0, 2181 vertical => 0,
2137 can_hover => 1, 2182 can_hover => 1,
2138 inner_pad => 0.02, 2183 inner_pad => 0.02,
2139 @_ 2184 @_
2140 ); 2185 );
… …
2143 $self->update; 2188 $self->update;
2144 2189
2145 $self 2190 $self
2146} 2191}
2147 2192
2193sub changed { }
2194
2148sub set_range { 2195sub set_range {
2149 my ($self, $range) = @_; 2196 my ($self, $range) = @_;
2150 2197
2151 ($range, $self->{range}) = ($self->{range}, $range); 2198 ($range, $self->{range}) = ($self->{range}, $range);
2152 2199
… …
2178} 2225}
2179 2226
2180sub size_request { 2227sub size_request {
2181 my ($self) = @_; 2228 my ($self) = @_;
2182 2229
2183 my $w = $self->{req_w}; 2230 ($self->{req_w}, $self->{req_h})
2184 my $h = $self->{req_h};
2185
2186 $self->{vertical} ? ($h, $w) : ($w, $h)
2187} 2231}
2188 2232
2189sub button_down { 2233sub button_down {
2190 my ($self, $ev, $x, $y) = @_; 2234 my ($self, $ev, $x, $y) = @_;
2191 2235
… …
2542 2586
2543sub new { 2587sub new {
2544 my $class = shift; 2588 my $class = shift;
2545 2589
2546 my $self = $class->SUPER::new ( 2590 my $self = $class->SUPER::new (
2547 state => 0, 2591 state => 0,
2548 connect_activate => \&toggle_flopper, 2592 on_activate => \&toggle_flopper,
2549 @_ 2593 @_
2550 ); 2594 );
2551 2595
2552 if ($self->{state}) {
2553 $self->{state} = 0;
2554 $self->toggle_flopper;
2555 }
2556
2557 $self 2596 $self
2558} 2597}
2559 2598
2560sub toggle_flopper { 2599sub toggle_flopper {
2561 my ($self) = @_; 2600 my ($self) = @_;
2562 2601
2563 # TODO: use animation 2602 $self->{other}->toggle_visibility;
2564 if ($self->{state} = !$self->{state}) {
2565 $CFClient::UI::ROOT->add ($self->{other});
2566 $self->{other}->move ($self->coord2global (0, $self->{h}));
2567 $self->_emit ("open");
2568 } else {
2569 $CFClient::UI::ROOT->remove ($self->{other});
2570 $self->_emit ("close");
2571 }
2572
2573 $self->_emit (changed => $self->{state});
2574} 2603}
2575 2604
2576############################################################################# 2605#############################################################################
2577 2606
2578package CFClient::UI::Tooltip; 2607package CFClient::UI::Tooltip;
… …
2591} 2620}
2592 2621
2593sub set_tooltip_from { 2622sub set_tooltip_from {
2594 my ($self, $widget) = @_; 2623 my ($self, $widget) = @_;
2595 2624
2625 my $tooltip = $widget->{tooltip};
2626
2627 if ($ENV{CFPLUS_DEBUG} & 2) {
2628 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}";
2632 }
2633
2596 $self->add (new CFClient::UI::Label 2634 $self->add (new CFClient::UI::Label
2597 markup => $widget->{tooltip}, 2635 markup => $tooltip,
2598 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2599 fontsize => 0.8, 2637 fontsize => 0.8,
2600 fg => [0, 0, 0, 1], 2638 fg => [0, 0, 0, 1],
2601 ellipsise => 0, 2639 ellipsise => 0,
2602 font => ($widget->{tooltip_font} || $::FONT_PROP), 2640 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2613 2651
2614sub size_allocate { 2652sub size_allocate {
2615 my ($self, $w, $h) = @_; 2653 my ($self, $w, $h) = @_;
2616 2654
2617 $self->SUPER::size_allocate ($w - 4, $h - 4); 2655 $self->SUPER::size_allocate ($w - 4, $h - 4);
2656}
2657
2658sub visibility_change {
2659 my ($self, $visible) = @_;
2660
2661 return unless $visible;
2662
2663 $self->{root}->on_post_alloc ("move_$self" => sub {
2664 my $widget = $self->{owner}
2665 or return;
2666
2667 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2668
2669 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2670 if $x + $self->{w} > $::WIDTH;
2671
2672 $self->move_abs ($x, $y);
2673 });
2618} 2674}
2619 2675
2620sub _draw { 2676sub _draw {
2621 my ($self) = @_; 2677 my ($self) = @_;
2622 2678
… …
2639 glVertex $w, $h; 2695 glVertex $w, $h;
2640 glVertex $w, 0; 2696 glVertex $w, 0;
2641 glEnd; 2697 glEnd;
2642 2698
2643 glTranslate 2 - 0.375, 2 - 0.375; 2699 glTranslate 2 - 0.375, 2 - 0.375;
2700
2644 $self->SUPER::_draw; 2701 $self->SUPER::_draw;
2645} 2702}
2646 2703
2647############################################################################# 2704#############################################################################
2648 2705
… …
2764 2821
2765 $row++; 2822 $row++;
2766 } 2823 }
2767} 2824}
2768 2825
2769sub size_request {
2770 my ($self) = @_;
2771 ($self->{req_w}, $self->{req_h});
2772}
2773
2774############################################################################# 2826#############################################################################
2775 2827
2776package CFClient::UI::Menu; 2828package CFClient::UI::Menu;
2777 2829
2778our @ISA = CFClient::UI::FancyFrame::; 2830our @ISA = CFClient::UI::FancyFrame::;
… …
2818 # maybe save $GRAB? must be careful about events... 2870 # maybe save $GRAB? must be careful about events...
2819 $GRAB = $self; 2871 $GRAB = $self;
2820 $self->{button} = $ev->{button}; 2872 $self->{button} = $ev->{button};
2821 2873
2822 $self->show; 2874 $self->show;
2823 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2875 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2824} 2876}
2825 2877
2826sub mouse_motion { 2878sub mouse_motion {
2827 my ($self, $ev, $x, $y) = @_; 2879 my ($self, $ev, $x, $y) = @_;
2828 2880
… …
2962use CFClient::OpenGL; 3014use CFClient::OpenGL;
2963 3015
2964sub new { 3016sub new {
2965 my $class = shift; 3017 my $class = shift;
2966 3018
2967 $class->SUPER::new ( 3019 my $self = $class->SUPER::new (
3020 visible => 1,
2968 @_, 3021 @_,
2969 ) 3022 );
2970}
2971 3023
2972sub configure { 3024 Scalar::Util::weaken ($self->{root} = $self);
2973 my ($self, $x, $y, $w, $h) = @_;
2974 3025
2975 $self->{w} = $w; 3026 $self
2976 $self->{h} = $h;
2977}
2978
2979sub check_size {
2980 my ($self) = @_;
2981
2982 $self->size_allocate ($self->{w}, $self->{h})
2983 if $self->{w};
2984} 3027}
2985 3028
2986sub size_request { 3029sub size_request {
2987 my ($self) = @_; 3030 my ($self) = @_;
2988 3031
2989 ($self->{w}, $self->{h}) 3032 ($self->{w}, $self->{h})
3033}
3034
3035sub _to_pixel {
3036 my ($coord, $size, $max) = @_;
3037
3038 $coord =
3039 $coord eq "center" ? ($max - $size) * 0.5
3040 : $coord eq "max" ? $max
3041 : $coord;
3042
3043 $coord = 0 if $coord < 0;
3044 $coord = $max - $size if $coord > $max - $size;
3045
3046 int $coord + 0.5
2990} 3047}
2991 3048
2992sub size_allocate { 3049sub size_allocate {
2993 my ($self, $w, $h) = @_; 3050 my ($self, $w, $h) = @_;
2994 3051
2995 for my $child ($self->children) { 3052 for my $child ($self->children) {
2996 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3053 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2997 3054
2998 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3055 $X = $child->{force_x} if exists $child->{force_x};
2999 if exists $child->{req_x}; 3056 $Y = $child->{force_y} if exists $child->{force_y};
3000 3057
3001 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3058 $X = _to_pixel $X, $W, $self->{w};
3002 if exists $child->{req_y}; 3059 $Y = _to_pixel $Y, $H, $self->{h};
3003
3004 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3005 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3006 3060
3007 $child->configure ($X, $Y, $W, $H); 3061 $child->configure ($X, $Y, $W, $H);
3008 } 3062 }
3009} 3063}
3010 3064
… …
3021} 3075}
3022 3076
3023sub update { 3077sub update {
3024 my ($self) = @_; 3078 my ($self) = @_;
3025 3079
3026 $self->check_size;
3027 $::WANT_REFRESH++; 3080 $::WANT_REFRESH++;
3028} 3081}
3029 3082
3030sub add { 3083sub add {
3031 my ($self, @children) = @_; 3084 my ($self, @children) = @_;
3032 3085
3033 for (my @widgets = @children; my $w = pop @widgets; ) {
3034 push @widgets, $w->children;
3035 $w->{root} = $self;
3036 $w->{visible} = 1;
3037 }
3038
3039 for my $child (@children) {
3040 $child->{is_toplevel} = 1; 3086 $_->{is_toplevel} = 1
3041 3087 for @children;
3042 # integerise window positions
3043 $child->{x} = int $child->{x};
3044 $child->{y} = int $child->{y};
3045 }
3046 3088
3047 $self->SUPER::add (@children); 3089 $self->SUPER::add (@children);
3048} 3090}
3049 3091
3050sub remove { 3092sub remove {
3051 my ($self, @children) = @_; 3093 my ($self, @children) = @_;
3052 3094
3053 $self->SUPER::remove (@children); 3095 $self->SUPER::remove (@children);
3096
3097 delete $self->{is_toplevel}
3098 for @children;
3054 3099
3055 while (@children) { 3100 while (@children) {
3056 my $w = pop @children; 3101 my $w = pop @children;
3057 push @children, $w->children; 3102 push @children, $w->children;
3058 $w->set_invisible; 3103 $w->set_invisible;
… …
3077 while ($self->{refresh_hook}) { 3122 while ($self->{refresh_hook}) {
3078 $_->() 3123 $_->()
3079 for values %{delete $self->{refresh_hook}}; 3124 for values %{delete $self->{refresh_hook}};
3080 } 3125 }
3081 3126
3082 if ($self->{check_size}) { 3127 if ($self->{realloc}) {
3083 my @queue = ([], []); 3128 my @queue;
3084 3129
3085 for (;;) { 3130 while () {
3086 if ($self->{check_size}) { 3131 if ($self->{realloc}) {
3087 # heuristic: check containers last 3132 #TODO use array-of-depth approach
3088 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3133
3089 for values %{delete $self->{check_size}} 3134 use sort 'stable';
3135
3136 @queue = sort { $a->{visible} <=> $b->{visible} }
3137 @queue, values %{delete $self->{realloc}};
3090 } 3138 }
3091 3139
3092 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3140 my $widget = pop @queue || last;
3093 3141
3094 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3142 $widget->{visible} or last; # do not resize invisible widgets
3095 ? @$widget{qw(user_w user_h)} 3143
3096 : $widget->size_request; 3144 my ($w, $h) = $widget->size_request;
3097 3145
3146 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3147 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3148
3149 $w = $widget->{force_w} if exists $widget->{force_w};
3150 $h = $widget->{force_h} if exists $widget->{force_h};
3151
3152 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3098 if (delete $widget->{force_alloc} 3153 || delete $widget->{force_realloc}) {
3099 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3100 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3101
3102 $widget->{req_w} = $w; 3154 $widget->{req_w} = $w;
3103 $widget->{req_h} = $h; 3155 $widget->{req_h} = $h;
3104 3156
3105 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3157 $self->{size_alloc}{$widget+0} = $widget;
3106 3158
3107 $widget->{parent}->check_size
3108 if $widget->{parent}; 3159 if (my $parent = $widget->{parent}) {
3160 $self->{realloc}{$parent+0} = $parent;
3161 #unshift @queue, $parent;
3162 $parent->{force_size_alloc} = 1;
3163 $self->{size_alloc}{$parent+0} = $parent;
3164 }
3109 } 3165 }
3166
3167 delete $self->{realloc}{$widget+0};
3110 } 3168 }
3111 } 3169 }
3112 3170
3113 while ($self->{size_alloc}) { 3171 while (my $size_alloc = delete $self->{size_alloc}) {
3114 for (values %{delete $self->{size_alloc}}) { 3172 my @queue = sort { $b->{visible} <=> $a->{visible} }
3115 my ($widget, $w, $h) = @$_; 3173 values %$size_alloc;
3174
3175 while () {
3176 my $widget = pop @queue || last;
3177
3178 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3116 3179
3117 $w = 0 if $w < 0; 3180 $w = 0 if $w < 0;
3118 $h = 0 if $h < 0; 3181 $h = 0 if $h < 0;
3119 3182
3183 $w = int $w + 0.5;
3184 $h = int $h + 0.5;
3185
3186 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3120 $widget->{w} = $w; 3187 $widget->{w} = $w;
3121 $widget->{h} = $h; 3188 $widget->{h} = $h;
3189
3122 $widget->emit (size_allocate => $w, $h); 3190 $widget->emit (size_allocate => $w, $h);
3191 }
3123 } 3192 }
3124 } 3193 }
3125 3194
3126 while ($self->{post_alloc_hook}) { 3195 while ($self->{post_alloc_hook}) {
3127 $_->() 3196 $_->()
3128 for values %{delete $self->{post_alloc_hook}}; 3197 for values %{delete $self->{post_alloc_hook}};
3129 } 3198 }
3199
3130 3200
3131 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3201 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3132 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3202 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3133 glClear GL_COLOR_BUFFER_BIT; 3203 glClear GL_COLOR_BUFFER_BIT;
3134 3204
… …
3141 $self->_draw; 3211 $self->_draw;
3142} 3212}
3143 3213
3144############################################################################# 3214#############################################################################
3145 3215
3216package CFClient::UI::SpellList;
3217
3218our @ISA = CFClient::UI::FancyFrame::;
3219
3220sub new {
3221 my $class = shift;
3222
3223 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3224
3225 $self->add (new CFClient::UI::ScrolledWindow
3226 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3227
3228 $self;
3229}
3230
3231# XXX: Do sorting? Argl...
3232sub add_spell {
3233 my ($self, $spell) = @_;
3234 $self->{spells}->{$spell->{name}} = $spell;
3235
3236 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3237 face => $spell->{face},
3238 can_hover => 1,
3239 can_events => 1,
3240 tooltip => $spell->{message});
3241
3242 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3243 text => $spell->{name},
3244 can_hover => 1,
3245 can_events => 1,
3246 tooltip => $spell->{message},
3247 expand => 1);
3248
3249 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3250 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3251 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3252 expand => 1);
3253
3254 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3255 text => "bind to key",
3256 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3257}
3258
3259sub rebuild_spell_list {
3260 my ($self) = @_;
3261 $self->{tbl_idx} = 0;
3262 $self->add_spell ($_) for values %{$self->{spells}};
3263}
3264
3265sub remove_spell {
3266 my ($self, $spell) = @_;
3267 delete $self->{spells}->{$spell->{name}};
3268 $self->rebuild_spell_list;
3269}
3270
3271#############################################################################
3272
3273package CFClient::UI::BindEditor;
3274
3275our @ISA = CFClient::UI::FancyFrame::;
3276
3277sub new {
3278 my $class = shift;
3279
3280 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3281
3282 $self->add (my $vb = new CFClient::UI::VBox);
3283
3284
3285 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3286 text => "start recording",
3287 tooltip => "Start/Stops recording of actions."
3288 ."All subsequent actions after the recording started will be captured."
3289 ."The actions are displayed after the record was stopped."
3290 ."To bind the action you have to click on the 'Bind' button",
3291 on_activate => sub {
3292 unless ($self->{recording}) {
3293 $self->start;
3294 } else {
3295 $self->stop;
3296 }
3297 });
3298
3299 $vb->add (new CFClient::UI::Label text => "Actions:");
3300 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3301
3302 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3303 $vb->add (my $hb = new CFClient::UI::HBox);
3304 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3305 $hb->add (new CFClient::UI::Button
3306 text => "bind",
3307 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3308 on_activate => sub {
3309 $self->ask_for_bind;
3310 });
3311
3312 $vb->add (my $hb = new CFClient::UI::HBox);
3313 $hb->add (new CFClient::UI::Button
3314 text => "ok",
3315 expand => 1,
3316 tooltip => "This closes the binding editor and saves the binding",
3317 on_activate => sub {
3318 $self->hide;
3319 $self->commit;
3320 });
3321
3322 $hb->add (new CFClient::UI::Button
3323 text => "cancel",
3324 expand => 1,
3325 tooltip => "This closes the binding editor without saving",
3326 on_activate => sub {
3327 $self->hide;
3328 $self->{binding_cancel}->()
3329 if $self->{binding_cancel};
3330 });
3331
3332 $self->update_binding_widgets;
3333
3334 $self
3335}
3336
3337sub commit {
3338 my ($self) = @_;
3339 my ($mod, $sym, $cmds) = $self->get_binding;
3340 if ($sym != 0 && @$cmds > 0) {
3341 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3342 ."'. Don't forget 'Save Config'!");
3343 $self->{binding_change}->($mod, $sym, $cmds)
3344 if $self->{binding_change};
3345 } else {
3346 $::STATUSBOX->add ("No action bound, no key or action specified!");
3347 $self->{binding_cancel}->()
3348 if $self->{binding_cancel};
3349 }
3350}
3351
3352sub start {
3353 my ($self) = @_;
3354
3355 $self->{rec_btn}->set_text ("stop recording");
3356 $self->{recording} = 1;
3357 $self->clear_command_list;
3358 $::CONN->start_record if $::CONN;
3359}
3360
3361sub stop {
3362 my ($self) = @_;
3363
3364 $self->{rec_btn}->set_text ("start recording");
3365 $self->{recording} = 0;
3366
3367 my $rec;
3368 $rec = $::CONN->stop_record if $::CONN;
3369 return unless ref $rec eq 'ARRAY';
3370 $self->set_command_list ($rec);
3371}
3372
3373# if $commit is true, the binding will be set after the user entered a key combo
3374sub ask_for_bind {
3375 my ($self, $commit) = @_;
3376
3377 CFClient::Binder::open_binding_dialog (sub {
3378 my ($mod, $sym) = @_;
3379 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3380 $self->update_binding_widgets;
3381 $self->commit if $commit;
3382 });
3383}
3384
3385# $mod and $sym are the modifiers and key symbol
3386# $cmds is a array ref of strings (the commands)
3387# $cb is the callback that is executed on OK
3388# $ccb is the callback that is executed on CANCEL and
3389# when the binding was unsuccessful on OK
3390sub set_binding {
3391 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3392
3393 $self->clear_command_list;
3394 $self->{recording} = 0;
3395 $self->{rec_btn}->set_text ("start recording");
3396
3397 $self->{binding} = [$mod, $sym];
3398 $self->{commands} = $cmds;
3399
3400 $self->{binding_change} = $cb;
3401 $self->{binding_cancel} = $ccb;
3402
3403 $self->update_binding_widgets;
3404}
3405
3406# this is a shortcut method that asks for a binding
3407# and then just binds it.
3408sub do_quick_binding {
3409 my ($self, $cmds) = @_;
3410 $self->set_binding (undef, undef, $cmds, sub {
3411 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3412 });
3413 $self->ask_for_bind (1);
3414}
3415
3416sub update_binding_widgets {
3417 my ($self) = @_;
3418 my ($mod, $sym, $cmds) = $self->get_binding;
3419 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3420 $self->set_command_list ($cmds);
3421}
3422
3423sub get_binding {
3424 my ($self) = @_;
3425 return (
3426 $self->{binding}->[0],
3427 $self->{binding}->[1],
3428 [ grep { defined $_ } @{$self->{commands}} ]
3429 );
3430}
3431
3432sub clear_command_list {
3433 my ($self) = @_;
3434 $self->{cmdbox}->clear ();
3435}
3436
3437sub set_command_list {
3438 my ($self, $cmds) = @_;
3439
3440 $self->{cmdbox}->clear ();
3441 $self->{commands} = $cmds;
3442
3443 my $idx = 0;
3444
3445 for (@$cmds) {
3446 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3447
3448 my $i = $idx;
3449 $hb->add (new CFClient::UI::Label text => $_);
3450 $hb->add (new CFClient::UI::Button
3451 text => "delete",
3452 tooltip => "Deletes the action from the record",
3453 on_activate => sub {
3454 $self->{cmdbox}->remove ($hb);
3455 $cmds->[$i] = undef;
3456 });
3457
3458
3459 $idx++
3460 }
3461}
3462
3463#############################################################################
3464
3146package CFClient::UI; 3465package CFClient::UI;
3147 3466
3148$ROOT = new CFClient::UI::Root; 3467$ROOT = new CFClient::UI::Root;
3149$TOOLTIP = new CFClient::UI::Tooltip z => 900; 3468$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3150 3469

Diff Legend

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