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.258 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.296 by root, Wed Jun 7 05:48:53 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
70
71# class methods for events 73# class methods for events
72sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
73 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS; 76 if $FOCUS;
75} 77}
… …
87 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
88 90
89 $GRAB = $widget; 91 $GRAB = $widget;
90 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
91 93
92 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
93 } 95 }
94 96
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
96 98
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
112 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 116 $grab->update if $grab;
115 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
116 118
117 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
118 } 120 }
119} 121}
120 122
121sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
122 my ($ev) = @_; 124 my ($ev) = @_;
… …
128 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
129 131
130 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
131 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
132 134
133 check_tooltip; 135 $TOOLTIP_WATCHER->start;
134 } 136 }
135 137
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 139 if $HOVER;
138} 140}
… …
170sub rescale_widgets { 172sub rescale_widgets {
171 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
172 174
173 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 179
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 186
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 189
188 } 190 }
189 } 191 }
190 192
191 reconfigure_widgets; 193 reconfigure_widgets;
… …
219 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
220 } 222 }
221 } 223 }
222 224
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x}; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y}; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w}; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h}; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228 230
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231 233
232 $self->show if $layout->{show}; 234 $self->show if $layout->{show};
… …
276 delete $self->{visible}; 278 delete $self->{visible};
277 279
278 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
280 282
281 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
282 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
283 285
284 $self->focus_out; 286 $self->focus_out;
285 287
286 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
… …
313} 315}
314 316
315sub move_abs { 317sub move_abs {
316 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
317 319
318 $self->{x} = List::Util::max 0, int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
319 $self->{y} = List::Util::max 0, int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
320 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
321 323
322 $self->update; 324 $self->update;
323} 325}
324 326
… …
355 $self->{x} = $x; 357 $self->{x} = $x;
356 $self->{y} = $y; 358 $self->{y} = $y;
357 $self->update; 359 $self->update;
358 } 360 }
359 361
360 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible}; 363 return unless $self->{visible};
362 364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 368 $self->{root}{size_alloc}{$self+0} = $self;
364 } 369 }
365} 370}
366 371
367sub size_allocate { 372sub size_allocate {
368 # nothing to be done 373 # nothing to be done
369} 374}
370 375
371sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
372} 382}
373 383
374sub set_max_size { 384sub set_max_size {
375 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
376 386
377 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
378 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
379} 391}
380 392
381sub set_tooltip { 393sub set_tooltip {
382 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
383 395
… …
388 400
389 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
390 402
391 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
392 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
393 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
394 } 406 }
395} 407}
396 408
397# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
398sub coord2local { 410sub coord2local {
… …
435 447
436 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
437 unless $FOCUS; 449 unless $FOCUS;
438} 450}
439 451
440sub mouse_motion { } 452sub mouse_motion { 0 }
441sub button_up { } 453sub button_up { 0 }
442sub key_down { } 454sub key_down { 0 }
443sub key_up { } 455sub key_up { 0 }
444 456
445sub button_down { 457sub button_down {
446 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
447 459
448 $self->focus_in; 460 $self->focus_in;
449}
450 461
451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
455sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
456 464
457sub find_widget { 465sub find_widget {
458 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
459 467
460 return () unless $self->{can_events}; 468 return () unless $self->{can_events};
… …
498 506
499sub realloc { 507sub realloc {
500 my ($self) = @_; 508 my ($self) = @_;
501 509
502 if ($self->{visible}) { 510 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self}; 511 return if $self->{root}{realloc}{$self+0};
504 512
505 $self->{root}{realloc}{$self} = $self; 513 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update; 514 $self->{root}->update;
507 } else { 515 } else {
508 delete $self->{req_w}; 516 delete $self->{req_w};
517 delete $self->{req_h};
509 } 518 }
510} 519}
511 520
512sub update { 521sub update {
513 my ($self) = @_; 522 my ($self) = @_;
… …
521 530
522 $self->realloc; 531 $self->realloc;
523 $self->update; 532 $self->update;
524} 533}
525 534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
538
526sub draw { 539sub draw {
527 my ($self) = @_; 540 my ($self) = @_;
528 541
529 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
530 553
531 glPushMatrix; 554 glPushMatrix;
532 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
533 $self->_draw;
534 glPopMatrix;
535 556
536 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
537 my ($x, $y) = @$self{qw(x y)};
538
539 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
540 glEnable GL_BLEND; 559 glEnable GL_BLEND;
541 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
542 glBegin GL_QUADS; 561 glBegin GL_QUADS;
543 glVertex $x , $y; 562 glVertex 0 , 0;
544 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
545 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
546 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
547 glEnd; 566 glEnd;
548 glDisable GL_BLEND; 567 glDisable GL_BLEND;
549 } 568 }
550 569
551 if ($ENV{CFPLUS_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
552 glPushMatrix; 571 glPushMatrix;
553 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
555 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
556 glVertex 0 , 0; 575 glVertex 0 , 0;
557 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
558 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
559 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
560 glEnd; 579 glEnd;
561 glPopMatrix; 580 glPopMatrix;
562 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
563 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
564} 586}
565 587
566sub _draw { 588sub _draw {
567 my ($self) = @_; 589 my ($self) = @_;
568 590
… …
606 628
607 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
608 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
609 631
610 glEnable GL_BLEND; 632 glEnable GL_BLEND;
611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612 glColor @$color; 634 glColor_premultiply @$color;
613 635
614 glBegin GL_QUADS; 636 glBegin GL_QUADS;
615 glVertex 0 , 0; 637 glVertex 0 , 0;
616 glVertex 0 , $h; 638 glVertex 0 , $h;
617 glVertex $w, $h; 639 glVertex $w, $h;
… …
648our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
649 671
650sub new { 672sub new {
651 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
652 674
653 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
654 676
655 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
656 children => [], 678 children => [],
657 can_events => 0, 679 can_events => 0,
658 %arg, 680 %arg,
659 ); 681 );
682
660 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
661 685
662 $self 686 $self
663} 687}
664 688
665sub add { 689sub add {
… …
713 $x -= $self->{x}; 737 $x -= $self->{x};
714 $y -= $self->{y}; 738 $y -= $self->{y};
715 739
716 my $res; 740 my $res;
717 741
718 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
719 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
720 and return $res; 744 and return $res;
721 } 745 }
722 746
723 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
765sub size_request { 789sub size_request {
766 $_[0]{children}[0]->size_request 790 $_[0]{children}[0]->size_request
767} 791}
768 792
769sub size_allocate { 793sub size_allocate {
770 my ($self, $w, $h, $changed) = @_; 794 my ($self, $w, $h) = @_;
771 795
772 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
773} 797}
774 798
775############################################################################# 799#############################################################################
800
801# back-buffered drawing area
776 802
777package CFClient::UI::Window; 803package CFClient::UI::Window;
778 804
779our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
780 806
… …
792 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
793 $self->SUPER::update; 819 $self->SUPER::update;
794} 820}
795 821
796sub size_allocate { 822sub size_allocate {
797 my ($self, $w, $h, $changed) = @_; 823 my ($self, $w, $h) = @_;
798 824
799 $self->SUPER::size_allocate ($w, $h, $changed); 825 $self->SUPER::size_allocate ($w, $h);
800 $self->update 826 $self->update;
801 if $changed;
802} 827}
803 828
804sub _render { 829sub _render {
830 my ($self) = @_;
831
805 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
806} 833}
807 834
808sub render_child { 835sub render_child {
809 my ($self) = @_; 836 my ($self) = @_;
810 837
811 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
812 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
813 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
814 841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
815 $self->_render; 849 $self->_render;
816 }; 850 };
817} 851}
818 852
819sub _draw { 853sub _draw {
820 my ($self) = @_; 854 my ($self) = @_;
821 855
822 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
823 857
824 my $tex = $self->{texture} 858 my $tex = $self->{texture}
825 or return; 859 or return;
826 860
827 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
829 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
830 864
831 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
832 866
833 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
834} 868}
… …
850} 884}
851 885
852sub size_request { 886sub size_request {
853 my ($self) = @_; 887 my ($self) = @_;
854 888
855 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
856 890
857 $w = 10 if $self->{scroll_x}; 891 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y}; 892 $h = 10 if $self->{scroll_y};
859 893
860 ($w, $h) 894 ($w, $h)
861} 895}
862 896
863sub size_allocate { 897sub size_allocate {
864 my ($self, $w, $h, $changed) = @_; 898 my ($self, $w, $h) = @_;
865 899
900 my $child = $self->child;
901
866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
868 904
869 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
870 $self->update; 906 $self->update;
871} 907}
872 908
… …
908} 944}
909 945
910sub _render { 946sub _render {
911 my ($self) = @_; 947 my ($self) = @_;
912 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
913 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
914 953
915 $self->SUPER::_render; 954 $self->SUPER::_render;
916} 955}
917 956
… …
920package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
921 960
922our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
923 962
924sub new { 963sub new {
925 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
926 967
927 my $self; 968 my $self;
928 969
929 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
930 vertical => 1, 971 vertical => 1,
… …
935 ; 976 ;
936 977
937 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
938 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
939 slider => $slider, 980 slider => $slider,
940 @_, 981 %arg,
941 ); 982 );
942 983
943 $self->{vp}->add ($self->{scrolled});
944 $self->add ($self->{vp});
945 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
946 986
947 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
948} 994}
949 995
950sub update { 996sub update {
951 my ($self) = @_; 997 my ($self) = @_;
952 998
… …
956 my $child = $self->{vp}->child; 1002 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958} 1004}
959 1005
960sub size_allocate { 1006sub size_allocate {
961 my ($self, $w, $h, $changed) = @_; 1007 my ($self, $w, $h) = @_;
962 1008
963 $self->SUPER::size_allocate ($w, $h, $changed); 1009 $self->SUPER::size_allocate ($w, $h);
964 1010
965 my $child = $self->{vp}->child; 1011 my $child = $self->{vp}->child;
966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
967} 1013}
968 1014
… …
991 1037
992 if ($self->{bg}) { 1038 if ($self->{bg}) {
993 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
994 1040
995 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
996 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
997 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
998 1044
999 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
1000 glVertex 0 , 0; 1046 glVertex 0 , 0;
1001 glVertex 0 , $h; 1047 glVertex 0 , $h;
1002 glVertex $w, $h; 1048 glVertex $w, $h;
… …
1024my @border = 1070my @border =
1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1026 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027 1073
1028sub new { 1074sub new {
1029 my $class = shift; 1075 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1030 1078
1031 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
1032 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
1033 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
1034 border => 0.6, 1082 border => 0.6,
1035 can_events => 1, 1083 can_events => 1,
1036 min_w => 16, 1084 min_w => 16,
1037 min_h => 16, 1085 min_h => 16,
1038 @_ 1086 %arg,
1039 ); 1087 );
1040 1088
1041 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
1042 align => 0, 1090 align => 0,
1043 valign => 1, 1091 valign => 1,
1044 text => $self->{title}, 1092 text => $title,
1045 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1046 1095
1047 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1048} 1104}
1049 1105
1050sub border { 1106sub border {
1051 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1052} 1108}
1053 1109
1054sub size_request { 1110sub size_request {
1055 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1056 1115
1057 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1058 1117
1059 ( 1118 (
1060 $w + $self->border * 2, 1119 $w + $self->border * 2,
1061 $h + $self->border * 2, 1120 $h + $self->border * 2,
1062 ) 1121 )
1063} 1122}
1064 1123
1065sub size_allocate { 1124sub size_allocate {
1066 my ($self, $w, $h, $changed) = @_; 1125 my ($self, $w, $h) = @_;
1067 1126
1068 return unless $changed; 1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1069 1132
1133 my $border = $self->border;
1134
1070 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1071 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1072 1137
1073 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1074 if $self->{title};
1075
1076 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1077} 1139}
1078 1140
1079sub button_down { 1141sub button_down {
1080 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1081 1143
… …
1100 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1101 1163
1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1105 $self->realloc; 1168 $self->realloc;
1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1107 }; 1169 };
1108 1170
1109 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1110 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1111 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1114 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1115 1177
1116 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1117 1179
1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1119 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1120 } 1188 1
1121} 1189}
1122 1190
1123sub button_up { 1191sub button_up {
1124 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1125 1193
1126 delete $self->{motion}; 1194 !!delete $self->{motion}
1127} 1195}
1128 1196
1129sub mouse_motion { 1197sub mouse_motion {
1130 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1131 1199
1132 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1133} 1203}
1134 1204
1135sub _draw { 1205sub _draw {
1136 my ($self) = @_; 1206 my ($self) = @_;
1137 1207
1208 my $child = $self->{children}[0];
1209
1138 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1139 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1140 1212
1141 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1143 1215
1144 my $border = $self->border; 1216 my $border = $self->border;
… …
1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160 } 1232 }
1161 1233
1162 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1163 1235
1164 $self->{title}->draw if $self->{title};
1165
1166 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1167} 1242}
1168 1243
1169############################################################################# 1244#############################################################################
1170 1245
1171package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1245 (sum @$hs), 1320 (sum @$hs),
1246 ) 1321 )
1247} 1322}
1248 1323
1249sub size_allocate { 1324sub size_allocate {
1250 my ($self, $w, $h, $changed) = @_; 1325 my ($self, $w, $h) = @_;
1251 1326
1252 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1253 1328
1254 my $req_w = (sum @$ws) || 1; 1329 my $req_w = (sum @$ws) || 1;
1255 my $req_h = (sum @$hs) || 1; 1330 my $req_h = (sum @$hs) || 1;
… …
1333 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1334 ) 1409 )
1335} 1410}
1336 1411
1337sub size_allocate { 1412sub size_allocate {
1338 my ($self, $w, $h, $changed) = @_; 1413 my ($self, $w, $h) = @_;
1339 1414
1340 my $space = $self->{vertical} ? $h : $w; 1415 my $space = $self->{vertical} ? $h : $w;
1341 my $children = $self->{children}; 1416 my $children = $self->{children};
1342 1417
1343 my @req; 1418 my @req;
… …
1464 1539
1465 delete $self->{texture}; 1540 delete $self->{texture};
1466 $self->SUPER::update; 1541 $self->SUPER::update;
1467} 1542}
1468 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1469sub set_text { 1551sub set_text {
1470 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1471 1553
1472 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1473 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1474 1556
1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1476 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1477 1559
1560 delete $self->{size_req};
1478 $self->realloc; 1561 $self->realloc;
1479 $self->update; 1562 $self->update;
1480} 1563}
1481 1564
1482sub set_markup { 1565sub set_markup {
… …
1488 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1489 1572
1490 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1491 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1492 1575
1576 delete $self->{size_req};
1493 $self->realloc; 1577 $self->realloc;
1494 $self->update; 1578 $self->update;
1495} 1579}
1496 1580
1497sub size_request { 1581sub size_request {
1498 my ($self) = @_; 1582 my ($self) = @_;
1499 1583
1584 $self->{size_req} ||= do {
1500 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1501 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1502 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1503 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1590
1506 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1507 1592
1508 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1509 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1510 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1511 1596
1512 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1513 1598
1514 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1515 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1516 } 1604 };
1517 1605
1518 ($w, $h) 1606 @{ $self->{size_req} }
1519} 1607}
1520 1608
1521sub size_allocate { 1609sub size_allocate {
1522 my ($self, $w, $h, $changed) = @_; 1610 my ($self, $w, $h) = @_;
1611
1612 delete $self->{ox};
1523 1613
1524 delete $self->{texture} 1614 delete $self->{texture}
1525 if $changed; 1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1526} 1616}
1527 1617
1528sub set_fontsize { 1618sub set_fontsize {
1529 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1530 1620
1531 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1532 delete $self->{texture}; 1622 delete $self->{texture};
1533 1623
1534 $self->realloc; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1535} 1633}
1536 1634
1537sub _draw { 1635sub _draw {
1538 my ($self) = @_; 1636 my ($self) = @_;
1539 1637
… …
1545 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1546 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549 1647
1550 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1551 1650
1651 unless (exists $self->{ox}) {
1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1554 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1555 1655
1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1558 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1559
1560 $tex
1561 }; 1659 };
1562 1660
1563 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1565 1665
1566 if ($tex->{format} == GL_ALPHA) { 1666 if ($tex->{format} == GL_ALPHA) {
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1567 glColor @{$self->{fg}}; 1668 glColor @{$self->{fg}};
1568 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1569 } else { 1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1570 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1571 } 1673 }
1572 1674
1573 glDisable GL_TEXTURE_2D; 1675 glDisable GL_TEXTURE_2D;
1574} 1676}
1575 1677
… …
1592 can_hover => 1, 1694 can_hover => 1,
1593 can_focus => 1, 1695 can_focus => 1,
1594 valign => 0, 1696 valign => 0,
1595 can_events => 1, 1697 can_events => 1,
1596 #text => ... 1698 #text => ...
1699 #hidden => "*",
1597 @_ 1700 @_
1598 ) 1701 )
1599} 1702}
1600 1703
1601sub _set_text { 1704sub _set_text {
… …
1603 1706
1604 delete $self->{cur_h}; 1707 delete $self->{cur_h};
1605 1708
1606 return if $self->{text} eq $text; 1709 return if $self->{text} eq $text;
1607 1710
1608 delete $self->{texture};
1609
1610 $self->{last_activity} = $::NOW; 1711 $self->{last_activity} = $::NOW;
1611 $self->{text} = $text; 1712 $self->{text} = $text;
1612 1713
1613 $text =~ s/./*/g if $self->{hidden}; 1714 $text =~ s/./*/g if $self->{hidden};
1614 $self->{layout}->set_text ("$text "); 1715 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req};
1615 1717
1616 $self->_emit (changed => $self->{text}); 1718 $self->_emit (changed => $self->{text});
1719
1720 $self->realloc;
1721 $self->update;
1617} 1722}
1618 1723
1619sub set_text { 1724sub set_text {
1620 my ($self, $text) = @_; 1725 my ($self, $text) = @_;
1621 1726
1622 $self->{cursor} = length $text; 1727 $self->{cursor} = length $text;
1623 $self->_set_text ($text); 1728 $self->_set_text ($text);
1624
1625 $self->realloc;
1626} 1729}
1627 1730
1628sub get_text { 1731sub get_text {
1629 $_[0]{text} 1732 $_[0]{text}
1630} 1733}
… …
1660 $self->{cursor} = length $text; 1763 $self->{cursor} = length $text;
1661 } elsif ($uni == 27) { 1764 } elsif ($uni == 27) {
1662 $self->_emit ('escape'); 1765 $self->_emit ('escape');
1663 } elsif ($uni) { 1766 } elsif ($uni) {
1664 substr $text, $self->{cursor}++, 0, chr $uni; 1767 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else {
1769 return 0;
1665 } 1770 }
1666 1771
1667 $self->_set_text ($text); 1772 $self->_set_text ($text);
1668 1773
1669 $self->realloc; 1774 $self->realloc;
1775
1776 1
1670} 1777}
1671 1778
1672sub focus_in { 1779sub focus_in {
1673 my ($self) = @_; 1780 my ($self) = @_;
1674 1781
… …
1689 utf8::encode $text; 1796 utf8::encode $text;
1690 $self->{cursor} = length substr $text, 0, $idx; 1797 $self->{cursor} = length substr $text, 0, $idx;
1691 1798
1692 $self->_set_text ($self->{text}); 1799 $self->_set_text ($self->{text});
1693 $self->update; 1800 $self->update;
1801
1802 1
1694} 1803}
1695 1804
1696sub mouse_motion { 1805sub mouse_motion {
1697 my ($self, $ev, $x, $y) = @_; 1806 my ($self, $ev, $x, $y) = @_;
1698# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1807# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808
1809 0
1699} 1810}
1700 1811
1701sub _draw { 1812sub _draw {
1702 my ($self) = @_; 1813 my ($self) = @_;
1703 1814
1704 local $self->{fg} = $self->{fg}; 1815 local $self->{fg} = $self->{fg};
1705 1816
1706 if ($FOCUS == $self) { 1817 if ($FOCUS == $self) {
1707 glColor @{$self->{active_bg}}; 1818 glColor_premultiply @{$self->{active_bg}};
1708 $self->{fg} = $self->{active_fg}; 1819 $self->{fg} = $self->{active_fg};
1709 } else { 1820 } else {
1710 glColor @{$self->{bg}}; 1821 glColor_premultiply @{$self->{bg}};
1711 } 1822 }
1712 1823
1713 glEnable GL_BLEND; 1824 glEnable GL_BLEND;
1714 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1825 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1715 glBegin GL_QUADS; 1826 glBegin GL_QUADS;
1716 glVertex 0 , 0; 1827 glVertex 0 , 0;
1717 glVertex 0 , $self->{h}; 1828 glVertex 0 , $self->{h};
1718 glVertex $self->{w}, $self->{h}; 1829 glVertex $self->{w}, $self->{h};
1719 glVertex $self->{w}, 0; 1830 glVertex $self->{w}, 0;
… …
1780 } else { 1891 } else {
1781 $self->set_text ($self->{history_saveback}); 1892 $self->set_text ($self->{history_saveback});
1782 } 1893 }
1783 1894
1784 } else { 1895 } else {
1785 $self->SUPER::key_down ($ev); 1896 return $self->SUPER::key_down ($ev)
1897 }
1898
1786 } 1899 1
1787
1788} 1900}
1789 1901
1790############################################################################# 1902#############################################################################
1791 1903
1792package CFClient::UI::Button; 1904package CFClient::UI::Button;
… …
1821 my ($self, $ev, $x, $y) = @_; 1933 my ($self, $ev, $x, $y) = @_;
1822 1934
1823 $self->emit ("activate") 1935 $self->emit ("activate")
1824 if $x >= 0 && $x < $self->{w} 1936 if $x >= 0 && $x < $self->{w}
1825 && $y >= 0 && $y < $self->{h}; 1937 && $y >= 0 && $y < $self->{h};
1938
1939 1
1826} 1940}
1827 1941
1828sub _draw { 1942sub _draw {
1829 my ($self) = @_; 1943 my ($self) = @_;
1830 1944
1831 local $self->{fg} = $self->{fg}; 1945 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1832
1833 if ($GRAB == $self) {
1834 $self->{fg} = $self->{active_fg};
1835 }
1836 1946
1837 glEnable GL_TEXTURE_2D; 1947 glEnable GL_TEXTURE_2D;
1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839 glColor 0, 0, 0, 1; 1949 glColor 0, 0, 0, 1;
1840 1950
… …
1884 1994
1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887 $self->{state} = !$self->{state}; 1997 $self->{state} = !$self->{state};
1888 $self->_emit (changed => $self->{state}); 1998 $self->_emit (changed => $self->{state});
1999 } else {
2000 return 0
2001 }
2002
1889 } 2003 1
1890} 2004}
1891 2005
1892sub _draw { 2006sub _draw {
1893 my ($self) = @_; 2007 my ($self) = @_;
1894 2008
… …
2061 2175
2062 my $h1 = $self->{h} * (1 - $ycut1); 2176 my $h1 = $self->{h} * (1 - $ycut1);
2063 my $h2 = $self->{h} * (1 - $ycut2); 2177 my $h2 = $self->{h} * (1 - $ycut2);
2064 2178
2065 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
2066 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2180 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2067 glEnable GL_TEXTURE_2D; 2182 glEnable GL_TEXTURE_2D;
2068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2183 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2069 2184
2070 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2185 glBindTexture GL_TEXTURE_2D, $t1->{name};
2071 glBegin GL_QUADS; 2186 glBegin GL_QUADS;
… …
2192sub set_range { 2307sub set_range {
2193 my ($self, $range) = @_; 2308 my ($self, $range) = @_;
2194 2309
2195 ($range, $self->{range}) = ($self->{range}, $range); 2310 ($range, $self->{range}) = ($self->{range}, $range);
2196 2311
2197 $self->update
2198 if "@$range" ne "@{$self->{range}}"; 2312 if ("@$range" ne "@{$self->{range}}") {
2313 $self->update;
2314 $self->set_value ($self->{range}[0]);
2315 }
2199} 2316}
2200 2317
2201sub set_value { 2318sub set_value {
2202 my ($self, $value) = @_; 2319 my ($self, $value) = @_;
2203 2320
… …
2232 2349
2233 $self->SUPER::button_down ($ev, $x, $y); 2350 $self->SUPER::button_down ($ev, $x, $y);
2234 2351
2235 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2352 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236 2353
2237 $self->mouse_motion ($ev, $x, $y); 2354 $self->mouse_motion ($ev, $x, $y)
2238} 2355}
2239 2356
2240sub mouse_motion { 2357sub mouse_motion {
2241 my ($self, $ev, $x, $y) = @_; 2358 my ($self, $ev, $x, $y) = @_;
2242 2359
… …
2246 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2363 my (undef, $lo, $hi, $page) = @{$self->{range}};
2247 2364
2248 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2365 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249 2366
2250 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2367 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2368 } else {
2369 return 0;
2370 }
2371
2251 } 2372 1
2252} 2373}
2253 2374
2254sub update { 2375sub update {
2255 my ($self) = @_; 2376 my ($self) = @_;
2256 2377
2257 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2378 delete $self->{knob_w};
2379 $self->SUPER::update;
2380}
2381
2382sub _draw {
2383 my ($self) = @_;
2384
2385 unless ($self->{knob_w}) {
2258 $self->set_value ($self->{range}[0]); 2386 $self->set_value ($self->{range}[0]);
2259 2387
2260 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2388 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100; 2389 my $range = ($hi - $page - $lo) || 1e-100;
2262 2390
… …
2268 $value = ($value - $lo) / $range; 2396 $value = ($value - $lo) / $range;
2269 $value = $value * $self->{scale} + $self->{offset}; 2397 $value = $value * $self->{scale} + $self->{offset};
2270 2398
2271 $self->{knob_x} = $value - $knob_w * 0.5; 2399 $self->{knob_x} = $value - $knob_w * 0.5;
2272 $self->{knob_w} = $knob_w; 2400 $self->{knob_w} = $knob_w;
2273 }); 2401 }
2274
2275 $self->SUPER::update;
2276}
2277
2278sub _draw {
2279 my ($self) = @_;
2280 2402
2281 $self->SUPER::_draw (); 2403 $self->SUPER::_draw ();
2282 2404
2283 glScale $self->{w}, $self->{h}; 2405 glScale $self->{w}, $self->{h};
2284 2406
… …
2357 my $class = shift; 2479 my $class = shift;
2358 2480
2359 my $self = $class->SUPER::new ( 2481 my $self = $class->SUPER::new (
2360 fontsize => 1, 2482 fontsize => 1,
2361 can_events => 0, 2483 can_events => 0,
2484 indent => 0,
2362 #font => default_font 2485 #font => default_font
2363 @_, 2486 @_,
2364 2487
2365 layout => (new CFClient::Layout 1), 2488 layout => (new CFClient::Layout 1),
2366 par => [], 2489 par => [],
… …
2382 $self->{fontsize} = $fontsize; 2505 $self->{fontsize} = $fontsize;
2383 $self->reflow; 2506 $self->reflow;
2384} 2507}
2385 2508
2386sub size_allocate { 2509sub size_allocate {
2387 my ($self, $w, $h, $changed) = @_; 2510 my ($self, $w, $h) = @_;
2388 2511
2389 $self->SUPER::size_allocate ($w, $h, $changed); 2512 $self->SUPER::size_allocate ($w, $h);
2390
2391 return unless $changed;
2392 2513
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2514 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2516 $self->{layout}->set_width ($self->{children}[0]{w});
2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 2518
2397 $self->reflow; 2519 $self->reflow;
2398} 2520}
2399 2521
2400sub text_size { 2522sub text_size {
… …
2402 2524
2403 my $layout = $self->{layout}; 2525 my $layout = $self->{layout};
2404 2526
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 2528 $layout->set_width ($self->{children}[0]{w} - $indent);
2529 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 2530 $layout->set_markup ($text);
2408 2531
2409 $layout->size 2532 $layout->size
2410} 2533}
2411 2534
… …
2450 2573
2451 return unless $self->{h} > 0; 2574 return unless $self->{h} > 0;
2452 2575
2453 delete $self->{texture}; 2576 delete $self->{texture};
2454 2577
2455 $ROOT->on_post_alloc ($self, sub { 2578 $ROOT->on_post_alloc ($self => sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 2580
2458 if (delete $self->{need_reflow}) { 2581 if (delete $self->{need_reflow}) {
2459 my $height = 0; 2582 my $height = 0;
2460 2583
… …
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464 2587
2465 for (@{$self->{par}}) { 2588 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]); 2590 $layout->set_width ($W - $_->[3]);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2468 $layout->set_markup ($_->[4]); 2592 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size; 2593 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3]; 2594 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h; 2595 $_->[1] = $h;
2472 } 2596 }
… …
2475 } 2599 }
2476 2600
2477 $self->{height} = $height; 2601 $self->{height} = $height;
2478 2602
2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2480 2604
2481 delete $self->{texture}; 2605 delete $self->{texture};
2482 } 2606 }
2483 2607
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 2609 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 2610 glClear GL_COLOR_BUFFER_BIT;
2487 2611
2488 my $top = int $self->{children}[1]{range}[0]; 2612 my $top = int $self->{children}[1]{range}[0];
2489 2613
2490 my $y0 = $top; 2614 my $y0 = $top;
… …
2504 my $h = $par->[1]; 2628 my $h = $par->[1];
2505 2629
2506 if ($y0 < $y + $h && $y < $y1) { 2630 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] }); 2631 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]); 2632 $layout->set_width ($W - $par->[3]);
2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2509 $layout->set_markup ($par->[4]); 2634 $layout->set_markup ($par->[4]);
2510 2635
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2636 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2512 2637
2513 glRasterPos $par->[3], $y - $y0; 2638 glRasterPos $par->[3], $y - $y0;
… …
2525sub _draw { 2650sub _draw {
2526 my ($self) = @_; 2651 my ($self) = @_;
2527 2652
2528 glEnable GL_TEXTURE_2D; 2653 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 2655 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2656 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 2657 glDisable GL_TEXTURE_2D;
2533 2658
2534 $self->{children}[1]->draw; 2659 $self->{children}[1]->draw;
2535 2660
2536} 2661}
… …
2619} 2744}
2620 2745
2621sub set_tooltip_from { 2746sub set_tooltip_from {
2622 my ($self, $widget) = @_; 2747 my ($self, $widget) = @_;
2623 2748
2749 my $tooltip = $widget->{tooltip};
2750
2751 if ($ENV{CFPLUS_DEBUG} & 2) {
2752 $tooltip .= "\n\n" . (ref $widget) . "\n"
2753 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2754 . "req $widget->{req_w} $widget->{req_h}\n"
2755 . "visible $widget->{visible}";
2756 }
2757
2624 $self->add (new CFClient::UI::Label 2758 $self->add (new CFClient::UI::Label
2625 markup => $widget->{tooltip}, 2759 markup => $tooltip,
2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2760 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8, 2761 fontsize => 0.8,
2628 fg => [0, 0, 0, 1], 2762 fg => [0, 0, 0, 1],
2629 ellipsise => 0, 2763 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP), 2764 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2638 2772
2639 ($w + 4, $h + 4) 2773 ($w + 4, $h + 4)
2640} 2774}
2641 2775
2642sub size_allocate { 2776sub size_allocate {
2643 my ($self, $w, $h, $changed) = @_; 2777 my ($self, $w, $h) = @_;
2644 2778
2645 return unless $changed;
2646
2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2779 $self->SUPER::size_allocate ($w - 4, $h - 4);
2648} 2780}
2649 2781
2650sub visibility_change { 2782sub visibility_change {
2651 my ($self, $visible) = @_; 2783 my ($self, $visible) = @_;
2652 2784
… …
2657 or return; 2789 or return;
2658 2790
2659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2791 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660 2792
2661 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2793 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662 if $x + $self->{w} > $::WIDTH; 2794 if $x + $self->{w} > $self->{root}{w};
2663 2795
2664 $self->move_abs ($x, $y); 2796 $self->move_abs ($x, $y);
2665 }); 2797 });
2666} 2798}
2667 2799
… …
2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2888 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2757 2889
2758 if ($tex) { 2890 if ($tex) {
2759 glEnable GL_TEXTURE_2D; 2891 glEnable GL_TEXTURE_2D;
2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2892 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2761 glColor 1, 1, 1, 1; 2893 glColor 0, 0, 0, 1;
2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2894 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2763 glDisable GL_TEXTURE_2D; 2895 glDisable GL_TEXTURE_2D;
2764 } 2896 }
2765} 2897}
2766 2898
… …
2773 $self->SUPER::DESTROY; 2905 $self->SUPER::DESTROY;
2774} 2906}
2775 2907
2776############################################################################# 2908#############################################################################
2777 2909
2778package CFClient::UI::Inventory; 2910package CFClient::UI::Buttonbar;
2779 2911
2780our @ISA = CFClient::UI::ScrolledWindow::; 2912our @ISA = CFClient::UI::HBox::;
2781 2913
2782sub new { 2914# TODO: should actualyl wrap buttons and other goodies.
2783 my $class = shift;
2784
2785 my $self = $class->SUPER::new (
2786 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2787 @_,
2788 );
2789
2790 $self
2791}
2792
2793sub set_items {
2794 my ($self, $items) = @_;
2795
2796 $self->{scrolled}->clear;
2797 return unless $items;
2798
2799 my @items = sort {
2800 ($a->{type} <=> $b->{type})
2801 or ($a->{name} cmp $b->{name})
2802 } @$items;
2803
2804 $self->{real_items} = \@items;
2805
2806 my $row = 0;
2807 for my $item (@items) {
2808 CFClient::Item::update_widgets $item;
2809
2810 $self->{scrolled}->add (0, $row, $item->{face_widget});
2811 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2812 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2813
2814 $row++;
2815 }
2816}
2817 2915
2818############################################################################# 2916#############################################################################
2819 2917
2820package CFClient::UI::Menu; 2918package CFClient::UI::Menu;
2821 2919
… …
2833 ); 2931 );
2834 2932
2835 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2933 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2836 2934
2837 for my $item (@{ $self->{items} }) { 2935 for my $item (@{ $self->{items} }) {
2838 my ($widget, $cb) = @$item; 2936 my ($widget, $cb, $tooltip) = @$item;
2839 2937
2840 # handle various types of items, only text for now 2938 # handle various types of items, only text for now
2841 if (!ref $widget) { 2939 if (!ref $widget) {
2842 $widget = new CFClient::UI::Label 2940 $widget = new CFClient::UI::Label
2843 can_hover => 1, 2941 can_hover => 1,
2844 can_events => 1, 2942 can_events => 1,
2845 text => $widget; 2943 text => $widget,
2944 tooltip => $tooltip
2846 } 2945 }
2847 2946
2848 $self->{item}{$widget} = $item; 2947 $self->{item}{$widget} = $item;
2849 2948
2850 $self->{vbox}->add ($widget); 2949 $self->{vbox}->add ($widget);
… …
2871 my ($self, $ev, $x, $y) = @_; 2970 my ($self, $ev, $x, $y) = @_;
2872 2971
2873 # TODO: should use vbox->find_widget or so 2972 # TODO: should use vbox->find_widget or so
2874 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2973 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875 $self->{hover} = $self->{item}{$HOVER}; 2974 $self->{hover} = $self->{item}{$HOVER};
2975
2976 0
2876} 2977}
2877 2978
2878sub button_up { 2979sub button_up {
2879 my ($self, $ev, $x, $y) = @_; 2980 my ($self, $ev, $x, $y) = @_;
2880 2981
… …
2882 undef $GRAB; 2983 undef $GRAB;
2883 $self->hide; 2984 $self->hide;
2884 2985
2885 $self->_emit ("popdown"); 2986 $self->_emit ("popdown");
2886 $self->{hover}[1]->() if $self->{hover}; 2987 $self->{hover}[1]->() if $self->{hover};
2988 } else {
2989 return 0
2990 }
2991
2887 } 2992 1
2888} 2993}
2889 2994
2890############################################################################# 2995#############################################################################
2891 2996
2892package CFClient::UI::Statusbox; 2997package CFClient::UI::Multiplexer;
2893 2998
2894our @ISA = CFClient::UI::VBox::; 2999our @ISA = CFClient::UI::Container::;
2895 3000
2896sub new { 3001sub new {
2897 my $class = shift; 3002 my $class = shift;
2898 3003
2899 $class->SUPER::new ( 3004 my $self = $class->SUPER::new (
3005 @_,
3006 );
3007
3008 $self->{current} = $self->{children}[0]
3009 if @{ $self->{children} };
3010
3011 $self
3012}
3013
3014sub add {
3015 my ($self, @widgets) = @_;
3016
3017 $self->SUPER::add (@widgets);
3018
3019 $self->{current} = $self->{children}[0]
3020 if @{ $self->{children} };
3021}
3022
3023sub set_current_page {
3024 my ($self, $page_or_widget) = @_;
3025
3026 my $widget = ref $page_or_widget
3027 ? $page_or_widget
3028 : $self->{children}[$page_or_widget];
3029
3030 $self->{current} = $widget;
3031 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3032
3033 $self->_emit (page_changed => $self->{current});
3034
3035 $self->realloc;
3036}
3037
3038sub visible_children {
3039 $_[0]{current}
3040}
3041
3042sub size_request {
3043 my ($self) = @_;
3044
3045 $self->{current}->size_request
3046}
3047
3048sub size_allocate {
3049 my ($self, $w, $h) = @_;
3050
3051 $self->{current}->configure (0, 0, $w, $h);
3052}
3053
3054sub _draw {
3055 my ($self) = @_;
3056
3057 $self->{current}->draw;
3058}
3059
3060#############################################################################
3061
3062package CFClient::UI::Notebook;
3063
3064our @ISA = CFClient::UI::VBox::;
3065
3066sub new {
3067 my $class = shift;
3068
3069 my $self = $class->SUPER::new (
3070 buttonbar => (new CFClient::UI::Buttonbar),
3071 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3072 # filter => # will be put between multiplexer and $self
3073 @_,
3074 );
3075
3076 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3077 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3078
3079 $self
3080}
3081
3082sub add {
3083 my ($self, $title, $widget, $tooltip) = @_;
3084
3085 Scalar::Util::weaken $self;
3086
3087 $self->{buttonbar}->add (new CFClient::UI::Button
3088 markup => $title,
3089 tooltip => $tooltip,
3090 on_activate => sub { $self->set_current_page ($widget) },
3091 );
3092
3093 $self->{multiplexer}->add ($widget);
3094}
3095
3096sub set_current_page {
3097 my ($self, $page) = @_;
3098
3099 $self->{multiplexer}->set_current_page ($page);
3100 $self->_emit (page_changed => $self->{multiplexer}{current});
3101}
3102
3103#############################################################################
3104
3105package CFClient::UI::Combobox;
3106
3107use utf8;
3108
3109our @ISA = CFClient::UI::Button::;
3110
3111sub new {
3112 my $class = shift;
3113
3114 my $self = $class->SUPER::new (
3115 options => [], # [title, value, tooltip], ...
3116 value => undef,
3117 @_,
3118 );
3119
3120 $self->_set_value ($self->{value});
3121
3122 $self
3123}
3124
3125sub button_down {
3126 my ($self, $ev) = @_;
3127
3128 my @menu_items;
3129
3130 for (@{ $self->{options} }) {
3131 my ($title, $value, $tooltip) = @$_;
3132
3133 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3134 }
3135
3136 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3137}
3138
3139sub _set_value {
3140 my ($self, $value) = @_;
3141
3142 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3143 or return;
3144
3145 $self->{value} = $item->[1];
3146 $self->set_markup ("$item->[0] ⇓");
3147 $self->set_tooltip ($item->[2]);
3148}
3149
3150sub set_value {
3151 my ($self, $value) = @_;
3152
3153 return unless $self->{value} ne $value;
3154
3155 $self->_set_value ($value);
3156 $self->_emit (changed => $value);
3157}
3158
3159#############################################################################
3160
3161package CFClient::UI::Statusbox;
3162
3163our @ISA = CFClient::UI::VBox::;
3164
3165sub new {
3166 my $class = shift;
3167
3168 my $self = $class->SUPER::new (
2900 fontsize => 0.8, 3169 fontsize => 0.8,
2901 @_, 3170 @_,
2902 ) 3171 );
3172
3173 Scalar::Util::weaken (my $this = $self);
3174
3175 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3176
3177 $self
2903} 3178}
2904 3179
2905sub reorder { 3180sub reorder {
2906 my ($self) = @_; 3181 my ($self) = @_;
2907 my $NOW = time; 3182 my $NOW = Time::HiRes::time;
3183
3184 # freeze display when hovering over any label
3185 return if $CFClient::UI::TOOLTIP->{owner}
3186 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3187 values %{ $self->{item} };
2908 3188
2909 while (my ($k, $v) = each %{ $self->{item} }) { 3189 while (my ($k, $v) = each %{ $self->{item} }) {
2910 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3190 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2911 } 3191 }
2912 3192
… …
2915 my @items = sort { 3195 my @items = sort {
2916 $a->{pri} <=> $b->{pri} 3196 $a->{pri} <=> $b->{pri}
2917 or $b->{id} <=> $a->{id} 3197 or $b->{id} <=> $a->{id}
2918 } values %{ $self->{item} }; 3198 } values %{ $self->{item} };
2919 3199
3200 $self->{timer}->interval (1);
3201
2920 my $count = 10 + 1; 3202 my $count = 10 + 1;
2921 for my $item (@items) { 3203 for my $item (@items) {
2922 last unless --$count; 3204 last unless --$count;
2923 3205
2924 push @widgets, $item->{label} ||= do { 3206 my $label = $item->{label} ||= do {
2925 # TODO: doesn't handle markup well (read as: at all) 3207 # TODO: doesn't handle markup well (read as: at all)
2926 my $short = $item->{count} > 1 3208 my $short = $item->{count} > 1
2927 ? "<b>$item->{count} ×</b> $item->{text}" 3209 ? "<b>$item->{count} ×</b> $item->{text}"
2928 : $item->{text}; 3210 : $item->{text};
2929 3211
… …
2937 tooltip => $item->{tooltip}, 3219 tooltip => $item->{tooltip},
2938 tooltip_font => $::FONT_PROP, 3220 tooltip_font => $::FONT_PROP,
2939 tooltip_width => 0.67, 3221 tooltip_width => 0.67,
2940 fontsize => $item->{fontsize} || $self->{fontsize}, 3222 fontsize => $item->{fontsize} || $self->{fontsize},
2941 max_w => $::WIDTH * 0.44, 3223 max_w => $::WIDTH * 0.44,
2942 fg => $item->{fg}, 3224 fg => [@{ $item->{fg} }],
2943 can_events => 1, 3225 can_events => 1,
2944 can_hover => 1 3226 can_hover => 1
2945 }; 3227 };
3228
3229 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3230 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3231 $label->update;
3232 $label->set_max_size (undef, $label->{req_h} * $diff)
3233 if $diff < 1;
3234 $self->{timer}->interval (1/30);
3235 } else {
3236 $label->{fg}[3] = $item->{fg}[3] || 1;
3237 }
3238
3239 push @widgets, $label;
2946 } 3240 }
2947 3241
2948 $self->clear; 3242 $self->clear;
2949 $self->SUPER::add (reverse @widgets); 3243 $self->SUPER::add (reverse @widgets);
2950} 3244}
… …
2955 $text =~ s/^\s+//; 3249 $text =~ s/^\s+//;
2956 $text =~ s/\s+$//; 3250 $text =~ s/\s+$//;
2957 3251
2958 return unless $text; 3252 return unless $text;
2959 3253
2960 my $timeout = time + ((delete $arg{timeout}) || 60); 3254 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2961 3255
2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3256 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2963 3257
2964 if (my $item = $self->{item}{$group}) { 3258 if (my $item = $self->{item}{$group}) {
2965 if ($item->{text} eq $text) { 3259 if ($item->{text} eq $text) {
… …
2995 3289
2996 $self->reorder; 3290 $self->reorder;
2997 $self->SUPER::reconfigure; 3291 $self->SUPER::reconfigure;
2998} 3292}
2999 3293
3294sub DESTROY {
3295 my ($self) = @_;
3296
3297 $self->{timer}->cancel;
3298
3299 $self->SUPER::DESTROY;
3300}
3301
3000############################################################################# 3302#############################################################################
3001 3303
3304package CFClient::UI::Inventory;
3305
3306our @ISA = CFClient::UI::ScrolledWindow::;
3307
3308sub new {
3309 my $class = shift;
3310
3311 my $self = $class->SUPER::new (
3312 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3313 @_,
3314 );
3315
3316 $self
3317}
3318
3319sub set_items {
3320 my ($self, $items) = @_;
3321
3322 $self->{child}->clear;
3323 return unless $items;
3324
3325 my @items = sort {
3326 ($a->{type} <=> $b->{type})
3327 or ($a->{name} cmp $b->{name})
3328 } @$items;
3329
3330 $self->{real_items} = \@items;
3331
3332 my $row = 0;
3333 for my $item (@items) {
3334 CFClient::Item::update_widgets $item;
3335
3336 $self->{child}->add (0, $row, $item->{face_widget});
3337 $self->{child}->add (1, $row, $item->{desc_widget});
3338 $self->{child}->add (2, $row, $item->{weight_widget});
3339
3340 $row++;
3341 }
3342}
3343
3344#############################################################################
3345
3346package CFClient::UI::BindEditor;
3347
3348our @ISA = CFClient::UI::FancyFrame::;
3349
3350sub new {
3351 my $class = shift;
3352
3353 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3354
3355 $self->add (my $vb = new CFClient::UI::VBox);
3356
3357
3358 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3359 text => "start recording",
3360 tooltip => "Start/Stops recording of actions."
3361 ."All subsequent actions after the recording started will be captured."
3362 ."The actions are displayed after the record was stopped."
3363 ."To bind the action you have to click on the 'Bind' button",
3364 on_activate => sub {
3365 unless ($self->{recording}) {
3366 $self->start;
3367 } else {
3368 $self->stop;
3369 }
3370 });
3371
3372 $vb->add (new CFClient::UI::Label text => "Actions:");
3373 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3374
3375 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3376 $vb->add (my $hb = new CFClient::UI::HBox);
3377 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3378 $hb->add (new CFClient::UI::Button
3379 text => "bind",
3380 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3381 on_activate => sub {
3382 $self->ask_for_bind;
3383 });
3384
3385 $vb->add (my $hb = new CFClient::UI::HBox);
3386 $hb->add (new CFClient::UI::Button
3387 text => "ok",
3388 expand => 1,
3389 tooltip => "This closes the binding editor and saves the binding",
3390 on_activate => sub {
3391 $self->hide;
3392 $self->commit;
3393 });
3394
3395 $hb->add (new CFClient::UI::Button
3396 text => "cancel",
3397 expand => 1,
3398 tooltip => "This closes the binding editor without saving",
3399 on_activate => sub {
3400 $self->hide;
3401 $self->{binding_cancel}->()
3402 if $self->{binding_cancel};
3403 });
3404
3405 $self->update_binding_widgets;
3406
3407 $self
3408}
3409
3410sub commit {
3411 my ($self) = @_;
3412 my ($mod, $sym, $cmds) = $self->get_binding;
3413 if ($sym != 0 && @$cmds > 0) {
3414 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3415 ."'. Don't forget 'Save Config'!");
3416 $self->{binding_change}->($mod, $sym, $cmds)
3417 if $self->{binding_change};
3418 } else {
3419 $::STATUSBOX->add ("No action bound, no key or action specified!");
3420 $self->{binding_cancel}->()
3421 if $self->{binding_cancel};
3422 }
3423}
3424
3425sub start {
3426 my ($self) = @_;
3427
3428 $self->{rec_btn}->set_text ("stop recording");
3429 $self->{recording} = 1;
3430 $self->clear_command_list;
3431 $::CONN->start_record if $::CONN;
3432}
3433
3434sub stop {
3435 my ($self) = @_;
3436
3437 $self->{rec_btn}->set_text ("start recording");
3438 $self->{recording} = 0;
3439
3440 my $rec;
3441 $rec = $::CONN->stop_record if $::CONN;
3442 return unless ref $rec eq 'ARRAY';
3443 $self->set_command_list ($rec);
3444}
3445
3446
3447sub ask_for_bind_and_commit {
3448 my ($self) = @_;
3449 $self->ask_for_bind (1);
3450}
3451
3452sub ask_for_bind {
3453 my ($self, $commit) = @_;
3454
3455 CFClient::Binder::open_binding_dialog (sub {
3456 my ($mod, $sym) = @_;
3457 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3458 $self->update_binding_widgets;
3459 $self->commit if $commit;
3460 });
3461}
3462
3463# $mod and $sym are the modifiers and key symbol
3464# $cmds is a array ref of strings (the commands)
3465# $cb is the callback that is executed on OK
3466# $ccb is the callback that is executed on CANCEL and
3467# when the binding was unsuccessful on OK
3468sub set_binding {
3469 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3470
3471 $self->clear_command_list;
3472 $self->{recording} = 0;
3473 $self->{rec_btn}->set_text ("start recording");
3474
3475 $self->{binding} = [$mod, $sym];
3476 $self->{commands} = $cmds;
3477
3478 $self->{binding_change} = $cb;
3479 $self->{binding_cancel} = $ccb;
3480
3481 $self->update_binding_widgets;
3482}
3483
3484# this is a shortcut method that asks for a binding
3485# and then just binds it.
3486sub do_quick_binding {
3487 my ($self, $cmds) = @_;
3488 $self->set_binding (undef, undef, $cmds, sub {
3489 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3490 });
3491 $self->ask_for_bind (1);
3492}
3493
3494sub update_binding_widgets {
3495 my ($self) = @_;
3496 my ($mod, $sym, $cmds) = $self->get_binding;
3497 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3498 $self->set_command_list ($cmds);
3499}
3500
3501sub get_binding {
3502 my ($self) = @_;
3503 return (
3504 $self->{binding}->[0],
3505 $self->{binding}->[1],
3506 [ grep { defined $_ } @{$self->{commands}} ]
3507 );
3508}
3509
3510sub clear_command_list {
3511 my ($self) = @_;
3512 $self->{cmdbox}->clear ();
3513}
3514
3515sub set_command_list {
3516 my ($self, $cmds) = @_;
3517
3518 $self->{cmdbox}->clear ();
3519 $self->{commands} = $cmds;
3520
3521 my $idx = 0;
3522
3523 for (@$cmds) {
3524 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3525
3526 my $i = $idx;
3527 $hb->add (new CFClient::UI::Label text => $_);
3528 $hb->add (new CFClient::UI::Button
3529 text => "delete",
3530 tooltip => "Deletes the action from the record",
3531 on_activate => sub {
3532 $self->{cmdbox}->remove ($hb);
3533 $cmds->[$i] = undef;
3534 });
3535
3536
3537 $idx++
3538 }
3539}
3540
3541#############################################################################
3542
3543package CFClient::UI::SpellList;
3544
3545our @ISA = CFClient::UI::Table::;
3546
3547sub new {
3548 my $class = shift;
3549
3550 my $self = $class->SUPER::new (
3551 binding => [],
3552 commands => [],
3553 @_,
3554 )
3555}
3556
3557my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3559my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3561my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3562 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3563
3564sub rebuild_spell_list {
3565 my ($self) = @_;
3566
3567 $CFClient::UI::ROOT->on_refresh ($self => sub {
3568 $self->clear;
3569
3570 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3571 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3572 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3573 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3574
3575 my $row = 0;
3576
3577 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3578 my $spell = $self->{spell}{$_};
3579
3580 $row++;
3581
3582 $self->add (0, $row, new CFClient::UI::Face
3583 face => $spell->{face},
3584 can_hover => 1,
3585 can_events => 1,
3586 tooltip => $spell->{message},
3587 );
3588
3589 $self->add (1, $row, new CFClient::UI::Label
3590 expand => 1,
3591 text => $spell->{name},
3592 can_hover => 1,
3593 can_events => 1,
3594 tooltip => $spell->{message},
3595 );
3596
3597 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600
3601 # TODO: should be done via popup
3602 $self->add (5, $row, new CFClient::UI::Button
3603 text => "bind",
3604 tooltip => "bind spell readying (cast command) to key",
3605 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3606 );
3607 }
3608 });
3609}
3610
3611sub add_spell {
3612 my ($self, $spell) = @_;
3613
3614 $self->{spell}->{$spell->{name}} = $spell;
3615 $self->rebuild_spell_list;
3616}
3617
3618sub remove_spell {
3619 my ($self, $spell) = @_;
3620
3621 delete $self->{spell}->{$spell->{name}};
3622 $self->rebuild_spell_list;
3623}
3624
3625#############################################################################
3626
3002package CFClient::UI::Root; 3627package CFClient::UI::Root;
3003 3628
3004our @ISA = CFClient::UI::Container::; 3629our @ISA = CFClient::UI::Container::;
3630
3631use List::Util qw(min max);
3005 3632
3006use CFClient::OpenGL; 3633use CFClient::OpenGL;
3007 3634
3008sub new { 3635sub new {
3009 my $class = shift; 3636 my $class = shift;
… …
3016 Scalar::Util::weaken ($self->{root} = $self); 3643 Scalar::Util::weaken ($self->{root} = $self);
3017 3644
3018 $self 3645 $self
3019} 3646}
3020 3647
3021sub configure {
3022 my ($self, $x, $y, $w, $h) = @_;
3023
3024 $self->{w} = $w;
3025 $self->{h} = $h;
3026}
3027
3028sub reconfigure {
3029 my ($self) = @_;
3030
3031 $self->SUPER::reconfigure;
3032
3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
3034 if $self->{w};
3035}
3036
3037sub size_request { 3648sub size_request {
3038 my ($self) = @_; 3649 my ($self) = @_;
3039 3650
3040 ($self->{w}, $self->{h}) 3651 ($self->{w}, $self->{h})
3041} 3652}
… …
3053 3664
3054 int $coord + 0.5 3665 int $coord + 0.5
3055} 3666}
3056 3667
3057sub size_allocate { 3668sub size_allocate {
3058 my ($self, $w, $h, $changed) = @_; 3669 my ($self, $w, $h) = @_;
3059 3670
3060 for my $child ($self->children) { 3671 for my $child ($self->children) {
3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3672 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062 3673
3063 $X = $child->{force_x} if exists $child->{force_x}; 3674 $X = $child->{force_x} if exists $child->{force_x};
… …
3131 $_->() 3742 $_->()
3132 for values %{delete $self->{refresh_hook}}; 3743 for values %{delete $self->{refresh_hook}};
3133 } 3744 }
3134 3745
3135 if ($self->{realloc}) { 3746 if ($self->{realloc}) {
3747 my %queue;
3136 my @queue; 3748 my @queue;
3749 my $widget;
3137 3750
3751 outer:
3138 while () { 3752 while () {
3139 if ($self->{realloc}) { 3753 if (my $realloc = delete $self->{realloc}) {
3140 #TODO use array-of-depth approach 3754 for $widget (values %$realloc) {
3755 $widget->{visible} or next; # do not resize invisible widgets
3141 3756
3142 @queue = sort { $a->{visible} <=> $b->{visible} } 3757 $queue{$widget+0}++ and next; # duplicates are common
3143 @queue, values %{delete $self->{realloc}}; 3758
3759 push @{ $queue[$widget->{visible}] }, $widget;
3760 }
3144 } 3761 }
3145 3762
3763 while () {
3764 @queue or last outer;
3765
3146 my $widget = pop @queue || last; 3766 $widget = pop @{ $queue[-1] || [] }
3767 and last;
3768
3769 pop @queue;
3770 }
3147 3771
3148 $widget->{visible} or last; # do not resize invisible widgets 3772 delete $queue{$widget+0};
3149 3773
3150 my ($w, $h) = $widget->size_request; 3774 my ($w, $h) = $widget->size_request;
3151 3775
3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3776 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3777 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3778
3779 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3780 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3154 3781
3155 $w = $widget->{force_w} if exists $widget->{force_w}; 3782 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h}; 3783 $h = $widget->{force_h} if exists $widget->{force_h};
3157 3784
3785 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3786 || delete $widget->{force_realloc}) {
3158 $widget->{req_w} = $w; 3787 $widget->{req_w} = $w;
3159 $widget->{req_h} = $h; 3788 $widget->{req_h} = $h;
3160 3789
3161 $self->{size_alloc}{$widget} = [$widget, undef, undef]; 3790 $self->{size_alloc}{$widget+0} = $widget;
3162 3791
3163 push @queue, $widget->{parent} 3792 if (my $parent = $widget->{parent}) {
3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent}; 3793 $self->{realloc}{$parent+0} = $parent
3794 unless $queue{$parent+0};
3795
3796 $parent->{force_size_alloc} = 1;
3797 $self->{size_alloc}{$parent+0} = $parent;
3798 }
3799 }
3800
3801 delete $self->{realloc}{$widget+0};
3165 } 3802 }
3166 } 3803 }
3167 3804
3168 while (my $size_alloc = delete $self->{size_alloc}) { 3805 while (my $size_alloc = delete $self->{size_alloc}) {
3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3806 my @queue = sort { $b->{visible} <=> $a->{visible} }
3170 values %$size_alloc; 3807 values %$size_alloc;
3171 3808
3172 while () { 3809 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last }; 3810 my $widget = pop @queue || last;
3174 3811
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w; 3812 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3177 3813
3178 $w = 0 if $w < 0; 3814 $w = 0 if $w < 0;
3179 $h = 0 if $h < 0; 3815 $h = 0 if $h < 0;
3180 3816
3181 $w = int $w + 0.5; 3817 $w = int $w + 0.5;
3182 $h = int $h + 0.5; 3818 $h = int $h + 0.5;
3183 3819
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3820 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3821 $widget->{old_w} = $widget->{w};
3822 $widget->{old_h} = $widget->{h};
3185 3823
3186 $widget->{w} = $w; 3824 $widget->{w} = $w;
3187 $widget->{h} = $h; 3825 $widget->{h} = $h;
3188 3826
3189 $widget->emit (size_allocate => $w, $h, $changed); 3827 $widget->emit (size_allocate => $w, $h);
3828 }
3190 } 3829 }
3191 } 3830 }
3192 3831
3193 while ($self->{post_alloc_hook}) { 3832 while ($self->{post_alloc_hook}) {
3194 $_->() 3833 $_->()
3195 for values %{delete $self->{post_alloc_hook}}; 3834 for values %{delete $self->{post_alloc_hook}};
3196 } 3835 }
3836
3197 3837
3198 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3838 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3839 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3200 glClear GL_COLOR_BUFFER_BIT; 3840 glClear GL_COLOR_BUFFER_BIT;
3201 3841
… …
3203 glLoadIdentity; 3843 glLoadIdentity;
3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3844 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205 glMatrixMode GL_MODELVIEW; 3845 glMatrixMode GL_MODELVIEW;
3206 glLoadIdentity; 3846 glLoadIdentity;
3207 3847
3848 {
3849 package CFClient::UI::Base;
3850
3851 ($draw_x, $draw_y, $draw_w, $draw_h) =
3852 (0, 0, $self->{w}, $self->{h});
3853 }
3854
3208 $self->_draw; 3855 $self->_draw;
3209} 3856}
3210 3857
3211############################################################################# 3858#############################################################################
3212 3859

Diff Legend

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