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.238 by root, Thu May 25 21:48:22 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 (
… …
874 $self->{vp}->add ($self->{scrolled}); 948 $self->{vp}->add ($self->{scrolled});
875 $self->add ($self->{vp}); 949 $self->add ($self->{vp});
876 $self->add ($self->{slider}); 950 $self->add ($self->{slider});
877 951
878 $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]);
879} 963}
880 964
881sub size_allocate { 965sub size_allocate {
882 my ($self, $w, $h) = @_; 966 my ($self, $w, $h) = @_;
883 967
… …
936 1020
937our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
938 1022
939use CFClient::OpenGL; 1023use CFClient::OpenGL;
940 1024
941my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
942 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
943 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);
944 1032
945sub new { 1033sub new {
946 my $class = shift; 1034 my $class = shift;
947
948 # TODO: user_x, user_y, overwrite moveto?
949 1035
950 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
951 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
952 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
953 border => 0.6, 1039 border => 0.6,
954 is_toplevel => 1,
955 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
956 @_ 1043 @_
957 ); 1044 );
958 1045
959 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
960 align => 0, 1047 align => 0,
… …
1013 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
1014 1101
1015 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
1016 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
1017 1104
1018 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1019 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
1108 $self->realloc;
1020 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1021 $self->check_size;
1022 }; 1110 };
1023 1111
1024 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
1025 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1026 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1028 $self->{motion} = sub { 1116 $self->{motion} = sub {
1029 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
1030 1118
1031 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
1032 1120
1033 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1034 $self->update;
1035 }; 1122 };
1036 } 1123 }
1037} 1124}
1038 1125
1039sub button_up { 1126sub button_up {
… …
1058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1059 1146
1060 my $border = $self->border; 1147 my $border = $self->border;
1061 1148
1062 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
1063 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1064 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1065 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1066 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1067 1154
1068 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1069 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
1070 1157
1071 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
1072 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
1073 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
1074
1075 glColor @{ $self->{bg} };
1076
1077 $bg->{s} = $rep_x;
1078 $bg->{t} = $rep_y;
1079 $bg->{wrap_mode} = 1;
1080 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1081 } 1163 }
1082 1164
1083 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
1084 1166
… …
1114 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1115 1197
1116 $child->set_parent ($self); 1198 $child->set_parent ($self);
1117 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1118 1200
1119 $self->check_size (1); 1201 $self->realloc;
1120} 1202}
1121 1203
1122# 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?
1123sub clear { 1205sub clear {
1124 my ($self) = @_; 1206 my ($self) = @_;
… …
1129 for (@children) { 1211 for (@children) {
1130 delete $_->{parent}; 1212 delete $_->{parent};
1131 $_->hide; 1213 $_->hide;
1132 } 1214 }
1133 1215
1134 $self->check_size (1); 1216 $self->realloc;
1135 $self->update;
1136} 1217}
1137 1218
1138sub get_wh { 1219sub get_wh {
1139 my ($self) = @_; 1220 my ($self) = @_;
1140 1221
… …
1236 } 1317 }
1237} 1318}
1238 1319
1239############################################################################# 1320#############################################################################
1240 1321
1241package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1242
1243# TODO: wrap into common Box base class
1244 1323
1245our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1246 1325
1247sub size_request { 1326sub size_request {
1248 my ($self) = @_; 1327 my ($self) = @_;
1249 1328
1250 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1251 1330 ? (
1252 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1253 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1254 (List::Util::max map $_->[1], @alloc), 1333 )
1255 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1256} 1338}
1257 1339
1258sub size_allocate { 1340sub size_allocate {
1259 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1260 1342
1261 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1262
1263 my $children = $self->{children}; 1344 my $children = $self->{children};
1264 1345
1265 my @h = map $_->{req_w}, @$children; 1346 my @req;
1266 1347
1267 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1268 1349 @req = ($space / (@$children || 1)) x @$children;
1269 if ($req_h > $h) {
1270 # ah well, not enough space
1271 $_ *= $h / $req_h for @h;
1272 } 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 {
1273 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1274 $exp ||= 1;
1275 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1276 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1277 my $child = $children->[$_];
1278
1279 my $alloc_h = $h[$_];
1280 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1281 $h[$_] = $alloc_h;
1282 } 1364 }
1283 } 1365 }
1284 1366
1285 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1286 1368
1287 my $y = 0; 1369 my $pos = 0;
1288 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1289 my $child = $children->[$_];
1290 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1291 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1292 1373
1293 $y += $h; 1374 $pos += $alloc;
1294 } 1375 }
1295 1376
1296 1 1377 1
1297} 1378}
1298 1379
1299############################################################################# 1380#############################################################################
1300 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
1301package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1302 1398
1303# TODO: wrap into common Box base class
1304
1305our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1306 1400
1307sub size_request { 1401sub new {
1308 my ($self) = @_; 1402 my $class = shift;
1309 1403
1310 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1311 1405 vertical => 1,
1312 ( 1406 @_,
1313 (List::Util::max map $_->[0], @alloc),
1314 (List::Util::sum map $_->[1], @alloc),
1315 ) 1407 )
1316}
1317
1318sub size_allocate {
1319 my ($self, $w, $h) = @_;
1320
1321 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1322
1323 my $children = $self->{children};
1324
1325 my @h = map $_->{req_h}, @$children;
1326
1327 my $req_h = List::Util::sum @h;
1328
1329 if ($req_h > $h) {
1330 # ah well, not enough space
1331 $_ *= $h / $req_h for @h;
1332 } else {
1333 my $exp = List::Util::sum map $_->{expand}, @$children;
1334 $exp ||= 1;
1335
1336 for (0 .. $#$children) {
1337 my $child = $children->[$_];
1338
1339 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1340 }
1341 }
1342
1343 CFClient::UI::harmonize \@h;
1344
1345 my $y = 0;
1346 for (0 .. $#$children) {
1347 my $child = $children->[$_];
1348 my $h = $h[$_];
1349 $child->configure (0, $y, $w, $h);
1350
1351 $y += $h;
1352 }
1353
1354 1
1355} 1408}
1356 1409
1357############################################################################# 1410#############################################################################
1358 1411
1359package CFClient::UI::Label; 1412package CFClient::UI::Label;
… …
1376 ellipsise => 3, # end 1429 ellipsise => 3, # end
1377 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1378 fontsize => 1, 1431 fontsize => 1,
1379 align => -1, 1432 align => -1,
1380 valign => -1, 1433 valign => -1,
1381 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1382 can_events => 0, 1436 can_events => 0,
1383 %arg 1437 %arg
1384 ); 1438 );
1385 1439
1386 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1422 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1423 1477
1424 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1425 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1426 1480
1481 $self->realloc;
1427 $self->update; 1482 $self->update;
1428 $self->check_size;
1429} 1483}
1430 1484
1431sub set_markup { 1485sub set_markup {
1432 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1433 1487
… …
1437 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1438 1492
1439 $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;
1440 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1441 1495
1496 $self->realloc;
1442 $self->update; 1497 $self->update;
1443 $self->check_size;
1444} 1498}
1445 1499
1446sub size_request { 1500sub size_request {
1447 my ($self) = @_; 1501 my ($self) = @_;
1448 1502
… …
1462 1516
1463 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1464 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1465 } 1519 }
1466 1520
1467 ( 1521 ($w, $h)
1468 $w + $self->{padding} * 2,
1469 $h + $self->{padding} * 2,
1470 )
1471} 1522}
1472 1523
1473sub size_allocate { 1524sub size_allocate {
1474 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1475 1526
1476 delete $self->{texture}; 1527 delete $self->{texture}
1528 ;#d#
1477} 1529}
1478 1530
1479sub set_fontsize { 1531sub set_fontsize {
1480 my ($self, $fontsize) = @_; 1532 my ($self, $fontsize) = @_;
1481 1533
1482 $self->{fontsize} = $fontsize; 1534 $self->{fontsize} = $fontsize;
1483 delete $self->{texture}; 1535 delete $self->{texture};
1484 1536
1485 $self->update; 1537 $self->realloc;
1486 $self->check_size;
1487} 1538}
1488 1539
1489sub _draw { 1540sub _draw {
1490 my ($self) = @_; 1541 my ($self) = @_;
1491 1542
… …
1499 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1500 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1501 1552
1502 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1553 my $tex = new_from_layout CFClient::Texture $self->{layout};
1503 1554
1504 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1505 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1506 : ($self->{w} - $tex->{w}) * 0.5); 1557 : ($self->{w} - $tex->{w}) * 0.5);
1507 1558
1508 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1509 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1510 : ($self->{h} - $tex->{h}) * 0.5); 1561 : ($self->{h} - $tex->{h}) * 0.5);
1511 1562
1512 $tex 1563 $tex
1513 }; 1564 };
1514 1565
… …
1571sub set_text { 1622sub set_text {
1572 my ($self, $text) = @_; 1623 my ($self, $text) = @_;
1573 1624
1574 $self->{cursor} = length $text; 1625 $self->{cursor} = length $text;
1575 $self->_set_text ($text); 1626 $self->_set_text ($text);
1576 $self->update; 1627
1577 $self->check_size; 1628 $self->realloc;
1578} 1629}
1579 1630
1580sub get_text { 1631sub get_text {
1581 $_[0]{text} 1632 $_[0]{text}
1582} 1633}
… …
1615 } elsif ($uni) { 1666 } elsif ($uni) {
1616 substr $text, $self->{cursor}++, 0, chr $uni; 1667 substr $text, $self->{cursor}++, 0, chr $uni;
1617 } 1668 }
1618 1669
1619 $self->_set_text ($text); 1670 $self->_set_text ($text);
1620 $self->update; 1671
1621 $self->check_size; 1672 $self->realloc;
1622} 1673}
1623 1674
1624sub focus_in { 1675sub focus_in {
1625 my ($self) = @_; 1676 my ($self) = @_;
1626 1677
… …
1753 1804
1754sub new { 1805sub new {
1755 my $class = shift; 1806 my $class = shift;
1756 1807
1757 $class->SUPER::new ( 1808 $class->SUPER::new (
1758 padding => 4, 1809 padding_x => 4,
1810 padding_y => 4,
1759 fg => [1, 1, 1], 1811 fg => [1, 1, 1],
1760 active_fg => [0, 0, 1], 1812 active_fg => [0, 0, 1],
1761 can_hover => 1, 1813 can_hover => 1,
1762 align => 0, 1814 align => 0,
1763 valign => 0, 1815 valign => 0,
… …
1810 1862
1811sub new { 1863sub new {
1812 my $class = shift; 1864 my $class = shift;
1813 1865
1814 $class->SUPER::new ( 1866 $class->SUPER::new (
1815 padding => 2, 1867 padding_x => 2,
1868 padding_y => 2,
1816 fg => [1, 1, 1], 1869 fg => [1, 1, 1],
1817 active_fg => [1, 1, 0], 1870 active_fg => [1, 1, 0],
1818 bg => [0, 0, 0, 0.2], 1871 bg => [0, 0, 0, 0.2],
1819 active_bg => [1, 1, 1, 0.5], 1872 active_bg => [1, 1, 1, 0.5],
1820 state => 0, 1873 state => 0,
… …
1824} 1877}
1825 1878
1826sub size_request { 1879sub size_request {
1827 my ($self) = @_; 1880 my ($self) = @_;
1828 1881
1829 ($self->{padding} * 2 + 6) x 2 1882 (6) x 2
1830} 1883}
1831 1884
1832sub button_down { 1885sub button_down {
1833 my ($self, $ev, $x, $y) = @_; 1886 my ($self, $ev, $x, $y) = @_;
1834 1887
1835 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1836 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1837 $self->{state} = !$self->{state}; 1890 $self->{state} = !$self->{state};
1838 $self->_emit (changed => $self->{state}); 1891 $self->_emit (changed => $self->{state});
1839 } 1892 }
1840} 1893}
1841 1894
1842sub _draw { 1895sub _draw {
1843 my ($self) = @_; 1896 my ($self) = @_;
1844 1897
1845 $self->SUPER::_draw; 1898 $self->SUPER::_draw;
1846 1899
1847 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1900 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1848 1901
1849 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;
1850 1905
1851 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1852 1907
1853 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1908 my $tex = $self->{state} ? $tex[1] : $tex[0];
1854 1909
… …
2119 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
2120 active_fg => [0, 0, 0], 2175 active_fg => [0, 0, 0],
2121 bg => [0, 0, 0, 0.2], 2176 bg => [0, 0, 0, 0.2],
2122 active_bg => [1, 1, 1, 0.5], 2177 active_bg => [1, 1, 1, 0.5],
2123 range => [0, 0, 100, 10, 0], 2178 range => [0, 0, 100, 10, 0],
2124 req_w => $::WIDTH / 80, 2179 min_w => $::WIDTH / 80,
2125 req_h => $::WIDTH / 80, 2180 min_h => $::WIDTH / 80,
2126 vertical => 0, 2181 vertical => 0,
2127 can_hover => 1, 2182 can_hover => 1,
2128 inner_pad => 0.02, 2183 inner_pad => 0.02,
2129 @_ 2184 @_
2130 ); 2185 );
… …
2133 $self->update; 2188 $self->update;
2134 2189
2135 $self 2190 $self
2136} 2191}
2137 2192
2193sub changed { }
2194
2138sub set_range { 2195sub set_range {
2139 my ($self, $range) = @_; 2196 my ($self, $range) = @_;
2140 2197
2141 $self->{range} = $range; 2198 ($range, $self->{range}) = ($self->{range}, $range);
2142 2199
2143 $self->update; 2200 $self->update
2201 if "@$range" ne "@{$self->{range}}";
2144} 2202}
2145 2203
2146sub set_value { 2204sub set_value {
2147 my ($self, $value) = @_; 2205 my ($self, $value) = @_;
2148 2206
… …
2167} 2225}
2168 2226
2169sub size_request { 2227sub size_request {
2170 my ($self) = @_; 2228 my ($self) = @_;
2171 2229
2172 my $w = $self->{req_w}; 2230 ($self->{req_w}, $self->{req_h})
2173 my $h = $self->{req_h};
2174
2175 $self->{vertical} ? ($h, $w) : ($w, $h)
2176} 2231}
2177 2232
2178sub button_down { 2233sub button_down {
2179 my ($self, $ev, $x, $y) = @_; 2234 my ($self, $ev, $x, $y) = @_;
2180 2235
… …
2531 2586
2532sub new { 2587sub new {
2533 my $class = shift; 2588 my $class = shift;
2534 2589
2535 my $self = $class->SUPER::new ( 2590 my $self = $class->SUPER::new (
2536 state => 0, 2591 state => 0,
2537 connect_activate => \&toggle_flopper, 2592 on_activate => \&toggle_flopper,
2538 @_ 2593 @_
2539 ); 2594 );
2540 2595
2541 if ($self->{state}) {
2542 $self->{state} = 0;
2543 $self->toggle_flopper;
2544 }
2545
2546 $self 2596 $self
2547} 2597}
2548 2598
2549sub toggle_flopper { 2599sub toggle_flopper {
2550 my ($self) = @_; 2600 my ($self) = @_;
2551 2601
2552 # TODO: use animation 2602 $self->{other}->toggle_visibility;
2553 if ($self->{state} = !$self->{state}) {
2554 $CFClient::UI::ROOT->add ($self->{other});
2555 $self->{other}->move ($self->coord2global (0, $self->{h}));
2556 $self->_emit ("open");
2557 } else {
2558 $CFClient::UI::ROOT->remove ($self->{other});
2559 $self->_emit ("close");
2560 }
2561
2562 $self->_emit (changed => $self->{state});
2563} 2603}
2564 2604
2565############################################################################# 2605#############################################################################
2566 2606
2567package CFClient::UI::Tooltip; 2607package CFClient::UI::Tooltip;
… …
2580} 2620}
2581 2621
2582sub set_tooltip_from { 2622sub set_tooltip_from {
2583 my ($self, $widget) = @_; 2623 my ($self, $widget) = @_;
2584 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
2585 $self->add (new CFClient::UI::Label 2634 $self->add (new CFClient::UI::Label
2586 markup => $widget->{tooltip}, 2635 markup => $tooltip,
2587 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2588 fontsize => 0.8, 2637 fontsize => 0.8,
2589 fg => [0, 0, 0, 1], 2638 fg => [0, 0, 0, 1],
2590 ellipsise => 0, 2639 ellipsise => 0,
2591 font => ($widget->{tooltip_font} || $::FONT_PROP), 2640 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2602 2651
2603sub size_allocate { 2652sub size_allocate {
2604 my ($self, $w, $h) = @_; 2653 my ($self, $w, $h) = @_;
2605 2654
2606 $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 });
2607} 2674}
2608 2675
2609sub _draw { 2676sub _draw {
2610 my ($self) = @_; 2677 my ($self) = @_;
2611 2678
… …
2628 glVertex $w, $h; 2695 glVertex $w, $h;
2629 glVertex $w, 0; 2696 glVertex $w, 0;
2630 glEnd; 2697 glEnd;
2631 2698
2632 glTranslate 2 - 0.375, 2 - 0.375; 2699 glTranslate 2 - 0.375, 2 - 0.375;
2700
2633 $self->SUPER::_draw; 2701 $self->SUPER::_draw;
2634} 2702}
2635 2703
2636############################################################################# 2704#############################################################################
2637 2705
… …
2751 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2819 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2752 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2820 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2753 2821
2754 $row++; 2822 $row++;
2755 } 2823 }
2756
2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2758}
2759
2760sub size_request {
2761 my ($self) = @_;
2762 ($self->{req_w}, $self->{req_h});
2763} 2824}
2764 2825
2765############################################################################# 2826#############################################################################
2766 2827
2767package CFClient::UI::Menu; 2828package CFClient::UI::Menu;
… …
2809 # maybe save $GRAB? must be careful about events... 2870 # maybe save $GRAB? must be careful about events...
2810 $GRAB = $self; 2871 $GRAB = $self;
2811 $self->{button} = $ev->{button}; 2872 $self->{button} = $ev->{button};
2812 2873
2813 $self->show; 2874 $self->show;
2814 $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);
2815} 2876}
2816 2877
2817sub mouse_motion { 2878sub mouse_motion {
2818 my ($self, $ev, $x, $y) = @_; 2879 my ($self, $ev, $x, $y) = @_;
2819 2880
… …
2953use CFClient::OpenGL; 3014use CFClient::OpenGL;
2954 3015
2955sub new { 3016sub new {
2956 my $class = shift; 3017 my $class = shift;
2957 3018
2958 $class->SUPER::new ( 3019 my $self = $class->SUPER::new (
3020 visible => 1,
2959 @_, 3021 @_,
2960 ) 3022 );
2961}
2962 3023
2963sub configure { 3024 Scalar::Util::weaken ($self->{root} = $self);
2964 my ($self, $x, $y, $w, $h) = @_;
2965 3025
2966 $self->{w} = $w; 3026 $self
2967 $self->{h} = $h;
2968}
2969
2970sub check_size {
2971 my ($self) = @_;
2972
2973 $self->size_allocate ($self->{w}, $self->{h})
2974 if $self->{w};
2975} 3027}
2976 3028
2977sub size_request { 3029sub size_request {
2978 my ($self) = @_; 3030 my ($self) = @_;
2979 3031
2980 ($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
2981} 3047}
2982 3048
2983sub size_allocate { 3049sub size_allocate {
2984 my ($self, $w, $h) = @_; 3050 my ($self, $w, $h) = @_;
2985 3051
2986 for my $child ($self->children) { 3052 for my $child ($self->children) {
2987 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)};
2988 3054
2989 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3055 $X = $child->{force_x} if exists $child->{force_x};
2990 if exists $child->{req_x}; 3056 $Y = $child->{force_y} if exists $child->{force_y};
2991 3057
2992 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3058 $X = _to_pixel $X, $W, $self->{w};
2993 if exists $child->{req_y}; 3059 $Y = _to_pixel $Y, $H, $self->{h};
2994
2995 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2996 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2997 3060
2998 $child->configure ($X, $Y, $W, $H); 3061 $child->configure ($X, $Y, $W, $H);
2999 } 3062 }
3000} 3063}
3001 3064
… …
3012} 3075}
3013 3076
3014sub update { 3077sub update {
3015 my ($self) = @_; 3078 my ($self) = @_;
3016 3079
3017 $self->check_size;
3018 $::WANT_REFRESH++; 3080 $::WANT_REFRESH++;
3019} 3081}
3020 3082
3021sub add { 3083sub add {
3022 my ($self, @children) = @_; 3084 my ($self, @children) = @_;
3023 3085
3024 for (my @widgets = @children; my $w = pop @widgets; ) {
3025 push @widgets, $w->children;
3026 $w->{root} = $self;
3027 $w->{visible} = 1;
3028 }
3029
3030 for my $child (@children) {
3031 $child->{is_toplevel} = 1; 3086 $_->{is_toplevel} = 1
3032 3087 for @children;
3033 # integerise window positions
3034 $child->{x} = int $child->{x};
3035 $child->{y} = int $child->{y};
3036 }
3037 3088
3038 $self->SUPER::add (@children); 3089 $self->SUPER::add (@children);
3039} 3090}
3040 3091
3041sub remove { 3092sub remove {
3042 my ($self, @children) = @_; 3093 my ($self, @children) = @_;
3043 3094
3044 $self->SUPER::remove (@children); 3095 $self->SUPER::remove (@children);
3096
3097 delete $self->{is_toplevel}
3098 for @children;
3045 3099
3046 while (@children) { 3100 while (@children) {
3047 my $w = pop @children; 3101 my $w = pop @children;
3048 push @children, $w->children; 3102 push @children, $w->children;
3049 $w->set_invisible; 3103 $w->set_invisible;
… …
3068 while ($self->{refresh_hook}) { 3122 while ($self->{refresh_hook}) {
3069 $_->() 3123 $_->()
3070 for values %{delete $self->{refresh_hook}}; 3124 for values %{delete $self->{refresh_hook}};
3071 } 3125 }
3072 3126
3073 if ($self->{check_size}) { 3127 if ($self->{realloc}) {
3074 my @queue = ([], []); 3128 my @queue;
3075 3129
3076 for (;;) { 3130 while () {
3077 if ($self->{check_size}) { 3131 if ($self->{realloc}) {
3078 # heuristic: check containers last 3132 #TODO use array-of-depth approach
3079 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3133
3080 for values %{delete $self->{check_size}} 3134 use sort 'stable';
3135
3136 @queue = sort { $a->{visible} <=> $b->{visible} }
3137 @queue, values %{delete $self->{realloc}};
3081 } 3138 }
3082 3139
3083 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3140 my $widget = pop @queue || last;
3084 3141
3085 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3142 $widget->{visible} or last; # do not resize invisible widgets
3086 ? @$widget{qw(user_w user_h)} 3143
3087 : $widget->size_request; 3144 my ($w, $h) = $widget->size_request;
3088 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
3089 if (delete $widget->{force_alloc} 3153 || delete $widget->{force_realloc}) {
3090 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3091 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3092
3093 $widget->{req_w} = $w; 3154 $widget->{req_w} = $w;
3094 $widget->{req_h} = $h; 3155 $widget->{req_h} = $h;
3095 3156
3096 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3157 $self->{size_alloc}{$widget+0} = $widget;
3097 3158
3098 $widget->{parent}->check_size
3099 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 }
3100 } 3165 }
3166
3167 delete $self->{realloc}{$widget+0};
3101 } 3168 }
3102 } 3169 }
3103 3170
3104 while ($self->{size_alloc}) { 3171 while (my $size_alloc = delete $self->{size_alloc}) {
3105 for (values %{delete $self->{size_alloc}}) { 3172 my @queue = sort { $b->{visible} <=> $a->{visible} }
3106 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)};
3107 3179
3108 $w = 0 if $w < 0; 3180 $w = 0 if $w < 0;
3109 $h = 0 if $h < 0; 3181 $h = 0 if $h < 0;
3110 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}) {
3111 $widget->{w} = $w; 3187 $widget->{w} = $w;
3112 $widget->{h} = $h; 3188 $widget->{h} = $h;
3189
3113 $widget->emit (size_allocate => $w, $h); 3190 $widget->emit (size_allocate => $w, $h);
3191 }
3114 } 3192 }
3115 } 3193 }
3116 3194
3117 while ($self->{post_alloc_hook}) { 3195 while ($self->{post_alloc_hook}) {
3118 $_->() 3196 $_->()
3119 for values %{delete $self->{post_alloc_hook}}; 3197 for values %{delete $self->{post_alloc_hook}};
3120 } 3198 }
3199
3121 3200
3122 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3201 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3123 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3202 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3124 glClear GL_COLOR_BUFFER_BIT; 3203 glClear GL_COLOR_BUFFER_BIT;
3125 3204
… …
3132 $self->_draw; 3211 $self->_draw;
3133} 3212}
3134 3213
3135############################################################################# 3214#############################################################################
3136 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
3137package CFClient::UI; 3465package CFClient::UI;
3138 3466
3139$ROOT = new CFClient::UI::Root; 3467$ROOT = new CFClient::UI::Root;
3140$TOOLTIP = new CFClient::UI::Tooltip z => 900; 3468$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3141 3469

Diff Legend

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