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.143 by root, Thu Apr 20 21:28:51 2006 UTC vs.
Revision 1.171 by root, Mon Apr 24 11:54:26 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) {
… …
177 236
178sub size_allocate { 237sub size_allocate {
179 # nothing to be done 238 # nothing to be done
180} 239}
181 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;
246}
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) = @_;
251
252 $self->{parent}
253 or Carp::confess "no parent widget in _topleft\n";#d#
185 254
186 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 255 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
187} 256}
188 257
189# translate global coordinates to local coordinate system 258# translate global coordinates to local coordinate system
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 336 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 337 glVertex $x , $y + $self->{h};
269 glEnd; 338 glEnd;
270 glDisable GL_BLEND; 339 glDisable GL_BLEND;
271 } 340 }
341
342 if ($ENV{PCLIENT_DEBUG}) {
343 glPushMatrix;
344 glColor 1, 1, 0, 1;
345 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
346 glBegin GL_LINE_LOOP;
347 glVertex 0 , 0;
348 glVertex $self->{w}, 0;
349 glVertex $self->{w}, $self->{h};
350 glVertex 0 , $self->{h};
351 glEnd;
352 glPopMatrix;
353 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
354 }
272} 355}
273 356
274sub _draw { 357sub _draw {
275 my ($self) = @_; 358 my ($self) = @_;
276 359
277 warn "no draw defined for $self\n"; 360 warn "no draw defined for $self\n";
278} 361}
279 362
280sub find_widget { 363sub find_widget {
281 my ($self, $x, $y) = @_; 364 my ($self, $x, $y) = @_;
365
366 return () unless $self->{can_events};
282 367
283 return $self 368 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 369 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 370 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286 371
… …
294} 379}
295 380
296sub check_size { 381sub check_size {
297 my ($self) = @_; 382 my ($self) = @_;
298 383
299 my ($w, $h) = $self->size_request; 384 $self->{parent}
385 or return 1;
300 386
387 my ($w, $h) = $self->{user_w} && $self->{user_h}
388 ? @$self{qw(user_w user_h)}
389 : $self->size_request;
390
301 if ($w != $self->{req_w} || $h != $self->{req_h}) { 391 if ($w != $self->{req_w} || $h != $self->{req_h}) {
302 $self->{req_w} = $w; 392 $self->{req_w} = $w;
303 $self->{req_h} = $h; 393 $self->{req_h} = $h;
304 394
305 $self->{parent}->check_size 395 $self->{parent}->check_size
306 if $self->{parent}; 396 or $self->size_allocate (
397 (List::Util::max $self->{w}, $w),
398 (List::Util::max $self->{h}, $h),
399 );
400
401 1
402 } else {
403 0
307 } 404 }
308} 405}
309 406
310sub update { 407sub update {
311 my ($self) = @_; 408 my ($self) = @_;
… …
321} 418}
322 419
323sub emit { 420sub emit {
324 my ($self, $signal, @args) = @_; 421 my ($self, $signal, @args) = @_;
325 422
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 423 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
327 $cb->($self, @args);
328 }
329} 424}
330 425
331sub DESTROY { 426sub DESTROY {
332 my ($self) = @_; 427 my ($self) = @_;
333 428
… …
378 473
379package CFClient::UI::Empty; 474package CFClient::UI::Empty;
380 475
381our @ISA = CFClient::UI::Base::; 476our @ISA = CFClient::UI::Base::;
382 477
478sub new {
479 my ($class, %arg) = @_;
480 $class->SUPER::new (can_events => 0, %arg);
481}
482
383sub size_request { 483sub size_request {
384 (0, 0) 484 (0, 0)
385} 485}
386 486
387sub draw { } 487sub draw { }
… …
395sub new { 495sub new {
396 my ($class, %arg) = @_; 496 my ($class, %arg) = @_;
397 497
398 my $children = delete $arg{children} || []; 498 my $children = delete $arg{children} || [];
399 499
400 my $self = $class->SUPER::new (children => [], %arg); 500 my $self = $class->SUPER::new (
501 children => [],
502 can_events => 0,
503 %arg,
504 );
401 $self->add ($_) for @$children; 505 $self->add ($_) for @$children;
402 506
403 $self 507 $self
404} 508}
405 509
… …
420 524
421sub remove { 525sub remove {
422 my ($self, $child) = @_; 526 my ($self, $child) = @_;
423 527
424 delete $child->{parent}; 528 delete $child->{parent};
529 $child->hide;
425 530
426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 531 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427 532
428 $self->check_size; 533 $self->check_size;
534 $self->update;
535}
536
537sub clear {
538 my ($self) = @_;
539
540 my $children = delete $self->{children};
541 $self->{children} = [];
542
543 for (@$children) {
544 delete $_->{parent};
545 $_->hide;
546 }
429} 547}
430 548
431sub find_widget { 549sub find_widget {
432 my ($self, $x, $y) = @_; 550 my ($self, $x, $y) = @_;
433 551
… …
561sub new { die } 679sub new { die }
562 680
563sub size_request { 681sub size_request {
564 my ($self) = @_; 682 my ($self) = @_;
565 683
566 @$self{qw(child_w child_h)} = $self->child->size_request; 684 @$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)}); 685 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
568 686
569 @$self{qw(child_w child_h)} 687 @$self{qw(child_w child_h)}
570} 688}
571 689
… …
581package CFClient::UI::Frame; 699package CFClient::UI::Frame;
582 700
583our @ISA = CFClient::UI::Bin::; 701our @ISA = CFClient::UI::Bin::;
584 702
585use CFClient::OpenGL; 703use 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 704
633sub new { 705sub new {
634 my $class = shift; 706 my $class = shift;
635
636 # TODO: user_x, user_y, overwrite moveto?
637 707
638 my $self = $class->SUPER::new ( 708 my $self = $class->SUPER::new (
639 bg => [1, 1, 1, 1], 709 bg => [1, 1, 1, 1],
640 border_bg => [1, 1, 1, 1], 710 border_bg => [1, 1, 1, 1],
641 border => 0.8, 711 border => 0.8,
642 @_ 712 @_
643 ); 713 );
644 714
715 $self
716}
717
718sub _draw {
719 my ($self) = @_;
720
721 my ($w, $h) = ($self->{w}, $self->{h});
722
723 glEnable GL_BLEND;
724 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
725 glEnable GL_TEXTURE_2D;
726 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
727
728# glBegin GL_QUADS;
729# glColor 0, 0, 0, 0;
730# glVertex 0 , 0;
731# glVertex 0 , $h;
732# glVertex $w, $h;
733# glVertex $w, 0;
734# glEnd;
735
736
737 $self->child->draw;
738 glDisable GL_BLEND;
739 glDisable GL_TEXTURE_2D;
740}
741
742#############################################################################
743
744package CFClient::UI::FancyFrame;
745
746our @ISA = CFClient::UI::Bin::;
747
748use CFClient::OpenGL;
749
750my @tex =
751 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
752 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
753
754sub new {
755 my $class = shift;
756
757 # TODO: user_x, user_y, overwrite moveto?
758
759 my $self = $class->SUPER::new (
760 bg => [1, 1, 1, 1],
761 border_bg => [1, 1, 1, 1],
762 border => 0.8,
763 can_events => 1,
764 @_
765 );
766
645 $self->{title} &&= new CFClient::UI::Label 767 $self->{title} &&= new CFClient::UI::Label
646 align => 0, 768 align => 0,
647 valign => 1, 769 valign => 1,
648 text => $self->{title}, 770 text => $self->{title},
649 fontsize => 1; 771 fontsize => 1;
… …
656} 778}
657 779
658sub size_request { 780sub size_request {
659 my ($self) = @_; 781 my ($self) = @_;
660 782
661 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
662
663 my ($w, $h) = $self->SUPER::size_request; 783 my ($w, $h) = $self->SUPER::size_request;
664 784
665 ( 785 (
666 $w + $self->border * 2, 786 $w + $self->border * 2,
667 $h + $self->border * 2, 787 $h + $self->border * 2,
… …
799 919
800# TODO: move to container class maybe? send childs a signal on removal? 920# TODO: move to container class maybe? send childs a signal on removal?
801sub clear { 921sub clear {
802 my ($self) = @_; 922 my ($self) = @_;
803 923
804 delete $self->{children}; 924 my $children = delete $self->{children};
925
926 for (grep $_, map @$_, grep $_, @$children) {
927 delete $_->{parent};
928 $_->hide;
929 }
930
805 $self->update; 931 $self->update;
806} 932}
807 933
808sub get_wh { 934sub get_wh {
809 my ($self) = @_; 935 my ($self) = @_;
… …
815 or next; 941 or next;
816 942
817 for my $x (0 .. $#$row) { 943 for my $x (0 .. $#$row) {
818 my $widget = $row->[$x] 944 my $widget = $row->[$x]
819 or next; 945 or next;
820 my ($w, $h) = $widget->size_request; 946 my ($w, $h) = @$widget{qw(req_w req_h)};
821 947
822 $w[$x] = max $w[$x], $w; 948 $w[$x] = max $w[$x], $w;
823 $h[$y] = max $h[$y], $h; 949 $h[$y] = max $h[$y], $h;
824 } 950 }
825 } 951 }
… …
930 1056
931 ($h, $w) = ($w, $h); 1057 ($h, $w) = ($w, $h);
932 1058
933 my $children = $self->{children}; 1059 my $children = $self->{children};
934 1060
935 my @h = map +($_->size_request)[0], @$children; 1061 my @h = map $_->{req_w}, @$children;
936 1062
937 my $req_h = List::Util::sum @h; 1063 my $req_h = List::Util::sum @h;
938 1064
939 if ($req_h > $h) { 1065 if ($req_h > $h) {
940 # ah well, not enough space 1066 # ah well, not enough space
… …
988sub size_allocate { 1114sub size_allocate {
989 my ($self, $w, $h) = @_; 1115 my ($self, $w, $h) = @_;
990 1116
991 my $children = $self->{children}; 1117 my $children = $self->{children};
992 1118
993 my @h = map +($_->size_request)[1], @$children; 1119 my @h = map $_->{req_h}, @$children;
994 1120
995 my $req_h = List::Util::sum @h; 1121 my $req_h = List::Util::sum @h;
996 1122
997 if ($req_h > $h) { 1123 if ($req_h > $h) {
998 # ah well, not enough space 1124 # ah well, not enough space
… …
1032 1158
1033sub new { 1159sub new {
1034 my ($class, %arg) = @_; 1160 my ($class, %arg) = @_;
1035 1161
1036 my $self = $class->SUPER::new ( 1162 my $self = $class->SUPER::new (
1037 fg => [1, 1, 1], 1163 fg => [1, 1, 1],
1164 #font => default_font
1038 fontsize => 1, 1165 fontsize => 1,
1039 text => "", 1166 text => "",
1040 align => -1, 1167 align => -1,
1041 valign => -1, 1168 valign => -1,
1042 padding => 2, 1169 padding => 2,
1043 layout => new CFClient::Layout, 1170 layout => new CFClient::Layout,
1171 can_events => 0,
1044 %arg 1172 %arg
1045 ); 1173 );
1046 1174
1047 if (exists $self->{template}) { 1175 if (exists $self->{template}) {
1048 my $layout = new CFClient::Layout; 1176 my $layout = new CFClient::Layout;
… …
1054 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1182 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1055 1183
1056 $self 1184 $self
1057} 1185}
1058 1186
1059sub escape_text { 1187sub escape {
1060 local $_ = $_[1]; 1188 local $_ = $_[1];
1061 1189
1062 s/&/&amp;/g; 1190 s/&/&amp;/g;
1063 s/>/&gt;/g; 1191 s/>/&gt;/g;
1064 s/</&lt;/g; 1192 s/</&lt;/g;
… …
1070 my ($self, $text) = @_; 1198 my ($self, $text) = @_;
1071 1199
1072 $self->{layout}->set_text ($text); 1200 $self->{layout}->set_text ($text);
1073 1201
1074 delete $self->{texture}; 1202 delete $self->{texture};
1203 $self->check_size;
1075 $self->update; 1204 $self->update;
1076} 1205}
1077 1206
1078sub set_markup { 1207sub set_markup {
1079 my ($self, $markup) = @_; 1208 my ($self, $markup) = @_;
1080 1209
1081 $self->{layout}->set_markup ($markup); 1210 $self->{layout}->set_markup ($markup);
1082 1211
1083 delete $self->{texture}; 1212 delete $self->{texture};
1213 $self->check_size;
1084 $self->update; 1214 $self->update;
1085} 1215}
1086 1216
1087sub size_request { 1217sub size_request {
1088 my ($self) = @_; 1218 my ($self) = @_;
1089 1219
1090 $self->{layout}->set_width; 1220 $self->{layout}->set_font ($self->{font}) if $self->{font};
1221 $self->{layout}->set_width ($self->{max_w} || -1);
1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1222 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1092 1223
1093 my ($w, $h) = $self->{layout}->size; 1224 my ($w, $h) = $self->{layout}->size;
1094 1225
1095 if (exists $self->{template}) { 1226 if (exists $self->{template}) {
1227 $self->{template}->set_font ($self->{font}) if $self->{font};
1096 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1228 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1097 1229
1098 my ($w2, $h2) = $self->{template}->size; 1230 my ($w2, $h2) = $self->{template}->size;
1099 1231
1100 $w = List::Util::max $w, $w2; 1232 $w = List::Util::max $w, $w2;
… …
1111 my ($self, $w, $h) = @_; 1243 my ($self, $w, $h) = @_;
1112 1244
1113 delete $self->{texture}; 1245 delete $self->{texture};
1114} 1246}
1115 1247
1248sub set_fontsize {
1249 my ($self, $fontsize) = @_;
1250
1251 $self->{fontsize} = $fontsize;
1252 delete $self->{texture};
1253 $self->check_size;
1254 $self->update;
1255}
1256
1116sub _draw { 1257sub _draw {
1117 my ($self) = @_; 1258 my ($self) = @_;
1118 1259
1119 my $tex = $self->{texture} ||= do { 1260 my $tex = $self->{texture} ||= do {
1261 $self->{layout}->set_font ($self->{font}) if $self->{font};
1120 $self->{layout}->set_width ($self->{w}); 1262 $self->{layout}->set_width ($self->{w});
1121 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1263 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1122 new_from_layout CFClient::Texture $self->{layout} 1264 new_from_layout CFClient::Texture $self->{layout}
1123 }; 1265 };
1124 1266
… …
1157 1299
1158sub new { 1300sub new {
1159 my $class = shift; 1301 my $class = shift;
1160 1302
1161 $class->SUPER::new ( 1303 $class->SUPER::new (
1162 fg => [1, 1, 1], 1304 fg => [1, 1, 1],
1163 bg => [0, 0, 0, 0.2], 1305 bg => [0, 0, 0, 0.2],
1164 active_bg => [1, 1, 1, 0.5], 1306 active_bg => [1, 1, 1, 0.5],
1165 active_fg => [0, 0, 0], 1307 active_fg => [0, 0, 0],
1166 can_hover => 1, 1308 can_hover => 1,
1167 can_focus => 1, 1309 can_focus => 1,
1168 valign => 0, 1310 valign => 0,
1311 can_events => 1,
1169 @_ 1312 @_
1170 ) 1313 )
1171} 1314}
1172 1315
1173sub _set_text { 1316sub _set_text {
… …
1201} 1344}
1202 1345
1203sub size_allocate { 1346sub size_allocate {
1204 my ($self, $w, $h) = @_; 1347 my ($self, $w, $h) = @_;
1205 1348
1206 $self->_set_text ($self->{text}); 1349 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1207} 1350}
1208 1351
1209sub set_text { 1352sub set_text {
1210 my ($self, $text) = @_; 1353 my ($self, $text) = @_;
1211 1354
… …
1326 my ($self, $ev) = @_; 1469 my ($self, $ev) = @_;
1327 1470
1328 my $sym = $ev->{sym}; 1471 my $sym = $ev->{sym};
1329 1472
1330 if ($sym == 13) { 1473 if ($sym == 13) {
1474 unshift @{$self->{history}},
1475 my $txt = $self->get_text;
1476 $self->{history_pointer} = -1;
1477 $self->{history_saveback} = '';
1331 $self->emit (activate => $self->get_text); 1478 $self->emit (activate => $txt);
1332 $self->update; 1479 $self->update;
1480
1481 } elsif ($sym == CFClient::SDLK_UP) {
1482 if ($self->{history_pointer} < 0) {
1483 $self->{history_saveback} = $self->get_text;
1484 }
1485 if (@{$self->{history} || []} > 0) {
1486 $self->{history_pointer}++;
1487 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1488 $self->{history_pointer} = @{$self->{history} || []} - 1;
1489 }
1490 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1491 }
1492
1493 } elsif ($sym == CFClient::SDLK_DOWN) {
1494 $self->{history_pointer}--;
1495 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1496
1497 if ($self->{history_pointer} >= 0) {
1498 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1499 } else {
1500 $self->set_text ($self->{history_saveback});
1501 }
1333 1502
1334 } else { 1503 } else {
1335 $self->SUPER::key_down ($ev); 1504 $self->SUPER::key_down ($ev);
1336 } 1505 }
1337 1506
… …
1344our @ISA = CFClient::UI::Label::; 1513our @ISA = CFClient::UI::Label::;
1345 1514
1346use CFClient::OpenGL; 1515use CFClient::OpenGL;
1347 1516
1348my @tex = 1517my @tex =
1349 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1518 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1350 qw(b1_button_active.png); 1519 qw(b1_button_active.png);
1351 1520
1352sub new { 1521sub new {
1353 my $class = shift; 1522 my $class = shift;
1354 1523
1355 $class->SUPER::new ( 1524 $class->SUPER::new (
1356 padding => 4, 1525 padding => 4,
1357 fg => [1, 1, 1], 1526 fg => [1, 1, 1],
1358 bg => [1, 1, 1, 0.2], 1527 bg => [1, 1, 1, 0.2],
1359 active_fg => [0, 0, 1], 1528 active_fg => [0, 0, 1],
1360 can_hover => 1, 1529 can_hover => 1,
1361 align => 0, 1530 align => 0,
1362 valign => 0, 1531 valign => 0,
1532 can_events => 1,
1363 @_ 1533 @_
1364 ) 1534 )
1365} 1535}
1366 1536
1367sub button_up { 1537sub button_up {
… …
1401package CFClient::UI::CheckBox; 1571package CFClient::UI::CheckBox;
1402 1572
1403our @ISA = CFClient::UI::DrawBG::; 1573our @ISA = CFClient::UI::DrawBG::;
1404 1574
1405my @tex = 1575my @tex =
1406 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1576 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1407 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1577 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1408 1578
1409use CFClient::OpenGL; 1579use CFClient::OpenGL;
1410 1580
1411sub new { 1581sub new {
… …
1460 glDisable GL_BLEND; 1630 glDisable GL_BLEND;
1461} 1631}
1462 1632
1463############################################################################# 1633#############################################################################
1464 1634
1635package CFClient::UI::Image;
1636
1637our @ISA = CFClient::UI::Base::;
1638
1639use CFClient::OpenGL;
1640use Carp qw/confess/;
1641
1642our %loaded_images;
1643
1644sub new {
1645 my $class = shift;
1646
1647 my $self = $class->SUPER::new (can_events => 0, @_);
1648
1649 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1650
1651 $loaded_images{$self->{image}} ||=
1652 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1653
1654 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1655
1656 Scalar::Util::weaken $loaded_images{$self->{image}};
1657
1658 $self->{aspect} = $tex->{w} / $tex->{h};
1659
1660 $self
1661}
1662
1663sub size_request {
1664 my ($self) = @_;
1665
1666 ($self->{tex}->{w}, $self->{tex}->{h})
1667}
1668
1669sub _draw {
1670 my ($self) = @_;
1671
1672 my $tex = $self->{tex};
1673
1674 my ($w, $h) = ($self->{w}, $self->{h});
1675
1676 if ($self->{rot90}) {
1677 glRotate 90, 0, 0, 1;
1678 glTranslate 0, -$self->{w}, 0;
1679
1680 ($w, $h) = ($h, $w);
1681 }
1682
1683 glEnable GL_BLEND;
1684 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1685 glEnable GL_TEXTURE_2D;
1686 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1687
1688 $tex->draw_quad (0, 0, $w, $h);
1689
1690 glDisable GL_BLEND;
1691 glDisable GL_TEXTURE_2D;
1692}
1693
1694#############################################################################
1695
1465package CFClient::UI::VGauge; 1696package CFClient::UI::VGauge;
1466 1697
1467our @ISA = CFClient::UI::Base::; 1698our @ISA = CFClient::UI::Base::;
1699
1700use List::Util qw(min max);
1468 1701
1469use CFClient::OpenGL; 1702use CFClient::OpenGL;
1470 1703
1471my %tex = ( 1704my %tex = (
1472 food => [ 1705 food => [
1473 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1706 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1474 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1707 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1475 ], 1708 ],
1476 grace => [ 1709 grace => [
1477 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1710 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1478 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1711 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1479 ], 1712 ],
1480 hp => [ 1713 hp => [
1481 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1714 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1482 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1715 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1483 ], 1716 ],
1484 mana => [ 1717 mana => [
1485 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1718 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1486 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1719 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1487 ], 1720 ],
1488); 1721);
1489 1722
1490# eg. VGauge->new (gauge => 'food'), default gauge: food 1723# eg. VGauge->new (gauge => 'food'), default gauge: food
1491sub new { 1724sub new {
… …
1529 1762
1530sub _draw { 1763sub _draw {
1531 my ($self) = @_; 1764 my ($self) = @_;
1532 1765
1533 my $tex = $tex{$self->{type}}; 1766 my $tex = $tex{$self->{type}};
1767 my ($t1, $t2, $t3) = @$tex;
1534 1768
1535 my ($w, $h) = ($self->{w}, $self->{h}); 1769 my ($w, $h) = ($self->{w}, $self->{h});
1536 1770
1537 if ($self->{vertical}) { 1771 if ($self->{vertical}) {
1538 glRotate 90, 0, 0, 1; 1772 glRotate 90, 0, 0, 1;
… …
1540 1774
1541 ($w, $h) = ($h, $w); 1775 ($w, $h) = ($h, $w);
1542 } 1776 }
1543 1777
1544 my $ycut = $self->{val} / ($self->{max_val} || 1); 1778 my $ycut = $self->{val} / ($self->{max_val} || 1);
1545 $ycut = 1 if $self->{val} > $self->{max_val};
1546 1779
1547 my $t1 = $tex->[0]; 1780 my $ycut1 = max 0, min 1, $ycut;
1548 my $t2 = $tex->[1]; 1781 my $ycut2 = max 0, min 1, $ycut - 1;
1782
1783 my $h1 = $self->{h} * (1 - $ycut1);
1784 my $h2 = $self->{h} * (1 - $ycut2);
1549 1785
1550 glEnable GL_BLEND; 1786 glEnable GL_BLEND;
1551 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1787 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1552 glEnable GL_TEXTURE_2D; 1788 glEnable GL_TEXTURE_2D;
1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1554 1790
1555 my $h1 = $self->{h} - $ycut * $self->{h};
1556 my $h2 = $ycut * $self->{h};
1557
1558 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1791 glBindTexture GL_TEXTURE_2D, $t1->{name};
1559 glBegin GL_QUADS; 1792 glBegin GL_QUADS;
1560 glTexCoord 0 , 0; glVertex 0 , 0; 1793 glTexCoord 0 , 0; glVertex 0 , 0;
1561 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1794 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1562 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1795 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1563 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1796 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1564 glEnd; 1797 glEnd;
1565 1798
1799 my $ycut1 = List::Util::min 1, $ycut;
1566 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1800 glBindTexture GL_TEXTURE_2D, $t2->{name};
1567 glBegin GL_QUADS; 1801 glBegin GL_QUADS;
1568 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1802 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1569 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1803 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1570 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1804 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1571 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1805 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1572 glEnd; 1806 glEnd;
1807
1808 if ($t3) {
1809 glBindTexture GL_TEXTURE_2D, $t3->{name};
1810 glBegin GL_QUADS;
1811 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1812 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1813 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1814 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1815 glEnd;
1816 }
1573 1817
1574 glDisable GL_BLEND; 1818 glDisable GL_BLEND;
1575 glDisable GL_TEXTURE_2D; 1819 glDisable GL_TEXTURE_2D;
1576} 1820}
1577 1821
… …
1580package CFClient::UI::Gauge; 1824package CFClient::UI::Gauge;
1581 1825
1582our @ISA = CFClient::UI::VBox::; 1826our @ISA = CFClient::UI::VBox::;
1583 1827
1584sub new { 1828sub new {
1585 my ($class, %arg) = shift; 1829 my ($class, %arg) = @_;
1586 1830
1587 my $self = $class->SUPER::new ( 1831 my $self = $class->SUPER::new (
1588 @_, 1832 tooltip => $arg{type},
1833 can_hover => 1,
1834 can_events => 1,
1835 %arg,
1589 ); 1836 );
1590 1837
1591 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1838 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1592 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1839 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1593 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1840 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1594 1841
1595 $self 1842 $self
1843}
1844
1845sub set_fontsize {
1846 my ($self, $fsize) = @_;
1847
1848 $self->{value}->set_fontsize ($fsize);
1849 $self->{max} ->set_fontsize ($fsize);
1596} 1850}
1597 1851
1598sub set_value { 1852sub set_value {
1599 my ($self, $val, $max) = @_; 1853 my ($self, $val, $max) = @_;
1600 1854
… …
1757 2011
1758sub new { 2012sub new {
1759 my $class = shift; 2013 my $class = shift;
1760 2014
1761 my $self = $class->SUPER::new ( 2015 my $self = $class->SUPER::new (
1762 fontsize => 1, 2016 fontsize => 1,
2017 can_events => 0,
2018 #font => default_font
1763 @_, 2019 @_,
1764 2020
1765 layout => (new CFClient::Layout), 2021 layout => (new CFClient::Layout),
1766 par => [], 2022 par => [],
1767 height => 0, 2023 height => 0,
1768 children => [ 2024 children => [
1769 (new CFClient::UI::Empty expand => 1), 2025 (new CFClient::UI::Empty expand => 1),
1770 (new CFClient::UI::Slider vertical => 1), 2026 (new CFClient::UI::Slider vertical => 1),
1771 ], 2027 ],
1772 ); 2028 );
1773 2029
… …
1807sub size_allocate { 2063sub size_allocate {
1808 my ($self, $w, $h) = @_; 2064 my ($self, $w, $h) = @_;
1809 2065
1810 $self->SUPER::size_allocate ($w, $h); 2066 $self->SUPER::size_allocate ($w, $h);
1811 2067
2068 $self->{layout}->set_font ($self->{font}) if $self->{font};
1812 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2069 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1813 $self->{layout}->set_width ($self->{children}[0]{w}); 2070 $self->{layout}->set_width ($self->{children}[0]{w});
1814 2071
1815 $self->reflow; 2072 $self->reflow;
1816} 2073}
… …
1868 my $y1 = $top + $self->{h}; 2125 my $y1 = $top + $self->{h};
1869 2126
1870 my $y = 0; 2127 my $y = 0;
1871 2128
1872 my $layout = $self->{layout}; 2129 my $layout = $self->{layout};
2130
2131 $layout->set_font ($self->{font}) if $self->{font};
1873 2132
1874 for my $par (@{$self->{par}}) { 2133 for my $par (@{$self->{par}}) {
1875 my $h = $par->[0]; 2134 my $h = $par->[0];
1876 2135
1877 if ($y0 < $y + $h && $y < $y1) { 2136 if ($y0 < $y + $h && $y < $y1) {
… …
1955 2214
1956sub new { 2215sub new {
1957 my $class = shift; 2216 my $class = shift;
1958 2217
1959 my $self = $class->SUPER::new ( 2218 my $self = $class->SUPER::new (
1960 state => 0, 2219 state => 0,
1961 connect_activate => \&toggle_flopper, 2220 connect_activate => \&toggle_flopper,
1962 @_ 2221 @_
1963 ); 2222 );
1964 2223
1965 if ($self->{state}) { 2224 if ($self->{state}) {
… …
1986 $self->emit (changed => $self->{state}); 2245 $self->emit (changed => $self->{state});
1987} 2246}
1988 2247
1989############################################################################# 2248#############################################################################
1990 2249
2250package CFClient::UI::Tooltip;
2251
2252our @ISA = CFClient::UI::Bin::;
2253
2254use CFClient::OpenGL;
2255
2256sub new {
2257 my $class = shift;
2258
2259 $class->SUPER::new (
2260 @_,
2261 can_events => 0,
2262 )
2263}
2264
2265sub set_markup {
2266 my ($self, $text) = @_;
2267
2268 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2269 $self->{label}->set_markup ($text);
2270 $self->add ($self->{label});
2271}
2272
2273sub size_request {
2274 my ($self) = @_;
2275
2276 $self->child->set_max_size ($::WIDTH * 0.3);
2277
2278 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2279
2280 ($w + 4, $h + 4)
2281}
2282
2283sub size_allocate {
2284 my ($self, $w, $h) = @_;
2285
2286 $self->SUPER::size_allocate ($w - 4, $h - 4);
2287}
2288
2289sub _draw {
2290 my ($self) = @_;
2291
2292 glPushMatrix;
2293 glTranslate 0.375, 0.375;
2294
2295 my ($w, $h) = @$self{qw(w h)};
2296
2297 glColor 1, 0.8, 0.4;
2298 glBegin GL_QUADS;
2299 glVertex 0 , 0;
2300 glVertex 0 , $h;
2301 glVertex $w, $h;
2302 glVertex $w, 0;
2303 glEnd;
2304
2305 glColor 0, 0, 0;
2306 glBegin GL_LINE_LOOP;
2307 glVertex 0 , 0;
2308 glVertex 0 , $h;
2309 glVertex $w, $h;
2310 glVertex $w, 0;
2311 glEnd;
2312
2313 glPopMatrix;
2314
2315 glTranslate 2, 2;
2316 $self->SUPER::_draw;
2317}
2318
2319#############################################################################
2320
2321package CFClient::UI::Face;
2322
2323our @ISA = CFClient::UI::Base::;
2324
2325use CFClient::OpenGL;
2326
2327sub new {
2328 my $class = shift;
2329
2330 $class->SUPER::new (
2331 aspect => 1,
2332 @_,
2333 )
2334}
2335
2336sub size_request {
2337 (32, 8)
2338}
2339
2340sub draw {
2341 my ($self) = @_;
2342
2343 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2344
2345 if ($tex) {
2346 glEnable GL_BLEND;
2347 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2348 glEnable GL_TEXTURE_2D;
2349 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2350 glColor 1, 1, 1, 1;
2351 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2352 glDisable GL_TEXTURE_2D;
2353 glDisable GL_BLEND;
2354 }
2355}
2356
2357#############################################################################
2358
1991package CFClient::UI::Root; 2359package CFClient::UI::Root;
1992 2360
1993our @ISA = CFClient::UI::Container::; 2361our @ISA = CFClient::UI::Container::;
1994 2362
1995use CFClient::OpenGL; 2363use CFClient::OpenGL;
1996 2364
1997sub check_size { 2365sub check_size {
1998 my ($self) = @_; 2366 my ($self) = @_;
1999 2367
2000 $self->configure (0, 0, $::WITH, $::HEIGHT); 2368 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2001} 2369}
2002 2370
2003sub size_request { 2371sub size_request {
2004 ($::WIDTH, $::HEIGHT) 2372 ($::WIDTH, $::HEIGHT)
2005} 2373}
… …
2007sub configure { 2375sub configure {
2008 my ($self, $x, $y, $w, $h) = @_; 2376 my ($self, $x, $y, $w, $h) = @_;
2009 2377
2010 $self->SUPER::configure ($x, $y, $w, $h); 2378 $self->SUPER::configure ($x, $y, $w, $h);
2011 2379
2012 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2013 for @{$self->{children}}; 2380 for my $child (@{$self->{children}}) {
2381 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2382
2383 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2384 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2385 $child->configure ($X, $Y, $W,$H);
2386 }
2014} 2387}
2015 2388
2016sub _topleft { 2389sub _topleft {
2017 my ($self, $x, $y) = @_; 2390 my ($self, $x, $y) = @_;
2018 2391
… …
2026 ::refresh (); 2399 ::refresh ();
2027} 2400}
2028 2401
2029sub add { 2402sub add {
2030 my ($self, $child) = @_; 2403 my ($self, $child) = @_;
2404
2405 # integerize window positions
2406 $child->{x} = int $child->{x};
2407 $child->{y} = int $child->{y};
2031 2408
2032 $self->SUPER::add ($child); 2409 $self->SUPER::add ($child);
2033} 2410}
2034 2411
2035sub on_refresh { 2412sub on_refresh {
… …
2061############################################################################# 2438#############################################################################
2062 2439
2063package CFClient::UI; 2440package CFClient::UI;
2064 2441
2065$ROOT = new CFClient::UI::Root; 2442$ROOT = new CFClient::UI::Root;
2443$TOOLTIP = new CFClient::UI::Tooltip;
2066 2444
20671 24451
2068 2446

Diff Legend

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