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.265 by root, Thu Jun 1 02:59:46 2006 UTC vs.
Revision 1.287 by root, Mon Jun 5 05:31:13 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;
… …
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);
… …
370sub size_allocate { 372sub size_allocate {
371 # nothing to be done 373 # nothing to be done
372} 374}
373 375
374sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
375} 382}
376 383
377sub set_max_size { 384sub set_max_size {
378 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
379 386
380 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
381 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
382} 391}
383 392
384sub set_tooltip { 393sub set_tooltip {
385 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
386 395
… …
391 400
392 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
393 402
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
397 } 406 }
398} 407}
399 408
400# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
401sub coord2local { 410sub coord2local {
… …
438 447
439 $::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
440 unless $FOCUS; 449 unless $FOCUS;
441} 450}
442 451
443sub mouse_motion { } 452sub mouse_motion { 0 }
444sub button_up { } 453sub button_up { 0 }
445sub key_down { } 454sub key_down { 0 }
446sub key_up { } 455sub key_up { 0 }
447 456
448sub button_down { 457sub button_down {
449 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
450 459
451 $self->focus_in; 460 $self->focus_in;
452}
453 461
454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459 464
460sub find_widget { 465sub find_widget {
461 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
462 467
463 return () unless $self->{can_events}; 468 return () unless $self->{can_events};
… …
525 530
526 $self->realloc; 531 $self->realloc;
527 $self->update; 532 $self->update;
528} 533}
529 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
530sub draw { 539sub draw {
531 my ($self) = @_; 540 my ($self) = @_;
532 541
533 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);
534 553
535 glPushMatrix; 554 glPushMatrix;
536 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
537 $self->_draw;
538 glPopMatrix;
539 556
540 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
541 my ($x, $y) = @$self{qw(x y)};
542
543 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
544 glEnable GL_BLEND; 559 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glBegin GL_QUADS; 561 glBegin GL_QUADS;
547 glVertex $x , $y; 562 glVertex 0 , 0;
548 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
549 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
550 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
551 glEnd; 566 glEnd;
552 glDisable GL_BLEND; 567 glDisable GL_BLEND;
553 } 568 }
554 569
555 if ($ENV{CFPLUS_DEBUG} & 1) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix; 571 glPushMatrix;
557 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
559 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0; 575 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
564 glEnd; 579 glEnd;
565 glPopMatrix; 580 glPopMatrix;
566 #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;
567 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
568} 586}
569 587
570sub _draw { 588sub _draw {
571 my ($self) = @_; 589 my ($self) = @_;
572 590
… …
610 628
611 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
612 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
613 631
614 glEnable GL_BLEND; 632 glEnable GL_BLEND;
615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616 glColor @$color; 634 glColor_premultiply @$color;
617 635
618 glBegin GL_QUADS; 636 glBegin GL_QUADS;
619 glVertex 0 , 0; 637 glVertex 0 , 0;
620 glVertex 0 , $h; 638 glVertex 0 , $h;
621 glVertex $w, $h; 639 glVertex $w, $h;
… …
652our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
653 671
654sub new { 672sub new {
655 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
656 674
657 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
658 676
659 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
660 children => [], 678 children => [],
661 can_events => 0, 679 can_events => 0,
662 %arg, 680 %arg,
663 ); 681 );
682
664 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
665 685
666 $self 686 $self
667} 687}
668 688
669sub add { 689sub add {
… …
717 $x -= $self->{x}; 737 $x -= $self->{x};
718 $y -= $self->{y}; 738 $y -= $self->{y};
719 739
720 my $res; 740 my $res;
721 741
722 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
723 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
724 and return $res; 744 and return $res;
725 } 745 }
726 746
727 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
776 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
777} 797}
778 798
779############################################################################# 799#############################################################################
780 800
801# back-buffered drawing area
802
781package CFClient::UI::Window; 803package CFClient::UI::Window;
782 804
783our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
784 806
785use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
803 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
804 $self->update; 826 $self->update;
805} 827}
806 828
807sub _render { 829sub _render {
830 my ($self) = @_;
831
808 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
809} 833}
810 834
811sub render_child { 835sub render_child {
812 my ($self) = @_; 836 my ($self) = @_;
813 837
814 $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 {
815 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
817 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
818 $self->_render; 849 $self->_render;
819 }; 850 };
820} 851}
821 852
822sub _draw { 853sub _draw {
823 my ($self) = @_; 854 my ($self) = @_;
824 855
825 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
826 857
827 my $tex = $self->{texture} 858 my $tex = $self->{texture}
828 or return; 859 or return;
829 860
830 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
833 864
834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
835 866
836 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
837} 868}
… …
913} 944}
914 945
915sub _render { 946sub _render {
916 my ($self) = @_; 947 my ($self) = @_;
917 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
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 953
920 $self->SUPER::_render; 954 $self->SUPER::_render;
921} 955}
922 956
… …
925package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
926 960
927our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
928 962
929sub new { 963sub new {
930 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
931 967
932 my $self; 968 my $self;
933 969
934 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
935 vertical => 1, 971 vertical => 1,
… …
940 ; 976 ;
941 977
942 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider, 980 slider => $slider,
945 @_, 981 %arg,
946 ); 982 );
947 983
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
951 986
952 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
953} 994}
954 995
955sub update { 996sub update {
956 my ($self) = @_; 997 my ($self) = @_;
957 998
… …
996 1037
997 if ($self->{bg}) { 1038 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
999 1040
1000 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
1003 1044
1004 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
1005 glVertex 0 , 0; 1046 glVertex 0 , 0;
1006 glVertex 0 , $h; 1047 glVertex 0 , $h;
1007 glVertex $w, $h; 1048 glVertex $w, $h;
… …
1029my @border = 1070my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 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);
1032 1073
1033sub new { 1074sub new {
1034 my $class = shift; 1075 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1035 1078
1036 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1082 border => 0.6,
1040 can_events => 1, 1083 can_events => 1,
1041 min_w => 16, 1084 min_w => 16,
1042 min_h => 16, 1085 min_h => 16,
1043 @_ 1086 %arg,
1044 ); 1087 );
1045 1088
1046 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
1047 align => 0, 1090 align => 0,
1048 valign => 1, 1091 valign => 1,
1049 text => $self->{title}, 1092 text => $title,
1050 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1051 1095
1052 $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};
1053} 1104}
1054 1105
1055sub border { 1106sub border {
1056 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1057} 1108}
1058 1109
1059sub size_request { 1110sub size_request {
1060 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1061 1115
1062 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1063 1117
1064 ( 1118 (
1065 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
1068} 1122}
1069 1123
1070sub size_allocate { 1124sub size_allocate {
1071 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
1072 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
1073 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1075 1137
1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077 if $self->{title};
1078
1079 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1080} 1139}
1081 1140
1082sub button_down { 1141sub button_down {
1083 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1084 1143
… …
1103 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1104 1163
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1168 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1169 };
1111 1170
1112 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1118 1177
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1179
1121 $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});
1122 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1123 } 1188 1
1124} 1189}
1125 1190
1126sub button_up { 1191sub button_up {
1127 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1128 1193
1129 delete $self->{motion}; 1194 !!delete $self->{motion}
1130} 1195}
1131 1196
1132sub mouse_motion { 1197sub mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1134 1199
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1136} 1203}
1137 1204
1138sub _draw { 1205sub _draw {
1139 my ($self) = @_; 1206 my ($self) = @_;
1140 1207
1208 my $child = $self->{children}[0];
1209
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1212
1144 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1215
1147 my $border = $self->border; 1216 my $border = $self->border;
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1232 }
1164 1233
1165 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1166 1235
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1170} 1242}
1171 1243
1172############################################################################# 1244#############################################################################
1173 1245
1174package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1467 1539
1468 delete $self->{texture}; 1540 delete $self->{texture};
1469 $self->SUPER::update; 1541 $self->SUPER::update;
1470} 1542}
1471 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1472sub set_text { 1551sub set_text {
1473 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1474 1553
1475 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1477 1556
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1559 delete $self->{req_h};
1480 1560
1481 $self->realloc; 1561 $self->realloc;
1482 $self->update; 1562 $self->update;
1483} 1563}
1484 1564
… …
1490 1570
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1572
1493 $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;
1494 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1575 delete $self->{req_h};
1495 1576
1496 $self->realloc; 1577 $self->realloc;
1497 $self->update; 1578 $self->update;
1498} 1579}
1499 1580
1500sub size_request { 1581sub size_request {
1501 my ($self) = @_; 1582 my ($self) = @_;
1502 1583
1584 if (exists $self->{req_h}) {
1585 @$self{qw(req_w req_h)}
1586 } else {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1587 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1588 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1589 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1592
1509 my ($w, $h) = $self->{layout}->size; 1593 my ($w, $h) = $self->{layout}->size;
1510 1594
1511 if (exists $self->{template}) { 1595 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1596 $self->{template}->set_font ($self->{font}) if $self->{font};
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1598
1515 my ($w2, $h2) = $self->{template}->size; 1599 my ($w2, $h2) = $self->{template}->size;
1516 1600
1517 $w = List::Util::max $w, $w2; 1601 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1602 $h = List::Util::max $h, $h2;
1519 } 1603 }
1520 1604
1521 ($w, $h) 1605 ($w, $h)
1606 }
1522} 1607}
1523 1608
1524sub size_allocate { 1609sub size_allocate {
1525 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1526 1611
1612 delete $self->{ox};
1613
1527 delete $self->{texture} 1614 delete $self->{texture}
1528 ;#d# 1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1529} 1616}
1530 1617
1531sub set_fontsize { 1618sub set_fontsize {
1532 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1533 1620
… …
1548 $self->{layout}->set_width ($self->{w}); 1635 $self->{layout}->set_width ($self->{w});
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1639
1553 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1640 new_from_layout CFClient::Texture $self->{layout}
1641 };
1554 1642
1643 unless (exists $self->{ox}) {
1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1557 : ($self->{w} - $tex->{w}) * 0.5); 1646 : ($self->{w} - $tex->{w}) * 0.5);
1558 1647
1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1561 : ($self->{h} - $tex->{h}) * 0.5); 1650 : ($self->{h} - $tex->{h}) * 0.5);
1562
1563 $tex
1564 }; 1651 };
1565 1652
1566 glEnable GL_TEXTURE_2D; 1653 glEnable GL_TEXTURE_2D;
1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1568 1654
1569 if ($tex->{format} == GL_ALPHA) { 1655 if ($tex->{format} == GL_ALPHA) {
1656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1570 glColor @{$self->{fg}}; 1657 glColor @{$self->{fg}};
1571 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1572 } else { 1659 } else {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1573 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1661 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1574 } 1662 }
1575 1663
1576 glDisable GL_TEXTURE_2D; 1664 glDisable GL_TEXTURE_2D;
1577} 1665}
… …
1606 1694
1607 delete $self->{cur_h}; 1695 delete $self->{cur_h};
1608 1696
1609 return if $self->{text} eq $text; 1697 return if $self->{text} eq $text;
1610 1698
1611 delete $self->{texture};
1612
1613 $self->{last_activity} = $::NOW; 1699 $self->{last_activity} = $::NOW;
1614 $self->{text} = $text; 1700 $self->{text} = $text;
1615 1701
1616 $text =~ s/./*/g if $self->{hidden}; 1702 $text =~ s/./*/g if $self->{hidden};
1617 $self->{layout}->set_text ("$text "); 1703 $self->{layout}->set_text ("$text ");
1704 delete $self->{req_h};
1618 1705
1619 $self->_emit (changed => $self->{text}); 1706 $self->_emit (changed => $self->{text});
1707
1708 $self->realloc;
1709 $self->update;
1620} 1710}
1621 1711
1622sub set_text { 1712sub set_text {
1623 my ($self, $text) = @_; 1713 my ($self, $text) = @_;
1624 1714
1625 $self->{cursor} = length $text; 1715 $self->{cursor} = length $text;
1626 $self->_set_text ($text); 1716 $self->_set_text ($text);
1627
1628 $self->realloc;
1629} 1717}
1630 1718
1631sub get_text { 1719sub get_text {
1632 $_[0]{text} 1720 $_[0]{text}
1633} 1721}
… …
1663 $self->{cursor} = length $text; 1751 $self->{cursor} = length $text;
1664 } elsif ($uni == 27) { 1752 } elsif ($uni == 27) {
1665 $self->_emit ('escape'); 1753 $self->_emit ('escape');
1666 } elsif ($uni) { 1754 } elsif ($uni) {
1667 substr $text, $self->{cursor}++, 0, chr $uni; 1755 substr $text, $self->{cursor}++, 0, chr $uni;
1756 } else {
1757 return 0;
1668 } 1758 }
1669 1759
1670 $self->_set_text ($text); 1760 $self->_set_text ($text);
1671 1761
1672 $self->realloc; 1762 $self->realloc;
1763
1764 1
1673} 1765}
1674 1766
1675sub focus_in { 1767sub focus_in {
1676 my ($self) = @_; 1768 my ($self) = @_;
1677 1769
… …
1692 utf8::encode $text; 1784 utf8::encode $text;
1693 $self->{cursor} = length substr $text, 0, $idx; 1785 $self->{cursor} = length substr $text, 0, $idx;
1694 1786
1695 $self->_set_text ($self->{text}); 1787 $self->_set_text ($self->{text});
1696 $self->update; 1788 $self->update;
1789
1790 1
1697} 1791}
1698 1792
1699sub mouse_motion { 1793sub mouse_motion {
1700 my ($self, $ev, $x, $y) = @_; 1794 my ($self, $ev, $x, $y) = @_;
1701# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1795# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1796
1797 0
1702} 1798}
1703 1799
1704sub _draw { 1800sub _draw {
1705 my ($self) = @_; 1801 my ($self) = @_;
1706 1802
1707 local $self->{fg} = $self->{fg}; 1803 local $self->{fg} = $self->{fg};
1708 1804
1709 if ($FOCUS == $self) { 1805 if ($FOCUS == $self) {
1710 glColor @{$self->{active_bg}}; 1806 glColor_premultiply @{$self->{active_bg}};
1711 $self->{fg} = $self->{active_fg}; 1807 $self->{fg} = $self->{active_fg};
1712 } else { 1808 } else {
1713 glColor @{$self->{bg}}; 1809 glColor_premultiply @{$self->{bg}};
1714 } 1810 }
1715 1811
1716 glEnable GL_BLEND; 1812 glEnable GL_BLEND;
1717 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1813 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1718 glBegin GL_QUADS; 1814 glBegin GL_QUADS;
1719 glVertex 0 , 0; 1815 glVertex 0 , 0;
1720 glVertex 0 , $self->{h}; 1816 glVertex 0 , $self->{h};
1721 glVertex $self->{w}, $self->{h}; 1817 glVertex $self->{w}, $self->{h};
1722 glVertex $self->{w}, 0; 1818 glVertex $self->{w}, 0;
… …
1783 } else { 1879 } else {
1784 $self->set_text ($self->{history_saveback}); 1880 $self->set_text ($self->{history_saveback});
1785 } 1881 }
1786 1882
1787 } else { 1883 } else {
1788 $self->SUPER::key_down ($ev); 1884 return $self->SUPER::key_down ($ev)
1885 }
1886
1789 } 1887 1
1790
1791} 1888}
1792 1889
1793############################################################################# 1890#############################################################################
1794 1891
1795package CFClient::UI::Button; 1892package CFClient::UI::Button;
… …
1824 my ($self, $ev, $x, $y) = @_; 1921 my ($self, $ev, $x, $y) = @_;
1825 1922
1826 $self->emit ("activate") 1923 $self->emit ("activate")
1827 if $x >= 0 && $x < $self->{w} 1924 if $x >= 0 && $x < $self->{w}
1828 && $y >= 0 && $y < $self->{h}; 1925 && $y >= 0 && $y < $self->{h};
1926
1927 1
1829} 1928}
1830 1929
1831sub _draw { 1930sub _draw {
1832 my ($self) = @_; 1931 my ($self) = @_;
1833 1932
1834 local $self->{fg} = $self->{fg}; 1933 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1835
1836 if ($GRAB == $self) {
1837 $self->{fg} = $self->{active_fg};
1838 }
1839 1934
1840 glEnable GL_TEXTURE_2D; 1935 glEnable GL_TEXTURE_2D;
1841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1936 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1842 glColor 0, 0, 0, 1; 1937 glColor 0, 0, 0, 1;
1843 1938
… …
1887 1982
1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1983 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1984 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1890 $self->{state} = !$self->{state}; 1985 $self->{state} = !$self->{state};
1891 $self->_emit (changed => $self->{state}); 1986 $self->_emit (changed => $self->{state});
1987 } else {
1988 return 0
1989 }
1990
1892 } 1991 1
1893} 1992}
1894 1993
1895sub _draw { 1994sub _draw {
1896 my ($self) = @_; 1995 my ($self) = @_;
1897 1996
… …
2064 2163
2065 my $h1 = $self->{h} * (1 - $ycut1); 2164 my $h1 = $self->{h} * (1 - $ycut1);
2066 my $h2 = $self->{h} * (1 - $ycut2); 2165 my $h2 = $self->{h} * (1 - $ycut2);
2067 2166
2068 glEnable GL_BLEND; 2167 glEnable GL_BLEND;
2069 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2168 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2169 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070 glEnable GL_TEXTURE_2D; 2170 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2171 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072 2172
2073 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2173 glBindTexture GL_TEXTURE_2D, $t1->{name};
2074 glBegin GL_QUADS; 2174 glBegin GL_QUADS;
… …
2235 2335
2236 $self->SUPER::button_down ($ev, $x, $y); 2336 $self->SUPER::button_down ($ev, $x, $y);
2237 2337
2238 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2338 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239 2339
2240 $self->mouse_motion ($ev, $x, $y); 2340 $self->mouse_motion ($ev, $x, $y)
2241} 2341}
2242 2342
2243sub mouse_motion { 2343sub mouse_motion {
2244 my ($self, $ev, $x, $y) = @_; 2344 my ($self, $ev, $x, $y) = @_;
2245 2345
… …
2249 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2349 my (undef, $lo, $hi, $page) = @{$self->{range}};
2250 2350
2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2351 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252 2352
2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2353 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2354 } else {
2355 return 0;
2356 }
2357
2254 } 2358 1
2255} 2359}
2256 2360
2257sub update { 2361sub update {
2258 my ($self) = @_; 2362 my ($self) = @_;
2259 2363
2260 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2364 delete $self->{knob_w};
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370
2371 unless ($self->{knob_w}) {
2261 $self->set_value ($self->{range}[0]); 2372 $self->set_value ($self->{range}[0]);
2262 2373
2263 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2374 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100; 2375 my $range = ($hi - $page - $lo) || 1e-100;
2265 2376
… …
2271 $value = ($value - $lo) / $range; 2382 $value = ($value - $lo) / $range;
2272 $value = $value * $self->{scale} + $self->{offset}; 2383 $value = $value * $self->{scale} + $self->{offset};
2273 2384
2274 $self->{knob_x} = $value - $knob_w * 0.5; 2385 $self->{knob_x} = $value - $knob_w * 0.5;
2275 $self->{knob_w} = $knob_w; 2386 $self->{knob_w} = $knob_w;
2276 }); 2387 }
2277
2278 $self->SUPER::update;
2279}
2280
2281sub _draw {
2282 my ($self) = @_;
2283 2388
2284 $self->SUPER::_draw (); 2389 $self->SUPER::_draw ();
2285 2390
2286 glScale $self->{w}, $self->{h}; 2391 glScale $self->{w}, $self->{h};
2287 2392
… …
2481 2586
2482 delete $self->{texture}; 2587 delete $self->{texture};
2483 } 2588 }
2484 2589
2485 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2590 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2486 glClearColor 0.5, 0.5, 0.5, 0; 2591 glClearColor 0, 0, 0, 0;
2487 glClear GL_COLOR_BUFFER_BIT; 2592 glClear GL_COLOR_BUFFER_BIT;
2488 2593
2489 my $top = int $self->{children}[1]{range}[0]; 2594 my $top = int $self->{children}[1]{range}[0];
2490 2595
2491 my $y0 = $top; 2596 my $y0 = $top;
… …
2526sub _draw { 2631sub _draw {
2527 my ($self) = @_; 2632 my ($self) = @_;
2528 2633
2529 glEnable GL_TEXTURE_2D; 2634 glEnable GL_TEXTURE_2D;
2530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2531 glColor 1, 1, 1, 1; 2636 glColor 0, 0, 0, 1;
2532 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2637 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2533 glDisable GL_TEXTURE_2D; 2638 glDisable GL_TEXTURE_2D;
2534 2639
2535 $self->{children}[1]->draw; 2640 $self->{children}[1]->draw;
2536 2641
2537} 2642}
… …
2764 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2869 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2765 2870
2766 if ($tex) { 2871 if ($tex) {
2767 glEnable GL_TEXTURE_2D; 2872 glEnable GL_TEXTURE_2D;
2768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2873 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2769 glColor 1, 1, 1, 1; 2874 glColor 0, 0, 0, 1;
2770 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2875 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2771 glDisable GL_TEXTURE_2D; 2876 glDisable GL_TEXTURE_2D;
2772 } 2877 }
2773} 2878}
2774 2879
… …
2778 $self->{timer}->cancel 2883 $self->{timer}->cancel
2779 if $self->{timer}; 2884 if $self->{timer};
2780 2885
2781 $self->SUPER::DESTROY; 2886 $self->SUPER::DESTROY;
2782} 2887}
2888
2889#############################################################################
2890
2891package CFClient::UI::Buttonbar;
2892
2893our @ISA = CFClient::UI::HBox::;
2894
2895# TODO: should actualyl wrap buttons and other goodies.
2783 2896
2784############################################################################# 2897#############################################################################
2785 2898
2786package CFClient::UI::Menu; 2899package CFClient::UI::Menu;
2787 2900
… …
2837 my ($self, $ev, $x, $y) = @_; 2950 my ($self, $ev, $x, $y) = @_;
2838 2951
2839 # TODO: should use vbox->find_widget or so 2952 # TODO: should use vbox->find_widget or so
2840 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2953 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2841 $self->{hover} = $self->{item}{$HOVER}; 2954 $self->{hover} = $self->{item}{$HOVER};
2955
2956 0
2842} 2957}
2843 2958
2844sub button_up { 2959sub button_up {
2845 my ($self, $ev, $x, $y) = @_; 2960 my ($self, $ev, $x, $y) = @_;
2846 2961
… …
2848 undef $GRAB; 2963 undef $GRAB;
2849 $self->hide; 2964 $self->hide;
2850 2965
2851 $self->_emit ("popdown"); 2966 $self->_emit ("popdown");
2852 $self->{hover}[1]->() if $self->{hover}; 2967 $self->{hover}[1]->() if $self->{hover};
2968 } else {
2969 return 0
2970 }
2971
2853 } 2972 1
2854} 2973}
2855 2974
2856############################################################################# 2975#############################################################################
2857 2976
2858package CFClient::UI::Statusbox; 2977package CFClient::UI::Multiplexer;
2859 2978
2860our @ISA = CFClient::UI::VBox::; 2979our @ISA = CFClient::UI::Container::;
2861 2980
2862sub new { 2981sub new {
2863 my $class = shift; 2982 my $class = shift;
2864 2983
2865 $class->SUPER::new ( 2984 my $self = $class->SUPER::new (
2985 @_,
2986 );
2987
2988 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} };
2990
2991 $self
2992}
2993
2994sub add {
2995 my ($self, @widgets) = @_;
2996
2997 $self->SUPER::add (@widgets);
2998
2999 $self->{current} = $self->{children}[0]
3000 if @{ $self->{children} };
3001}
3002
3003sub set_current_page {
3004 my ($self, $page_or_widget) = @_;
3005
3006 my $widget = ref $page_or_widget
3007 ? $page_or_widget
3008 : $self->{children}[$page_or_widget];
3009
3010 $self->{current} = $widget;
3011 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3012
3013 $self->_emit (page_changed => $self->{current});
3014
3015 $self->realloc;
3016}
3017
3018sub visible_children {
3019 $_[0]{current}
3020}
3021
3022sub size_request {
3023 my ($self) = @_;
3024
3025 $self->{current}->size_request
3026}
3027
3028sub size_allocate {
3029 my ($self, $w, $h) = @_;
3030
3031 $self->{current}->configure (0, 0, $w, $h);
3032}
3033
3034sub _draw {
3035 my ($self) = @_;
3036
3037 $self->{current}->draw;
3038}
3039
3040#############################################################################
3041
3042package CFClient::UI::Notebook;
3043
3044our @ISA = CFClient::UI::VBox::;
3045
3046sub new {
3047 my $class = shift;
3048
3049 my $self = $class->SUPER::new (
3050 buttonbar => (new CFClient::UI::Buttonbar),
3051 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3052 # filter => # will be put between multiplexer and $self
3053 @_,
3054 );
3055
3056 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3057 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3058
3059 $self
3060}
3061
3062sub add {
3063 my ($self, $title, $widget, $tooltip) = @_;
3064
3065 Scalar::Util::weaken $self;
3066
3067 $self->{buttonbar}->add (new CFClient::UI::Button
3068 markup => $title,
3069 tooltip => $tooltip,
3070 on_activate => sub { $self->set_current_page ($widget) },
3071 );
3072
3073 $self->{multiplexer}->add ($widget);
3074}
3075
3076sub set_current_page {
3077 my ($self, $page) = @_;
3078
3079 $self->{multiplexer}->set_current_page ($page);
3080 $self->_emit (page_changed => $self->{multiplexer}{current});
3081}
3082
3083#############################################################################
3084
3085package CFClient::UI::Statusbox;
3086
3087our @ISA = CFClient::UI::VBox::;
3088
3089sub new {
3090 my $class = shift;
3091
3092 my $self = $class->SUPER::new (
2866 fontsize => 0.8, 3093 fontsize => 0.8,
2867 @_, 3094 @_,
2868 ) 3095 );
3096
3097 Scalar::Util::weaken (my $this = $self);
3098
3099 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3100
3101 $self
2869} 3102}
2870 3103
2871sub reorder { 3104sub reorder {
2872 my ($self) = @_; 3105 my ($self) = @_;
2873 my $NOW = time; 3106 my $NOW = Time::HiRes::time;
3107
3108 # freeze display when hovering over any label
3109 return if $CFClient::UI::TOOLTIP->{owner}
3110 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3111 values %{ $self->{item} };
2874 3112
2875 while (my ($k, $v) = each %{ $self->{item} }) { 3113 while (my ($k, $v) = each %{ $self->{item} }) {
2876 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3114 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2877 } 3115 }
2878 3116
… …
2881 my @items = sort { 3119 my @items = sort {
2882 $a->{pri} <=> $b->{pri} 3120 $a->{pri} <=> $b->{pri}
2883 or $b->{id} <=> $a->{id} 3121 or $b->{id} <=> $a->{id}
2884 } values %{ $self->{item} }; 3122 } values %{ $self->{item} };
2885 3123
3124 $self->{timer}->interval (1);
3125
2886 my $count = 10 + 1; 3126 my $count = 10 + 1;
2887 for my $item (@items) { 3127 for my $item (@items) {
2888 last unless --$count; 3128 last unless --$count;
2889 3129
2890 push @widgets, $item->{label} ||= do { 3130 my $label = $item->{label} ||= do {
2891 # TODO: doesn't handle markup well (read as: at all) 3131 # TODO: doesn't handle markup well (read as: at all)
2892 my $short = $item->{count} > 1 3132 my $short = $item->{count} > 1
2893 ? "<b>$item->{count} ×</b> $item->{text}" 3133 ? "<b>$item->{count} ×</b> $item->{text}"
2894 : $item->{text}; 3134 : $item->{text};
2895 3135
… …
2903 tooltip => $item->{tooltip}, 3143 tooltip => $item->{tooltip},
2904 tooltip_font => $::FONT_PROP, 3144 tooltip_font => $::FONT_PROP,
2905 tooltip_width => 0.67, 3145 tooltip_width => 0.67,
2906 fontsize => $item->{fontsize} || $self->{fontsize}, 3146 fontsize => $item->{fontsize} || $self->{fontsize},
2907 max_w => $::WIDTH * 0.44, 3147 max_w => $::WIDTH * 0.44,
2908 fg => $item->{fg}, 3148 fg => [@{ $item->{fg} }],
2909 can_events => 1, 3149 can_events => 1,
2910 can_hover => 1 3150 can_hover => 1
2911 }; 3151 };
3152
3153 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3154 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3155 $label->update;
3156 $label->set_max_size (undef, $label->{req_h} * $diff)
3157 if $diff < 1;
3158 $self->{timer}->interval (1/30);
3159 } else {
3160 $label->{fg}[3] = $item->{fg}[3] || 1;
3161 }
3162
3163 push @widgets, $label;
2912 } 3164 }
2913 3165
2914 $self->clear; 3166 $self->clear;
2915 $self->SUPER::add (reverse @widgets); 3167 $self->SUPER::add (reverse @widgets);
2916} 3168}
… …
2921 $text =~ s/^\s+//; 3173 $text =~ s/^\s+//;
2922 $text =~ s/\s+$//; 3174 $text =~ s/\s+$//;
2923 3175
2924 return unless $text; 3176 return unless $text;
2925 3177
2926 my $timeout = time + ((delete $arg{timeout}) || 60); 3178 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2927 3179
2928 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3180 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2929 3181
2930 if (my $item = $self->{item}{$group}) { 3182 if (my $item = $self->{item}{$group}) {
2931 if ($item->{text} eq $text) { 3183 if ($item->{text} eq $text) {
… …
2961 3213
2962 $self->reorder; 3214 $self->reorder;
2963 $self->SUPER::reconfigure; 3215 $self->SUPER::reconfigure;
2964} 3216}
2965 3217
3218sub DESTROY {
3219 my ($self) = @_;
3220
3221 $self->{timer}->cancel;
3222
3223 $self->SUPER::DESTROY;
3224}
3225
2966############################################################################# 3226#############################################################################
2967 3227
2968package CFClient::UI::Inventory; 3228package CFClient::UI::Inventory;
2969 3229
2970our @ISA = CFClient::UI::ScrolledWindow::; 3230our @ISA = CFClient::UI::ScrolledWindow::;
2971 3231
2972sub new { 3232sub new {
2973 my $class = shift; 3233 my $class = shift;
2974 3234
2975 my $self = $class->SUPER::new ( 3235 my $self = $class->SUPER::new (
2976 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3236 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2977 @_, 3237 @_,
2978 ); 3238 );
2979 3239
2980 $self 3240 $self
2981} 3241}
2982 3242
2983sub set_items { 3243sub set_items {
2984 my ($self, $items) = @_; 3244 my ($self, $items) = @_;
2985 3245
2986 $self->{scrolled}->clear; 3246 $self->{child}->clear;
2987 return unless $items; 3247 return unless $items;
2988 3248
2989 my @items = sort { 3249 my @items = sort {
2990 ($a->{type} <=> $b->{type}) 3250 ($a->{type} <=> $b->{type})
2991 or ($a->{name} cmp $b->{name}) 3251 or ($a->{name} cmp $b->{name})
… …
2995 3255
2996 my $row = 0; 3256 my $row = 0;
2997 for my $item (@items) { 3257 for my $item (@items) {
2998 CFClient::Item::update_widgets $item; 3258 CFClient::Item::update_widgets $item;
2999 3259
3000 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3260 $self->{child}->add (0, $row, $item->{face_widget});
3001 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3261 $self->{child}->add (1, $row, $item->{desc_widget});
3002 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3262 $self->{child}->add (2, $row, $item->{weight_widget});
3003 3263
3004 $row++; 3264 $row++;
3005 } 3265 }
3006} 3266}
3007 3267
… …
3105 $rec = $::CONN->stop_record if $::CONN; 3365 $rec = $::CONN->stop_record if $::CONN;
3106 return unless ref $rec eq 'ARRAY'; 3366 return unless ref $rec eq 'ARRAY';
3107 $self->set_command_list ($rec); 3367 $self->set_command_list ($rec);
3108} 3368}
3109 3369
3110# if $commit is true, the binding will be set after the user entered a key combo 3370
3371sub ask_for_bind_and_commit {
3372 my ($self) = @_;
3373 $self->ask_for_bind (1);
3374}
3375
3111sub ask_for_bind { 3376sub ask_for_bind {
3112 my ($self, $commit) = @_; 3377 my ($self, $commit) = @_;
3113 3378
3114 CFClient::Binder::open_binding_dialog (sub { 3379 CFClient::Binder::open_binding_dialog (sub {
3115 my ($mod, $sym) = @_; 3380 my ($mod, $sym) = @_;
… …
3199 3464
3200############################################################################# 3465#############################################################################
3201 3466
3202package CFClient::UI::SpellList; 3467package CFClient::UI::SpellList;
3203 3468
3204our @ISA = CFClient::UI::FancyFrame::; 3469our @ISA = CFClient::UI::Table::;
3205 3470
3206sub new { 3471sub new {
3207 my $class = shift; 3472 my $class = shift;
3208 3473
3209 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3474 my $self = $class->SUPER::new (
3210 3475 binding => [],
3211 $self->add (new CFClient::UI::ScrolledWindow 3476 commands => [],
3212 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3477 @_,
3213 3478 )
3214 $self;
3215} 3479}
3216 3480
3217# XXX: Do sorting? Argl... 3481# XXX: Do sorting? Argl...
3218sub add_spell { 3482sub add_spell {
3219 my ($self, $spell) = @_; 3483 my ($self, $spell) = @_;
3220 $self->{spells}->{$spell->{name}} = $spell; 3484 $self->{spells}->{$spell->{name}} = $spell;
3221 3485
3222 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face 3486 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223 face => $spell->{face}, 3487 face => $spell->{face},
3224 can_hover => 1, 3488 can_hover => 1,
3225 can_events => 1, 3489 can_events => 1,
3226 tooltip => $spell->{message}); 3490 tooltip => $spell->{message});
3227 3491
3228 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label 3492 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229 text => $spell->{name}, 3493 text => $spell->{name},
3230 can_hover => 1, 3494 can_hover => 1,
3231 can_events => 1, 3495 can_events => 1,
3232 tooltip => $spell->{message}, 3496 tooltip => $spell->{message},
3233 expand => 1); 3497 expand => 1);
3234 3498
3235 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label 3499 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236 text => (sprintf "lvl: %2d sp: %2d dmg: %2d", 3500 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}), 3501 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3238 expand => 1); 3502 expand => 1);
3239 3503
3240 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button 3504 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241 text => "bind to key", 3505 text => "bind to key",
3242 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); 3506 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243} 3507}
3244 3508
3245sub rebuild_spell_list { 3509sub rebuild_spell_list {
… …
3258 3522
3259package CFClient::UI::Root; 3523package CFClient::UI::Root;
3260 3524
3261our @ISA = CFClient::UI::Container::; 3525our @ISA = CFClient::UI::Container::;
3262 3526
3527use List::Util qw(min max);
3528
3263use CFClient::OpenGL; 3529use CFClient::OpenGL;
3264 3530
3265sub new { 3531sub new {
3266 my $class = shift; 3532 my $class = shift;
3267 3533
… …
3372 $_->() 3638 $_->()
3373 for values %{delete $self->{refresh_hook}}; 3639 for values %{delete $self->{refresh_hook}};
3374 } 3640 }
3375 3641
3376 if ($self->{realloc}) { 3642 if ($self->{realloc}) {
3643 my %queue;
3377 my @queue; 3644 my @queue;
3645 my $widget;
3378 3646
3647 outer:
3379 while () { 3648 while () {
3380 if ($self->{realloc}) { 3649 if (my $realloc = delete $self->{realloc}) {
3381 #TODO use array-of-depth approach 3650 for $widget (values %$realloc) {
3651 $widget->{visible} or next; # do not resize invisible widgets
3382 3652
3383 use sort 'stable'; 3653 $queue{$widget+0}++ and next; # duplicates are common
3384 3654
3385 @queue = sort { $a->{visible} <=> $b->{visible} } 3655 push @{ $queue[$widget->{visible}] }, $widget;
3386 @queue, values %{delete $self->{realloc}}; 3656 }
3387 } 3657 }
3388 3658
3659 while () {
3660 @queue or last outer;
3661
3389 my $widget = pop @queue || last; 3662 $widget = pop @{ $queue[-1] || [] }
3663 and last;
3664
3665 pop @queue;
3666 }
3390 3667
3391 $widget->{visible} or last; # do not resize invisible widgets 3668 delete $queue{$widget+0};
3392 3669
3393 my ($w, $h) = $widget->size_request; 3670 my ($w, $h) = $widget->size_request;
3394 3671
3395 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3672 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3396 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3673 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3674
3675 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3676 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3397 3677
3398 $w = $widget->{force_w} if exists $widget->{force_w}; 3678 $w = $widget->{force_w} if exists $widget->{force_w};
3399 $h = $widget->{force_h} if exists $widget->{force_h}; 3679 $h = $widget->{force_h} if exists $widget->{force_h};
3400 3680
3401 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3681 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3404 $widget->{req_h} = $h; 3684 $widget->{req_h} = $h;
3405 3685
3406 $self->{size_alloc}{$widget+0} = $widget; 3686 $self->{size_alloc}{$widget+0} = $widget;
3407 3687
3408 if (my $parent = $widget->{parent}) { 3688 if (my $parent = $widget->{parent}) {
3409 $self->{realloc}{$parent+0} = $parent; 3689 $self->{realloc}{$parent+0} = $parent
3410 #unshift @queue, $parent; 3690 unless $queue{$parent+0};
3691
3411 $parent->{force_size_alloc} = 1; 3692 $parent->{force_size_alloc} = 1;
3412 $self->{size_alloc}{$parent+0} = $parent; 3693 $self->{size_alloc}{$parent+0} = $parent;
3413 } 3694 }
3414 } 3695 }
3415 3696
… …
3431 3712
3432 $w = int $w + 0.5; 3713 $w = int $w + 0.5;
3433 $h = int $h + 0.5; 3714 $h = int $h + 0.5;
3434 3715
3435 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3716 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3717 $widget->{old_w} = $widget->{w};
3718 $widget->{old_h} = $widget->{h};
3719
3436 $widget->{w} = $w; 3720 $widget->{w} = $w;
3437 $widget->{h} = $h; 3721 $widget->{h} = $h;
3438 3722
3439 $widget->emit (size_allocate => $w, $h); 3723 $widget->emit (size_allocate => $w, $h);
3440 } 3724 }
… …
3455 glLoadIdentity; 3739 glLoadIdentity;
3456 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3740 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3457 glMatrixMode GL_MODELVIEW; 3741 glMatrixMode GL_MODELVIEW;
3458 glLoadIdentity; 3742 glLoadIdentity;
3459 3743
3744 {
3745 package CFClient::UI::Base;
3746
3747 ($draw_x, $draw_y, $draw_w, $draw_h) =
3748 (0, 0, $self->{w}, $self->{h});
3749 }
3750
3460 $self->_draw; 3751 $self->_draw;
3461} 3752}
3462 3753
3463############################################################################# 3754#############################################################################
3464 3755

Diff Legend

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