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.141 by root, Thu Apr 20 07:12:57 2006 UTC vs.
Revision 1.167 by elmex, Mon Apr 24 08:44:23 2006 UTC

… …
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $ROOT; 12our $ROOT;
13our $TOOLTIP;
13our $BUTTON_STATE; 14our $BUTTON_STATE;
15
16sub check_tooltip {
17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show;
31 }
32
33 return;
34 }
35 }
36 }
37
38 $TOOLTIP->hide;
39 delete $TOOLTIP->{owner};
40}
14 41
15# class methods for events 42# class methods for events
16sub feed_sdl_key_down_event { 43sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
45 if $FOCUS;
18} 46}
19 47
20sub feed_sdl_key_up_event { 48sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
50 if $FOCUS;
22} 51}
23 52
24sub feed_sdl_button_down_event { 53sub feed_sdl_button_down_event {
25 my ($ev) = @_; 54 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 55 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 57 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 58 my $widget = $ROOT->find_widget ($x, $y);
30 59
31 $GRAB = $widget; 60 $GRAB = $widget;
32 $GRAB->update if $GRAB; 61 $GRAB->update if $GRAB;
62
63 check_tooltip;
33 } 64 }
34 65
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 66 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 67
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 68 if ($GRAB) {
69 ($x, $y) = $GRAB->coord2local ($x, $y);
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
38} 72}
39 73
40sub feed_sdl_button_up_event { 74sub feed_sdl_button_up_event {
41 my ($ev) = @_; 75 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 76 my ($x, $y) = ($ev->{x}, $ev->{y});
43 77
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 78 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 79
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 81
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 82 if ($GRAB) {
83 ($x, $y) = $GRAB->coord2local ($x, $y);
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
49 86
50 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 88 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 89 $grab->update if $grab;
53 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
91
92 check_tooltip;
54 } 93 }
55} 94}
56 95
57sub feed_sdl_motion_event { 96sub feed_sdl_motion_event {
58 my ($ev) = @_; 97 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 102 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 103 my $hover = $HOVER; $HOVER = $widget;
65 104
66 $hover->update if $hover && $hover->{can_hover}; 105 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 106 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 107
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 108 check_tooltip;
109 }
110
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
114 }
71} 115}
72 116
73# convert position array to integers 117# convert position array to integers
74sub harmonize { 118sub harmonize {
75 my ($vals) = @_; 119 my ($vals) = @_;
… …
93 137
94sub new { 138sub new {
95 my $class = shift; 139 my $class = shift;
96 140
97 my $self = bless { 141 my $self = bless {
98 x => 0, 142 x => 0,
99 y => 0, 143 y => 0,
100 z => 0, 144 z => 0,
145 can_events => 1,
101 @_ 146 @_
102 }, $class; 147 }, $class;
103 148
104 for (keys %$self) { 149 for (keys %$self) {
105 if (/^connect_(.*)$/) { 150 if (/^connect_(.*)$/) {
… …
108 } 153 }
109 154
110 $self 155 $self
111} 156}
112 157
158sub destroy {
159 my ($self) = @_;
160
161 $self->hide;
162 %$self = ();
163}
164
113sub show { 165sub show {
114 my ($self) = @_; 166 my ($self) = @_;
115 167
116 return if $self->{parent}; 168 return if $self->{parent};
117 169
… …
119} 171}
120 172
121sub hide { 173sub hide {
122 my ($self) = @_; 174 my ($self) = @_;
123 175
124 return unless $self->{parent}; 176 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self;
125 178
126 $self->{parent}->remove ($self); 179 $self->{parent}->remove ($self)
180 if $self->{parent};
127} 181}
128 182
129sub move { 183sub move {
130 my ($self, $x, $y, $z) = @_; 184 my ($self, $x, $y, $z) = @_;
131 185
… …
134 $self->{z} = $z if defined $z; 188 $self->{z} = $z if defined $z;
135 189
136 $self->update; 190 $self->update;
137} 191}
138 192
139sub needs_redraw { 193sub set_size {
140 0 194 my ($self, $w, $h) = @_;
195
196 $self->{user_w} = $w;
197 $self->{user_h} = $h;
198
199 $self->check_size;
141} 200}
142 201
143sub size_request { 202sub size_request {
144 require Carp; 203 require Carp;
145 Carp::confess "size_request is abtract"; 204 Carp::confess "size_request is abstract";
146} 205}
147 206
148sub configure { 207sub configure {
149 my ($self, $x, $y, $w, $h) = @_; 208 my ($self, $x, $y, $w, $h) = @_;
150 209
… …
152 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 211 my $w2 = List::Util::min $w, int $h * $self->{aspect};
153 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 212 my $h2 = List::Util::min $h, int $w / $self->{aspect};
154 213
155 # use alignment to adjust x, y 214 # use alignment to adjust x, y
156 215
157 $x += ($w - $w2) * 0.5; 216 $x += int +($w - $w2) * 0.5;
158 $y += ($h - $h2) * 0.5; 217 $y += int +($h - $h2) * 0.5;
159 218
160 ($w, $h) = ($w2, $h2); 219 ($w, $h) = ($w2, $h2);
161 } 220 }
162 221
163 if ($self->{x} != $x || $self->{y} != $y) { 222 if ($self->{x} != $x || $self->{y} != $y) {
… …
175 } 234 }
176} 235}
177 236
178sub size_allocate { 237sub size_allocate {
179 # nothing to be done 238 # nothing to be done
239}
240
241sub set_max_size {
242 my ($self, $w, $h) = @_;
243
244 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h;
180} 246}
181 247
182# return top left coordinates 248# return top left coordinates
183sub _topleft { 249sub _topleft {
184 my ($self, $x, $y) = @_; 250 my ($self, $x, $y) = @_;
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 333 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 334 glVertex $x , $y + $self->{h};
269 glEnd; 335 glEnd;
270 glDisable GL_BLEND; 336 glDisable GL_BLEND;
271 } 337 }
338
339 if ($ENV{PCLIENT_DEBUG}) {
340 glPushMatrix;
341 glColor 1, 1, 0, 1;
342 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
343 glBegin GL_LINE_LOOP;
344 glVertex 0 , 0;
345 glVertex $self->{w}, 0;
346 glVertex $self->{w}, $self->{h};
347 glVertex 0 , $self->{h};
348 glEnd;
349 glPopMatrix;
350 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351 }
272} 352}
273 353
274sub _draw { 354sub _draw {
275 my ($self) = @_; 355 my ($self) = @_;
276 356
277 warn "no draw defined for $self\n"; 357 warn "no draw defined for $self\n";
278} 358}
279 359
280sub find_widget { 360sub find_widget {
281 my ($self, $x, $y) = @_; 361 my ($self, $x, $y) = @_;
362
363 return () unless $self->{can_events};
282 364
283 return $self 365 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 366 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 367 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286 368
… …
294} 376}
295 377
296sub check_size { 378sub check_size {
297 my ($self) = @_; 379 my ($self) = @_;
298 380
299 my ($w, $h) = $self->size_request; 381 $self->{parent}
382 or return 1;
300 383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
301 if ($w != $self->{req_w} || $h != $self->{req_h}) { 388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
302 $self->{req_w} = $w; 389 $self->{req_w} = $w;
303 $self->{req_h} = $h; 390 $self->{req_h} = $h;
304 391
305 $self->{parent}->check_size 392 $self->{parent}->check_size
306 if $self->{parent}; 393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
307 } 401 }
308} 402}
309 403
310sub update { 404sub update {
311 my ($self) = @_; 405 my ($self) = @_;
… …
321} 415}
322 416
323sub emit { 417sub emit {
324 my ($self, $signal, @args) = @_; 418 my ($self, $signal, @args) = @_;
325 419
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
327 $cb->($self, @args);
328 }
329} 421}
330 422
331sub DESTROY { 423sub DESTROY {
332 my ($self) = @_; 424 my ($self) = @_;
333 425
… …
378 470
379package CFClient::UI::Empty; 471package CFClient::UI::Empty;
380 472
381our @ISA = CFClient::UI::Base::; 473our @ISA = CFClient::UI::Base::;
382 474
475sub new {
476 my ($class, %arg) = @_;
477 $class->SUPER::new (can_events => 0, %arg);
478}
479
383sub size_request { 480sub size_request {
384 (0, 0) 481 (0, 0)
385} 482}
386 483
387sub draw { } 484sub draw { }
… …
395sub new { 492sub new {
396 my ($class, %arg) = @_; 493 my ($class, %arg) = @_;
397 494
398 my $children = delete $arg{children} || []; 495 my $children = delete $arg{children} || [];
399 496
400 my $self = $class->SUPER::new (children => [], %arg); 497 my $self = $class->SUPER::new (
498 children => [],
499 can_events => 0,
500 %arg,
501 );
401 $self->add ($_) for @$children; 502 $self->add ($_) for @$children;
402 503
403 $self 504 $self
404} 505}
405 506
… …
420 521
421sub remove { 522sub remove {
422 my ($self, $child) = @_; 523 my ($self, $child) = @_;
423 524
424 delete $child->{parent}; 525 delete $child->{parent};
526 $child->hide;
425 527
426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427 529
428 $self->check_size; 530 $self->check_size;
531 $self->update;
532}
533
534sub clear {
535 my ($self) = @_;
536
537 my $children = delete $self->{children};
538 $self->{children} = [];
539
540 for (@$children) {
541 delete $_->{parent};
542 $_->hide;
543 }
429} 544}
430 545
431sub find_widget { 546sub find_widget {
432 my ($self, $x, $y) = @_; 547 my ($self, $x, $y) = @_;
433 548
… …
561sub new { die } 676sub new { die }
562 677
563sub size_request { 678sub size_request {
564 my ($self) = @_; 679 my ($self) = @_;
565 680
566 @$self{qw(child_w child_h)} = $self->child->size_request; 681 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
567 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 682 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
568 683
569 @$self{qw(child_w child_h)} 684 @$self{qw(child_w child_h)}
570} 685}
571 686
… …
581package CFClient::UI::Frame; 696package CFClient::UI::Frame;
582 697
583our @ISA = CFClient::UI::Bin::; 698our @ISA = CFClient::UI::Bin::;
584 699
585use CFClient::OpenGL; 700use CFClient::OpenGL;
586
587sub size_request {
588 my ($self) = @_;
589 my $chld = $self->child
590 or return (0, 0);
591
592 $chld->move (2, 2);
593
594 map { $_ + 4 } $chld->size_request;
595}
596
597sub size_allocate {
598 my ($self, $x, $y, $w, $h) = @_;
599
600 $self->child->configure (2, 2, $w - 4, $h - 4);
601}
602
603sub _draw {
604 my ($self) = @_;
605
606 my $chld = $self->child;
607
608 my ($w, $h) = $chld->size_request;
609
610 glBegin GL_QUADS;
611 glColor 0, 0, 0;
612 glVertex 0 , 0;
613 glVertex 0 , $h + 4;
614 glVertex $w + 4 , $h + 4;
615 glVertex $w + 4 , 0;
616 glEnd;
617
618 $chld->draw;
619}
620
621#############################################################################
622
623package CFClient::UI::FancyFrame;
624
625our @ISA = CFClient::UI::Bin::;
626
627use CFClient::OpenGL;
628
629my @tex =
630 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
631 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
632 701
633sub new { 702sub new {
634 my $class = shift; 703 my $class = shift;
635
636 # TODO: user_x, user_y, overwrite moveto?
637 704
638 my $self = $class->SUPER::new ( 705 my $self = $class->SUPER::new (
639 bg => [1, 1, 1, 1], 706 bg => [1, 1, 1, 1],
640 border_bg => [1, 1, 1, 1], 707 border_bg => [1, 1, 1, 1],
641 border => 0.8, 708 border => 0.8,
642 @_ 709 @_
643 ); 710 );
644 711
712 $self
713}
714
715sub _draw {
716 my ($self) = @_;
717
718 my ($w, $h) = ($self->{w}, $self->{h});
719
720 glEnable GL_BLEND;
721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
722 glEnable GL_TEXTURE_2D;
723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
724
725# glBegin GL_QUADS;
726# glColor 0, 0, 0, 0;
727# glVertex 0 , 0;
728# glVertex 0 , $h;
729# glVertex $w, $h;
730# glVertex $w, 0;
731# glEnd;
732
733
734 $self->child->draw;
735 glDisable GL_BLEND;
736 glDisable GL_TEXTURE_2D;
737}
738
739#############################################################################
740
741package CFClient::UI::FancyFrame;
742
743our @ISA = CFClient::UI::Bin::;
744
745use CFClient::OpenGL;
746
747my @tex =
748 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
749 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
750
751sub new {
752 my $class = shift;
753
754 # TODO: user_x, user_y, overwrite moveto?
755
756 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1],
759 border => 0.8,
760 can_events => 1,
761 @_
762 );
763
645 $self->{title} &&= new CFClient::UI::Label 764 $self->{title} &&= new CFClient::UI::Label
646 align => 0, 765 align => 0,
647 valign => 1, 766 valign => 1,
648 text => $self->{title}, 767 text => $self->{title},
649 fontsize => 1; 768 fontsize => 1;
… …
656} 775}
657 776
658sub size_request { 777sub size_request {
659 my ($self) = @_; 778 my ($self) = @_;
660 779
661 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
662
663 my ($w, $h) = $self->SUPER::size_request; 780 my ($w, $h) = $self->SUPER::size_request;
664 781
665 ( 782 (
666 $w + $self->border * 2, 783 $w + $self->border * 2,
667 $h + $self->border * 2, 784 $h + $self->border * 2,
… …
799 916
800# TODO: move to container class maybe? send childs a signal on removal? 917# TODO: move to container class maybe? send childs a signal on removal?
801sub clear { 918sub clear {
802 my ($self) = @_; 919 my ($self) = @_;
803 920
804 delete $self->{children}; 921 my $children = delete $self->{children};
922
923 for (grep $_, map @$_, grep $_, @$children) {
924 delete $_->{parent};
925 $_->hide;
926 }
927
805 $self->update; 928 $self->update;
806} 929}
807 930
808sub get_wh { 931sub get_wh {
809 my ($self) = @_; 932 my ($self) = @_;
… …
815 or next; 938 or next;
816 939
817 for my $x (0 .. $#$row) { 940 for my $x (0 .. $#$row) {
818 my $widget = $row->[$x] 941 my $widget = $row->[$x]
819 or next; 942 or next;
820 my ($w, $h) = $widget->size_request; 943 my ($w, $h) = @$widget{qw(req_w req_h)};
821 944
822 $w[$x] = max $w[$x], $w; 945 $w[$x] = max $w[$x], $w;
823 $h[$y] = max $h[$y], $h; 946 $h[$y] = max $h[$y], $h;
824 } 947 }
825 } 948 }
… …
930 1053
931 ($h, $w) = ($w, $h); 1054 ($h, $w) = ($w, $h);
932 1055
933 my $children = $self->{children}; 1056 my $children = $self->{children};
934 1057
935 my @h = map +($_->size_request)[0], @$children; 1058 my @h = map $_->{req_w}, @$children;
936 1059
937 my $req_h = List::Util::sum @h; 1060 my $req_h = List::Util::sum @h;
938 1061
939 if ($req_h > $h) { 1062 if ($req_h > $h) {
940 # ah well, not enough space 1063 # ah well, not enough space
… …
988sub size_allocate { 1111sub size_allocate {
989 my ($self, $w, $h) = @_; 1112 my ($self, $w, $h) = @_;
990 1113
991 my $children = $self->{children}; 1114 my $children = $self->{children};
992 1115
993 my @h = map +($_->size_request)[1], @$children; 1116 my @h = map $_->{req_h}, @$children;
994 1117
995 my $req_h = List::Util::sum @h; 1118 my $req_h = List::Util::sum @h;
996 1119
997 if ($req_h > $h) { 1120 if ($req_h > $h) {
998 # ah well, not enough space 1121 # ah well, not enough space
… …
1032 1155
1033sub new { 1156sub new {
1034 my ($class, %arg) = @_; 1157 my ($class, %arg) = @_;
1035 1158
1036 my $self = $class->SUPER::new ( 1159 my $self = $class->SUPER::new (
1037 fg => [1, 1, 1], 1160 fg => [1, 1, 1],
1161 #font => default_font
1038 fontsize => 1, 1162 fontsize => 1,
1039 text => "", 1163 text => "",
1040 align => -1, 1164 align => -1,
1041 valign => -1, 1165 valign => -1,
1042 padding => 2, 1166 padding => 2,
1043 layout => new CFClient::Layout, 1167 layout => new CFClient::Layout,
1168 can_events => 0,
1044 %arg 1169 %arg
1045 ); 1170 );
1046 1171
1047 if (exists $self->{template}) { 1172 if (exists $self->{template}) {
1048 my $layout = new CFClient::Layout; 1173 my $layout = new CFClient::Layout;
… …
1054 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1179 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1055 1180
1056 $self 1181 $self
1057} 1182}
1058 1183
1059sub escape_text { 1184sub escape {
1060 local $_ = $_[1]; 1185 local $_ = $_[1];
1061 1186
1062 s/&/&amp;/g; 1187 s/&/&amp;/g;
1063 s/>/&gt;/g; 1188 s/>/&gt;/g;
1064 s/</&lt;/g; 1189 s/</&lt;/g;
… …
1070 my ($self, $text) = @_; 1195 my ($self, $text) = @_;
1071 1196
1072 $self->{layout}->set_text ($text); 1197 $self->{layout}->set_text ($text);
1073 1198
1074 delete $self->{texture}; 1199 delete $self->{texture};
1200 $self->check_size;
1075 $self->update; 1201 $self->update;
1076} 1202}
1077 1203
1078sub set_markup { 1204sub set_markup {
1079 my ($self, $markup) = @_; 1205 my ($self, $markup) = @_;
1080 1206
1081 $self->{layout}->set_markup ($markup); 1207 $self->{layout}->set_markup ($markup);
1082 1208
1083 delete $self->{texture}; 1209 delete $self->{texture};
1210 $self->check_size;
1084 $self->update; 1211 $self->update;
1085} 1212}
1086 1213
1087sub size_request { 1214sub size_request {
1088 my ($self) = @_; 1215 my ($self) = @_;
1089 1216
1090 $self->{layout}->set_width; 1217 $self->{layout}->set_font ($self->{font}) if $self->{font};
1218 $self->{layout}->set_width ($self->{max_w} || -1);
1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1219 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1092 1220
1093 my ($w, $h) = $self->{layout}->size; 1221 my ($w, $h) = $self->{layout}->size;
1094 1222
1095 if (exists $self->{template}) { 1223 if (exists $self->{template}) {
1224 $self->{template}->set_font ($self->{font}) if $self->{font};
1096 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1225 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1097 1226
1098 my ($w2, $h2) = $self->{template}->size; 1227 my ($w2, $h2) = $self->{template}->size;
1099 1228
1100 $w = List::Util::max $w, $w2; 1229 $w = List::Util::max $w, $w2;
… …
1111 my ($self, $w, $h) = @_; 1240 my ($self, $w, $h) = @_;
1112 1241
1113 delete $self->{texture}; 1242 delete $self->{texture};
1114} 1243}
1115 1244
1245sub set_fontsize {
1246 my ($self, $fontsize) = @_;
1247
1248 $self->{fontsize} = $fontsize;
1249 delete $self->{texture};
1250 $self->check_size;
1251 $self->update;
1252}
1253
1116sub _draw { 1254sub _draw {
1117 my ($self) = @_; 1255 my ($self) = @_;
1118 1256
1119 my $tex = $self->{texture} ||= do { 1257 my $tex = $self->{texture} ||= do {
1258 $self->{layout}->set_font ($self->{font}) if $self->{font};
1120 $self->{layout}->set_width ($self->{w}); 1259 $self->{layout}->set_width ($self->{w});
1121 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1260 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1122 new_from_layout CFClient::Texture $self->{layout} 1261 new_from_layout CFClient::Texture $self->{layout}
1123 }; 1262 };
1124 1263
… …
1157 1296
1158sub new { 1297sub new {
1159 my $class = shift; 1298 my $class = shift;
1160 1299
1161 $class->SUPER::new ( 1300 $class->SUPER::new (
1162 fg => [1, 1, 1], 1301 fg => [1, 1, 1],
1163 bg => [0, 0, 0, 0.2], 1302 bg => [0, 0, 0, 0.2],
1164 active_bg => [1, 1, 1, 0.5], 1303 active_bg => [1, 1, 1, 0.5],
1165 active_fg => [0, 0, 0], 1304 active_fg => [0, 0, 0],
1166 can_hover => 1, 1305 can_hover => 1,
1167 can_focus => 1, 1306 can_focus => 1,
1168 valign => 0, 1307 valign => 0,
1308 can_events => 1,
1169 @_ 1309 @_
1170 ) 1310 )
1171} 1311}
1172 1312
1173sub _set_text { 1313sub _set_text {
… …
1201} 1341}
1202 1342
1203sub size_allocate { 1343sub size_allocate {
1204 my ($self, $w, $h) = @_; 1344 my ($self, $w, $h) = @_;
1205 1345
1206 $self->_set_text ($self->{text}); 1346 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1207} 1347}
1208 1348
1209sub set_text { 1349sub set_text {
1210 my ($self, $text) = @_; 1350 my ($self, $text) = @_;
1211 1351
… …
1326 my ($self, $ev) = @_; 1466 my ($self, $ev) = @_;
1327 1467
1328 my $sym = $ev->{sym}; 1468 my $sym = $ev->{sym};
1329 1469
1330 if ($sym == 13) { 1470 if ($sym == 13) {
1471 unshift @{$self->{history}},
1472 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1;
1331 $self->emit (activate => $self->get_text); 1474 $self->emit (activate => $txt);
1332 $self->update; 1475 $self->update;
1476
1477 } elsif ($sym == CFClient::SDLK_UP) {
1478 if ($self->{history_pointer} < 0) {
1479 $self->{history_saveback} = $self->get_text;
1480 }
1481 $self->{history_pointer}++;
1482 if ($self->{history_pointer} >= @{$self->{history}}) {
1483 $self->{history_pointer} = @{$self->{history}} - 1;
1484 }
1485 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1486
1487 } elsif ($sym == CFClient::SDLK_DOWN) {
1488 $self->{history_pointer}--;
1489 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490
1491 if ($self->{history_pointer} >= 0) {
1492 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1493 } else {
1494 $self->set_text ($self->{history_saveback});
1495 }
1333 1496
1334 } else { 1497 } else {
1335 $self->SUPER::key_down ($ev); 1498 $self->SUPER::key_down ($ev);
1336 } 1499 }
1337 1500
… …
1344our @ISA = CFClient::UI::Label::; 1507our @ISA = CFClient::UI::Label::;
1345 1508
1346use CFClient::OpenGL; 1509use CFClient::OpenGL;
1347 1510
1348my @tex = 1511my @tex =
1349 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1512 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1350 qw(b1_button_active.png); 1513 qw(b1_button_active.png);
1351 1514
1352sub new { 1515sub new {
1353 my $class = shift; 1516 my $class = shift;
1354 1517
1355 $class->SUPER::new ( 1518 $class->SUPER::new (
1356 padding => 4, 1519 padding => 4,
1357 fg => [1, 1, 1], 1520 fg => [1, 1, 1],
1358 bg => [1, 1, 1, 0.2], 1521 bg => [1, 1, 1, 0.2],
1359 active_fg => [0, 0, 1], 1522 active_fg => [0, 0, 1],
1360 can_hover => 1, 1523 can_hover => 1,
1361 align => 0, 1524 align => 0,
1362 valign => 0, 1525 valign => 0,
1526 can_events => 1,
1363 @_ 1527 @_
1364 ) 1528 )
1365} 1529}
1366 1530
1367sub button_up { 1531sub button_up {
… …
1401package CFClient::UI::CheckBox; 1565package CFClient::UI::CheckBox;
1402 1566
1403our @ISA = CFClient::UI::DrawBG::; 1567our @ISA = CFClient::UI::DrawBG::;
1404 1568
1405my @tex = 1569my @tex =
1406 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1570 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1407 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1571 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1408 1572
1409use CFClient::OpenGL; 1573use CFClient::OpenGL;
1410 1574
1411sub new { 1575sub new {
… …
1460 glDisable GL_BLEND; 1624 glDisable GL_BLEND;
1461} 1625}
1462 1626
1463############################################################################# 1627#############################################################################
1464 1628
1629package CFClient::UI::Image;
1630
1631our @ISA = CFClient::UI::Base::;
1632
1633use CFClient::OpenGL;
1634use Carp qw/confess/;
1635
1636our %loaded_images;
1637
1638sub new {
1639 my $class = shift;
1640
1641 my $self = $class->SUPER::new (can_events => 0, @_);
1642
1643 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1644
1645 $loaded_images{$self->{image}} ||=
1646 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1647
1648 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1649
1650 Scalar::Util::weaken $loaded_images{$self->{image}};
1651
1652 $self->{aspect} = $tex->{w} / $tex->{h};
1653
1654 $self
1655}
1656
1657sub size_request {
1658 my ($self) = @_;
1659
1660 ($self->{tex}->{w}, $self->{tex}->{h})
1661}
1662
1663sub _draw {
1664 my ($self) = @_;
1665
1666 my $tex = $self->{tex};
1667
1668 my ($w, $h) = ($self->{w}, $self->{h});
1669
1670 if ($self->{rot90}) {
1671 glRotate 90, 0, 0, 1;
1672 glTranslate 0, -$self->{w}, 0;
1673
1674 ($w, $h) = ($h, $w);
1675 }
1676
1677 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681
1682 $tex->draw_quad (0, 0, $w, $h);
1683
1684 glDisable GL_BLEND;
1685 glDisable GL_TEXTURE_2D;
1686}
1687
1688#############################################################################
1689
1465package CFClient::UI::VGauge; 1690package CFClient::UI::VGauge;
1466 1691
1467our @ISA = CFClient::UI::Base::; 1692our @ISA = CFClient::UI::Base::;
1693
1694use List::Util qw(min max);
1468 1695
1469use CFClient::OpenGL; 1696use CFClient::OpenGL;
1470 1697
1471my %tex = ( 1698my %tex = (
1472 food => [ 1699 food => [
1473 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1700 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1474 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1701 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1475 ], 1702 ],
1476 grace => [ 1703 grace => [
1477 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1704 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1478 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1705 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1479 ], 1706 ],
1480 hp => [ 1707 hp => [
1481 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1708 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1482 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1709 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1483 ], 1710 ],
1484 mana => [ 1711 mana => [
1485 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1712 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1486 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1713 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1487 ], 1714 ],
1488); 1715);
1489 1716
1490# eg. VGauge->new (gauge => 'food'), default gauge: food 1717# eg. VGauge->new (gauge => 'food'), default gauge: food
1491sub new { 1718sub new {
… …
1502} 1729}
1503 1730
1504sub size_request { 1731sub size_request {
1505 my ($self) = @_; 1732 my ($self) = @_;
1506 1733
1507 my $tex = $tex{$self->{type}}[0]; 1734 #my $tex = $tex{$self->{type}}[0];
1508
1509 @$tex{qw(w h)} 1735 #@$tex{qw(w h)}
1736 (0, 0)
1510} 1737}
1511 1738
1512sub set_max { 1739sub set_max {
1513 my ($self, $max) = @_; 1740 my ($self, $max) = @_;
1514 1741
… …
1529 1756
1530sub _draw { 1757sub _draw {
1531 my ($self) = @_; 1758 my ($self) = @_;
1532 1759
1533 my $tex = $tex{$self->{type}}; 1760 my $tex = $tex{$self->{type}};
1761 my ($t1, $t2, $t3) = @$tex;
1534 1762
1535 my ($w, $h) = ($self->{w}, $self->{h}); 1763 my ($w, $h) = ($self->{w}, $self->{h});
1536 1764
1765 if ($self->{vertical}) {
1766 glRotate 90, 0, 0, 1;
1767 glTranslate 0, -$self->{w}, 0;
1768
1769 ($w, $h) = ($h, $w);
1770 }
1771
1537 my $ycut = $self->{val} / ($self->{max_val} || 1); 1772 my $ycut = $self->{val} / ($self->{max_val} || 1);
1538 $ycut = 1 if $self->{val} > $self->{max_val};
1539 1773
1540 my $t1 = $tex->[0]; 1774 my $ycut1 = max 0, min 1, $ycut;
1541 my $t2 = $tex->[1]; 1775 my $ycut2 = max 0, min 1, $ycut - 1;
1776
1777 my $h1 = $self->{h} * (1 - $ycut1);
1778 my $h2 = $self->{h} * (1 - $ycut2);
1542 1779
1543 glEnable GL_BLEND; 1780 glEnable GL_BLEND;
1544 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1781 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1545 glEnable GL_TEXTURE_2D; 1782 glEnable GL_TEXTURE_2D;
1546 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1783 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1547 1784
1548 my $h1 = $self->{h} - $ycut * $self->{h};
1549 my $h2 = $ycut * $self->{h};
1550
1551 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1785 glBindTexture GL_TEXTURE_2D, $t1->{name};
1552 glBegin GL_QUADS; 1786 glBegin GL_QUADS;
1553 glTexCoord 0 , 0; glVertex 0 , 0; 1787 glTexCoord 0 , 0; glVertex 0 , 0;
1554 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1788 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1555 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1789 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1556 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1790 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1557 glEnd; 1791 glEnd;
1558 1792
1793 my $ycut1 = List::Util::min 1, $ycut;
1559 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1794 glBindTexture GL_TEXTURE_2D, $t2->{name};
1560 glBegin GL_QUADS; 1795 glBegin GL_QUADS;
1561 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1796 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1562 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1797 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1563 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1798 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1564 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1799 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1565 glEnd; 1800 glEnd;
1801
1802 if ($t3) {
1803 glBindTexture GL_TEXTURE_2D, $t3->{name};
1804 glBegin GL_QUADS;
1805 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1806 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1807 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1808 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1809 glEnd;
1810 }
1566 1811
1567 glDisable GL_BLEND; 1812 glDisable GL_BLEND;
1568 glDisable GL_TEXTURE_2D; 1813 glDisable GL_TEXTURE_2D;
1569} 1814}
1570 1815
… …
1573package CFClient::UI::Gauge; 1818package CFClient::UI::Gauge;
1574 1819
1575our @ISA = CFClient::UI::VBox::; 1820our @ISA = CFClient::UI::VBox::;
1576 1821
1577sub new { 1822sub new {
1578 my ($class, %arg) = shift; 1823 my ($class, %arg) = @_;
1579 1824
1580 my $self = $class->SUPER::new ( 1825 my $self = $class->SUPER::new (
1581 @_, 1826 tooltip => $arg{type},
1827 can_hover => 1,
1828 %arg,
1582 ); 1829 );
1583 1830
1584 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1831 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1585 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1832 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1586 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1833 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1587 1834
1588 $self 1835 $self
1836}
1837
1838sub set_fontsize {
1839 my ($self, $fsize) = @_;
1840
1841 $self->{value}->set_fontsize ($fsize);
1842 $self->{max} ->set_fontsize ($fsize);
1589} 1843}
1590 1844
1591sub set_value { 1845sub set_value {
1592 my ($self, $val, $max) = @_; 1846 my ($self, $val, $max) = @_;
1593 1847
… …
1750 2004
1751sub new { 2005sub new {
1752 my $class = shift; 2006 my $class = shift;
1753 2007
1754 my $self = $class->SUPER::new ( 2008 my $self = $class->SUPER::new (
1755 fontsize => 1, 2009 fontsize => 1,
2010 can_events => 0,
2011 #font => default_font
1756 @_, 2012 @_,
1757 2013
1758 layout => (new CFClient::Layout), 2014 layout => (new CFClient::Layout),
1759 par => [], 2015 par => [],
1760 height => 0, 2016 height => 0,
1761 children => [ 2017 children => [
1762 (new CFClient::UI::Empty expand => 1), 2018 (new CFClient::UI::Empty expand => 1),
1763 (new CFClient::UI::Slider vertical => 1), 2019 (new CFClient::UI::Slider vertical => 1),
1764 ], 2020 ],
1765 ); 2021 );
1766 2022
… …
1800sub size_allocate { 2056sub size_allocate {
1801 my ($self, $w, $h) = @_; 2057 my ($self, $w, $h) = @_;
1802 2058
1803 $self->SUPER::size_allocate ($w, $h); 2059 $self->SUPER::size_allocate ($w, $h);
1804 2060
2061 $self->{layout}->set_font ($self->{font}) if $self->{font};
1805 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2062 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1806 $self->{layout}->set_width ($self->{children}[0]{w}); 2063 $self->{layout}->set_width ($self->{children}[0]{w});
1807 2064
1808 $self->reflow; 2065 $self->reflow;
1809} 2066}
… …
1861 my $y1 = $top + $self->{h}; 2118 my $y1 = $top + $self->{h};
1862 2119
1863 my $y = 0; 2120 my $y = 0;
1864 2121
1865 my $layout = $self->{layout}; 2122 my $layout = $self->{layout};
2123
2124 $layout->set_font ($self->{font}) if $self->{font};
1866 2125
1867 for my $par (@{$self->{par}}) { 2126 for my $par (@{$self->{par}}) {
1868 my $h = $par->[0]; 2127 my $h = $par->[0];
1869 2128
1870 if ($y0 < $y + $h && $y < $y1) { 2129 if ($y0 < $y + $h && $y < $y1) {
… …
1948 2207
1949sub new { 2208sub new {
1950 my $class = shift; 2209 my $class = shift;
1951 2210
1952 my $self = $class->SUPER::new ( 2211 my $self = $class->SUPER::new (
1953 state => 0, 2212 state => 0,
1954 connect_activate => \&toggle_flopper, 2213 connect_activate => \&toggle_flopper,
1955 @_ 2214 @_
1956 ); 2215 );
1957 2216
1958 if ($self->{state}) { 2217 if ($self->{state}) {
… …
1979 $self->emit (changed => $self->{state}); 2238 $self->emit (changed => $self->{state});
1980} 2239}
1981 2240
1982############################################################################# 2241#############################################################################
1983 2242
2243package CFClient::UI::Tooltip;
2244
2245our @ISA = CFClient::UI::Bin::;
2246
2247use CFClient::OpenGL;
2248
2249sub new {
2250 my $class = shift;
2251
2252 $class->SUPER::new (
2253 @_,
2254 can_events => 0,
2255 )
2256}
2257
2258sub set_markup {
2259 my ($self, $text) = @_;
2260
2261 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2262 $self->{label}->set_markup ($text);
2263 $self->add ($self->{label});
2264}
2265
2266sub size_request {
2267 my ($self) = @_;
2268
2269 $self->child->set_max_size ($::WIDTH * 0.3);
2270
2271 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2272
2273 ($w + 4, $h + 4)
2274}
2275
2276sub size_allocate {
2277 my ($self, $w, $h) = @_;
2278
2279 $self->SUPER::size_allocate ($w - 4, $h - 4);
2280}
2281
2282sub _draw {
2283 my ($self) = @_;
2284
2285 glPushMatrix;
2286 glTranslate 0.375, 0.375;
2287
2288 my ($w, $h) = @$self{qw(w h)};
2289
2290 glColor 1, 0.8, 0.4;
2291 glBegin GL_QUADS;
2292 glVertex 0 , 0;
2293 glVertex 0 , $h;
2294 glVertex $w, $h;
2295 glVertex $w, 0;
2296 glEnd;
2297
2298 glColor 0, 0, 0;
2299 glBegin GL_LINE_LOOP;
2300 glVertex 0 , 0;
2301 glVertex 0 , $h;
2302 glVertex $w, $h;
2303 glVertex $w, 0;
2304 glEnd;
2305
2306 glPopMatrix;
2307
2308 glTranslate 2, 2;
2309 $self->SUPER::_draw;
2310}
2311
2312#############################################################################
2313
2314package CFClient::UI::Face;
2315
2316our @ISA = CFClient::UI::Base::;
2317
2318use CFClient::OpenGL;
2319
2320sub new {
2321 my $class = shift;
2322
2323 $class->SUPER::new (
2324 aspect => 1,
2325 @_,
2326 )
2327}
2328
2329sub size_request {
2330 (32, 8)
2331}
2332
2333sub draw {
2334 my ($self) = @_;
2335
2336 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2337
2338 if ($tex) {
2339 glEnable GL_BLEND;
2340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341 glEnable GL_TEXTURE_2D;
2342 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2343 glColor 1, 1, 1, 1;
2344 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2345 glDisable GL_TEXTURE_2D;
2346 glDisable GL_BLEND;
2347 }
2348}
2349
2350#############################################################################
2351
1984package CFClient::UI::Root; 2352package CFClient::UI::Root;
1985 2353
1986our @ISA = CFClient::UI::Container::; 2354our @ISA = CFClient::UI::Container::;
1987 2355
1988use CFClient::OpenGL; 2356use CFClient::OpenGL;
1989 2357
1990sub check_size { 2358sub check_size {
1991 my ($self) = @_; 2359 my ($self) = @_;
1992 2360
1993 $self->configure (0, 0, $::WITH, $::HEIGHT); 2361 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
1994} 2362}
1995 2363
1996sub size_request { 2364sub size_request {
1997 ($::WIDTH, $::HEIGHT) 2365 ($::WIDTH, $::HEIGHT)
1998} 2366}
… …
2000sub configure { 2368sub configure {
2001 my ($self, $x, $y, $w, $h) = @_; 2369 my ($self, $x, $y, $w, $h) = @_;
2002 2370
2003 $self->SUPER::configure ($x, $y, $w, $h); 2371 $self->SUPER::configure ($x, $y, $w, $h);
2004 2372
2005 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2006 for @{$self->{children}}; 2373 for my $child (@{$self->{children}}) {
2374 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2375
2376 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2377 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2378 $child->configure ($X, $Y, $W,$H);
2379 }
2007} 2380}
2008 2381
2009sub _topleft { 2382sub _topleft {
2010 my ($self, $x, $y) = @_; 2383 my ($self, $x, $y) = @_;
2011 2384
… …
2019 ::refresh (); 2392 ::refresh ();
2020} 2393}
2021 2394
2022sub add { 2395sub add {
2023 my ($self, $child) = @_; 2396 my ($self, $child) = @_;
2397
2398 # integerize window positions
2399 $child->{x} = int $child->{x};
2400 $child->{y} = int $child->{y};
2024 2401
2025 $self->SUPER::add ($child); 2402 $self->SUPER::add ($child);
2026} 2403}
2027 2404
2028sub on_refresh { 2405sub on_refresh {
… …
2054############################################################################# 2431#############################################################################
2055 2432
2056package CFClient::UI; 2433package CFClient::UI;
2057 2434
2058$ROOT = new CFClient::UI::Root; 2435$ROOT = new CFClient::UI::Root;
2436$TOOLTIP = new CFClient::UI::Tooltip;
2059 2437
20601 24381
2061 2439

Diff Legend

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