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.172 by root, Tue Apr 25 09:52:04 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 children {
242}
243
244sub set_max_size {
245 my ($self, $w, $h) = @_;
246
247 delete $self->{max_w}; $self->{max_w} = $w if $w;
248 delete $self->{max_h}; $self->{max_h} = $h if $h;
249}
250
182# return top left coordinates 251# return top left coordinates
183sub _topleft { 252sub _topleft {
184 my ($self, $x, $y) = @_; 253 my ($self, $x, $y) = @_;
254
255 $self->{parent}
256 or Carp::confess "no parent widget in _topleft\n";#d#
185 257
186 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 258 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
187} 259}
188 260
189# translate global coordinates to local coordinate system 261# translate global coordinates to local coordinate system
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 339 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 340 glVertex $x , $y + $self->{h};
269 glEnd; 341 glEnd;
270 glDisable GL_BLEND; 342 glDisable GL_BLEND;
271 } 343 }
344
345 if ($ENV{PCLIENT_DEBUG}) {
346 glPushMatrix;
347 glColor 1, 1, 0, 1;
348 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
349 glBegin GL_LINE_LOOP;
350 glVertex 0 , 0;
351 glVertex $self->{w}, 0;
352 glVertex $self->{w}, $self->{h};
353 glVertex 0 , $self->{h};
354 glEnd;
355 glPopMatrix;
356 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
357 }
272} 358}
273 359
274sub _draw { 360sub _draw {
275 my ($self) = @_; 361 my ($self) = @_;
276 362
277 warn "no draw defined for $self\n"; 363 warn "no draw defined for $self\n";
278} 364}
279 365
280sub find_widget { 366sub find_widget {
281 my ($self, $x, $y) = @_; 367 my ($self, $x, $y) = @_;
368
369 return () unless $self->{can_events};
282 370
283 return $self 371 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 372 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 373 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286 374
… …
294} 382}
295 383
296sub check_size { 384sub check_size {
297 my ($self) = @_; 385 my ($self) = @_;
298 386
299 my ($w, $h) = $self->size_request; 387 $self->{parent}
388 or return 1;
300 389
390 my ($w, $h) = $self->{user_w} && $self->{user_h}
391 ? @$self{qw(user_w user_h)}
392 : $self->size_request;
393
301 if ($w != $self->{req_w} || $h != $self->{req_h}) { 394 if ($w != $self->{req_w} || $h != $self->{req_h}) {
302 $self->{req_w} = $w; 395 $self->{req_w} = $w;
303 $self->{req_h} = $h; 396 $self->{req_h} = $h;
304 397
305 $self->{parent}->check_size 398 $self->{parent}->check_size
306 if $self->{parent}; 399 or $self->size_allocate (
400 (List::Util::max $self->{w}, $w),
401 (List::Util::max $self->{h}, $h),
402 );
403
404 1
405 } else {
406 0
307 } 407 }
308} 408}
309 409
310sub update { 410sub update {
311 my ($self) = @_; 411 my ($self) = @_;
… …
321} 421}
322 422
323sub emit { 423sub emit {
324 my ($self, $signal, @args) = @_; 424 my ($self, $signal, @args) = @_;
325 425
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 426 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
327 $cb->($self, @args);
328 }
329} 427}
330 428
331sub DESTROY { 429sub DESTROY {
332 my ($self) = @_; 430 my ($self) = @_;
333 431
… …
378 476
379package CFClient::UI::Empty; 477package CFClient::UI::Empty;
380 478
381our @ISA = CFClient::UI::Base::; 479our @ISA = CFClient::UI::Base::;
382 480
481sub new {
482 my ($class, %arg) = @_;
483 $class->SUPER::new (can_events => 0, %arg);
484}
485
383sub size_request { 486sub size_request {
384 (0, 0) 487 (0, 0)
385} 488}
386 489
387sub draw { } 490sub draw { }
… …
395sub new { 498sub new {
396 my ($class, %arg) = @_; 499 my ($class, %arg) = @_;
397 500
398 my $children = delete $arg{children} || []; 501 my $children = delete $arg{children} || [];
399 502
400 my $self = $class->SUPER::new (children => [], %arg); 503 my $self = $class->SUPER::new (
504 children => [],
505 can_events => 0,
506 %arg,
507 );
401 $self->add ($_) for @$children; 508 $self->add ($_) for @$children;
402 509
403 $self 510 $self
404} 511}
405 512
… …
416 ]; 523 ];
417 524
418 $child->check_size; 525 $child->check_size;
419} 526}
420 527
528sub children {
529 @{ $_[0]{children} }
530}
531
421sub remove { 532sub remove {
422 my ($self, $child) = @_; 533 my ($self, $child) = @_;
423 534
424 delete $child->{parent}; 535 delete $child->{parent};
536 $child->hide;
425 537
426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 538 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427 539
428 $self->check_size; 540 $self->check_size;
541 $self->update;
542}
543
544sub clear {
545 my ($self) = @_;
546
547 my $children = delete $self->{children};
548 $self->{children} = [];
549
550 for (@$children) {
551 delete $_->{parent};
552 $_->hide;
553 }
429} 554}
430 555
431sub find_widget { 556sub find_widget {
432 my ($self, $x, $y) = @_; 557 my ($self, $x, $y) = @_;
433 558
… …
561sub new { die } 686sub new { die }
562 687
563sub size_request { 688sub size_request {
564 my ($self) = @_; 689 my ($self) = @_;
565 690
566 @$self{qw(child_w child_h)} = $self->child->size_request; 691 @$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)}); 692 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
568 693
569 @$self{qw(child_w child_h)} 694 @$self{qw(child_w child_h)}
570} 695}
571 696
… …
581package CFClient::UI::Frame; 706package CFClient::UI::Frame;
582 707
583our @ISA = CFClient::UI::Bin::; 708our @ISA = CFClient::UI::Bin::;
584 709
585use CFClient::OpenGL; 710use 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 711
633sub new { 712sub new {
634 my $class = shift; 713 my $class = shift;
635
636 # TODO: user_x, user_y, overwrite moveto?
637 714
638 my $self = $class->SUPER::new ( 715 my $self = $class->SUPER::new (
639 bg => [1, 1, 1, 1], 716 bg => [1, 1, 1, 1],
640 border_bg => [1, 1, 1, 1], 717 border_bg => [1, 1, 1, 1],
641 border => 0.8, 718 border => 0.8,
642 @_ 719 @_
643 ); 720 );
644 721
722 $self
723}
724
725sub _draw {
726 my ($self) = @_;
727
728 my ($w, $h) = ($self->{w}, $self->{h});
729
730 glEnable GL_BLEND;
731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
732 glEnable GL_TEXTURE_2D;
733 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
734
735# glBegin GL_QUADS;
736# glColor 0, 0, 0, 0;
737# glVertex 0 , 0;
738# glVertex 0 , $h;
739# glVertex $w, $h;
740# glVertex $w, 0;
741# glEnd;
742
743
744 $self->child->draw;
745 glDisable GL_BLEND;
746 glDisable GL_TEXTURE_2D;
747}
748
749#############################################################################
750
751package CFClient::UI::FancyFrame;
752
753our @ISA = CFClient::UI::Bin::;
754
755use CFClient::OpenGL;
756
757my @tex =
758 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
759 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
760
761sub new {
762 my $class = shift;
763
764 # TODO: user_x, user_y, overwrite moveto?
765
766 my $self = $class->SUPER::new (
767 bg => [1, 1, 1, 1],
768 border_bg => [1, 1, 1, 1],
769 border => 0.8,
770 can_events => 1,
771 @_
772 );
773
645 $self->{title} &&= new CFClient::UI::Label 774 $self->{title} &&= new CFClient::UI::Label
646 align => 0, 775 align => 0,
647 valign => 1, 776 valign => 1,
648 text => $self->{title}, 777 text => $self->{title},
649 fontsize => 1; 778 fontsize => 1;
… …
656} 785}
657 786
658sub size_request { 787sub size_request {
659 my ($self) = @_; 788 my ($self) = @_;
660 789
661 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
662
663 my ($w, $h) = $self->SUPER::size_request; 790 my ($w, $h) = $self->SUPER::size_request;
664 791
665 ( 792 (
666 $w + $self->border * 2, 793 $w + $self->border * 2,
667 $h + $self->border * 2, 794 $h + $self->border * 2,
… …
795 $self->{children}[$y][$x] = $child; 922 $self->{children}[$y][$x] = $child;
796 923
797 $child->check_size; 924 $child->check_size;
798} 925}
799 926
927sub children {
928 grep $_, map @$_, grep $_, @{ $_[0]{children} }
929}
930
800# TODO: move to container class maybe? send childs a signal on removal? 931# TODO: move to container class maybe? send childs a signal on removal?
801sub clear { 932sub clear {
802 my ($self) = @_; 933 my ($self) = @_;
803 934
935 my @children = $self->children;
804 delete $self->{children}; 936 delete $self->{children};
937
938 for (@children) {
939 delete $_->{parent};
940 $_->hide;
941 }
942
805 $self->update; 943 $self->update;
806} 944}
807 945
808sub get_wh { 946sub get_wh {
809 my ($self) = @_; 947 my ($self) = @_;
… …
815 or next; 953 or next;
816 954
817 for my $x (0 .. $#$row) { 955 for my $x (0 .. $#$row) {
818 my $widget = $row->[$x] 956 my $widget = $row->[$x]
819 or next; 957 or next;
820 my ($w, $h) = $widget->size_request; 958 my ($w, $h) = @$widget{qw(req_w req_h)};
821 959
822 $w[$x] = max $w[$x], $w; 960 $w[$x] = max $w[$x], $w;
823 $h[$y] = max $h[$y], $h; 961 $h[$y] = max $h[$y], $h;
824 } 962 }
825 } 963 }
… …
930 1068
931 ($h, $w) = ($w, $h); 1069 ($h, $w) = ($w, $h);
932 1070
933 my $children = $self->{children}; 1071 my $children = $self->{children};
934 1072
935 my @h = map +($_->size_request)[0], @$children; 1073 my @h = map $_->{req_w}, @$children;
936 1074
937 my $req_h = List::Util::sum @h; 1075 my $req_h = List::Util::sum @h;
938 1076
939 if ($req_h > $h) { 1077 if ($req_h > $h) {
940 # ah well, not enough space 1078 # ah well, not enough space
… …
988sub size_allocate { 1126sub size_allocate {
989 my ($self, $w, $h) = @_; 1127 my ($self, $w, $h) = @_;
990 1128
991 my $children = $self->{children}; 1129 my $children = $self->{children};
992 1130
993 my @h = map +($_->size_request)[1], @$children; 1131 my @h = map $_->{req_h}, @$children;
994 1132
995 my $req_h = List::Util::sum @h; 1133 my $req_h = List::Util::sum @h;
996 1134
997 if ($req_h > $h) { 1135 if ($req_h > $h) {
998 # ah well, not enough space 1136 # ah well, not enough space
… …
1032 1170
1033sub new { 1171sub new {
1034 my ($class, %arg) = @_; 1172 my ($class, %arg) = @_;
1035 1173
1036 my $self = $class->SUPER::new ( 1174 my $self = $class->SUPER::new (
1037 fg => [1, 1, 1], 1175 fg => [1, 1, 1],
1176 #font => default_font
1038 fontsize => 1, 1177 fontsize => 1,
1039 text => "", 1178 text => "",
1040 align => -1, 1179 align => -1,
1041 valign => -1, 1180 valign => -1,
1042 padding => 2, 1181 padding => 2,
1043 layout => new CFClient::Layout, 1182 layout => new CFClient::Layout,
1183 can_events => 0,
1044 %arg 1184 %arg
1045 ); 1185 );
1046 1186
1047 if (exists $self->{template}) { 1187 if (exists $self->{template}) {
1048 my $layout = new CFClient::Layout; 1188 my $layout = new CFClient::Layout;
… …
1054 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1194 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1055 1195
1056 $self 1196 $self
1057} 1197}
1058 1198
1059sub escape_text { 1199sub escape {
1060 local $_ = $_[1]; 1200 local $_ = $_[1];
1061 1201
1062 s/&/&amp;/g; 1202 s/&/&amp;/g;
1063 s/>/&gt;/g; 1203 s/>/&gt;/g;
1064 s/</&lt;/g; 1204 s/</&lt;/g;
… …
1070 my ($self, $text) = @_; 1210 my ($self, $text) = @_;
1071 1211
1072 $self->{layout}->set_text ($text); 1212 $self->{layout}->set_text ($text);
1073 1213
1074 delete $self->{texture}; 1214 delete $self->{texture};
1215 $self->check_size;
1075 $self->update; 1216 $self->update;
1076} 1217}
1077 1218
1078sub set_markup { 1219sub set_markup {
1079 my ($self, $markup) = @_; 1220 my ($self, $markup) = @_;
1080 1221
1081 $self->{layout}->set_markup ($markup); 1222 $self->{layout}->set_markup ($markup);
1082 1223
1083 delete $self->{texture}; 1224 delete $self->{texture};
1225 $self->check_size;
1084 $self->update; 1226 $self->update;
1085} 1227}
1086 1228
1087sub size_request { 1229sub size_request {
1088 my ($self) = @_; 1230 my ($self) = @_;
1089 1231
1090 $self->{layout}->set_width; 1232 $self->{layout}->set_font ($self->{font}) if $self->{font};
1233 $self->{layout}->set_width ($self->{max_w} || -1);
1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1234 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1092 1235
1093 my ($w, $h) = $self->{layout}->size; 1236 my ($w, $h) = $self->{layout}->size;
1094 1237
1095 if (exists $self->{template}) { 1238 if (exists $self->{template}) {
1239 $self->{template}->set_font ($self->{font}) if $self->{font};
1096 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1240 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1097 1241
1098 my ($w2, $h2) = $self->{template}->size; 1242 my ($w2, $h2) = $self->{template}->size;
1099 1243
1100 $w = List::Util::max $w, $w2; 1244 $w = List::Util::max $w, $w2;
… …
1111 my ($self, $w, $h) = @_; 1255 my ($self, $w, $h) = @_;
1112 1256
1113 delete $self->{texture}; 1257 delete $self->{texture};
1114} 1258}
1115 1259
1260sub set_fontsize {
1261 my ($self, $fontsize) = @_;
1262
1263 $self->{fontsize} = $fontsize;
1264 delete $self->{texture};
1265 $self->check_size;
1266 $self->update;
1267}
1268
1116sub _draw { 1269sub _draw {
1117 my ($self) = @_; 1270 my ($self) = @_;
1118 1271
1119 my $tex = $self->{texture} ||= do { 1272 my $tex = $self->{texture} ||= do {
1273 $self->{layout}->set_font ($self->{font}) if $self->{font};
1120 $self->{layout}->set_width ($self->{w}); 1274 $self->{layout}->set_width ($self->{w});
1121 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1275 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1122 new_from_layout CFClient::Texture $self->{layout} 1276 new_from_layout CFClient::Texture $self->{layout}
1123 }; 1277 };
1124 1278
… …
1157 1311
1158sub new { 1312sub new {
1159 my $class = shift; 1313 my $class = shift;
1160 1314
1161 $class->SUPER::new ( 1315 $class->SUPER::new (
1162 fg => [1, 1, 1], 1316 fg => [1, 1, 1],
1163 bg => [0, 0, 0, 0.2], 1317 bg => [0, 0, 0, 0.2],
1164 active_bg => [1, 1, 1, 0.5], 1318 active_bg => [1, 1, 1, 0.5],
1165 active_fg => [0, 0, 0], 1319 active_fg => [0, 0, 0],
1166 can_hover => 1, 1320 can_hover => 1,
1167 can_focus => 1, 1321 can_focus => 1,
1168 valign => 0, 1322 valign => 0,
1323 can_events => 1,
1169 @_ 1324 @_
1170 ) 1325 )
1171} 1326}
1172 1327
1173sub _set_text { 1328sub _set_text {
… …
1201} 1356}
1202 1357
1203sub size_allocate { 1358sub size_allocate {
1204 my ($self, $w, $h) = @_; 1359 my ($self, $w, $h) = @_;
1205 1360
1206 $self->_set_text ($self->{text}); 1361 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1207} 1362}
1208 1363
1209sub set_text { 1364sub set_text {
1210 my ($self, $text) = @_; 1365 my ($self, $text) = @_;
1211 1366
… …
1326 my ($self, $ev) = @_; 1481 my ($self, $ev) = @_;
1327 1482
1328 my $sym = $ev->{sym}; 1483 my $sym = $ev->{sym};
1329 1484
1330 if ($sym == 13) { 1485 if ($sym == 13) {
1486 unshift @{$self->{history}},
1487 my $txt = $self->get_text;
1488 $self->{history_pointer} = -1;
1489 $self->{history_saveback} = '';
1331 $self->emit (activate => $self->get_text); 1490 $self->emit (activate => $txt);
1332 $self->update; 1491 $self->update;
1492
1493 } elsif ($sym == CFClient::SDLK_UP) {
1494 if ($self->{history_pointer} < 0) {
1495 $self->{history_saveback} = $self->get_text;
1496 }
1497 if (@{$self->{history} || []} > 0) {
1498 $self->{history_pointer}++;
1499 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1500 $self->{history_pointer} = @{$self->{history} || []} - 1;
1501 }
1502 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1503 }
1504
1505 } elsif ($sym == CFClient::SDLK_DOWN) {
1506 $self->{history_pointer}--;
1507 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1508
1509 if ($self->{history_pointer} >= 0) {
1510 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1511 } else {
1512 $self->set_text ($self->{history_saveback});
1513 }
1333 1514
1334 } else { 1515 } else {
1335 $self->SUPER::key_down ($ev); 1516 $self->SUPER::key_down ($ev);
1336 } 1517 }
1337 1518
… …
1344our @ISA = CFClient::UI::Label::; 1525our @ISA = CFClient::UI::Label::;
1345 1526
1346use CFClient::OpenGL; 1527use CFClient::OpenGL;
1347 1528
1348my @tex = 1529my @tex =
1349 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1530 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1350 qw(b1_button_active.png); 1531 qw(b1_button_active.png);
1351 1532
1352sub new { 1533sub new {
1353 my $class = shift; 1534 my $class = shift;
1354 1535
1355 $class->SUPER::new ( 1536 $class->SUPER::new (
1356 padding => 4, 1537 padding => 4,
1357 fg => [1, 1, 1], 1538 fg => [1, 1, 1],
1358 bg => [1, 1, 1, 0.2], 1539 bg => [1, 1, 1, 0.2],
1359 active_fg => [0, 0, 1], 1540 active_fg => [0, 0, 1],
1360 can_hover => 1, 1541 can_hover => 1,
1361 align => 0, 1542 align => 0,
1362 valign => 0, 1543 valign => 0,
1544 can_events => 1,
1363 @_ 1545 @_
1364 ) 1546 )
1365} 1547}
1366 1548
1367sub button_up { 1549sub button_up {
… …
1401package CFClient::UI::CheckBox; 1583package CFClient::UI::CheckBox;
1402 1584
1403our @ISA = CFClient::UI::DrawBG::; 1585our @ISA = CFClient::UI::DrawBG::;
1404 1586
1405my @tex = 1587my @tex =
1406 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1588 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1407 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1589 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1408 1590
1409use CFClient::OpenGL; 1591use CFClient::OpenGL;
1410 1592
1411sub new { 1593sub new {
… …
1460 glDisable GL_BLEND; 1642 glDisable GL_BLEND;
1461} 1643}
1462 1644
1463############################################################################# 1645#############################################################################
1464 1646
1647package CFClient::UI::Image;
1648
1649our @ISA = CFClient::UI::Base::;
1650
1651use CFClient::OpenGL;
1652use Carp qw/confess/;
1653
1654our %loaded_images;
1655
1656sub new {
1657 my $class = shift;
1658
1659 my $self = $class->SUPER::new (can_events => 0, @_);
1660
1661 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1662
1663 $loaded_images{$self->{image}} ||=
1664 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1665
1666 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1667
1668 Scalar::Util::weaken $loaded_images{$self->{image}};
1669
1670 $self->{aspect} = $tex->{w} / $tex->{h};
1671
1672 $self
1673}
1674
1675sub size_request {
1676 my ($self) = @_;
1677
1678 ($self->{tex}->{w}, $self->{tex}->{h})
1679}
1680
1681sub _draw {
1682 my ($self) = @_;
1683
1684 my $tex = $self->{tex};
1685
1686 my ($w, $h) = ($self->{w}, $self->{h});
1687
1688 if ($self->{rot90}) {
1689 glRotate 90, 0, 0, 1;
1690 glTranslate 0, -$self->{w}, 0;
1691
1692 ($w, $h) = ($h, $w);
1693 }
1694
1695 glEnable GL_BLEND;
1696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1697 glEnable GL_TEXTURE_2D;
1698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1699
1700 $tex->draw_quad (0, 0, $w, $h);
1701
1702 glDisable GL_BLEND;
1703 glDisable GL_TEXTURE_2D;
1704}
1705
1706#############################################################################
1707
1465package CFClient::UI::VGauge; 1708package CFClient::UI::VGauge;
1466 1709
1467our @ISA = CFClient::UI::Base::; 1710our @ISA = CFClient::UI::Base::;
1711
1712use List::Util qw(min max);
1468 1713
1469use CFClient::OpenGL; 1714use CFClient::OpenGL;
1470 1715
1471my %tex = ( 1716my %tex = (
1472 food => [ 1717 food => [
1473 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1718 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1474 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1719 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1475 ], 1720 ],
1476 grace => [ 1721 grace => [
1477 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1722 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1478 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1723 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1479 ], 1724 ],
1480 hp => [ 1725 hp => [
1481 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1726 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1482 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1727 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1483 ], 1728 ],
1484 mana => [ 1729 mana => [
1485 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1730 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1486 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1731 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1487 ], 1732 ],
1488); 1733);
1489 1734
1490# eg. VGauge->new (gauge => 'food'), default gauge: food 1735# eg. VGauge->new (gauge => 'food'), default gauge: food
1491sub new { 1736sub new {
… …
1529 1774
1530sub _draw { 1775sub _draw {
1531 my ($self) = @_; 1776 my ($self) = @_;
1532 1777
1533 my $tex = $tex{$self->{type}}; 1778 my $tex = $tex{$self->{type}};
1779 my ($t1, $t2, $t3) = @$tex;
1534 1780
1535 my ($w, $h) = ($self->{w}, $self->{h}); 1781 my ($w, $h) = ($self->{w}, $self->{h});
1536 1782
1537 if ($self->{vertical}) { 1783 if ($self->{vertical}) {
1538 glRotate 90, 0, 0, 1; 1784 glRotate 90, 0, 0, 1;
… …
1540 1786
1541 ($w, $h) = ($h, $w); 1787 ($w, $h) = ($h, $w);
1542 } 1788 }
1543 1789
1544 my $ycut = $self->{val} / ($self->{max_val} || 1); 1790 my $ycut = $self->{val} / ($self->{max_val} || 1);
1545 $ycut = 1 if $self->{val} > $self->{max_val};
1546 1791
1547 my $t1 = $tex->[0]; 1792 my $ycut1 = max 0, min 1, $ycut;
1548 my $t2 = $tex->[1]; 1793 my $ycut2 = max 0, min 1, $ycut - 1;
1794
1795 my $h1 = $self->{h} * (1 - $ycut1);
1796 my $h2 = $self->{h} * (1 - $ycut2);
1549 1797
1550 glEnable GL_BLEND; 1798 glEnable GL_BLEND;
1551 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1799 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1552 glEnable GL_TEXTURE_2D; 1800 glEnable GL_TEXTURE_2D;
1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1554 1802
1555 my $h1 = $self->{h} - $ycut * $self->{h};
1556 my $h2 = $ycut * $self->{h};
1557
1558 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1803 glBindTexture GL_TEXTURE_2D, $t1->{name};
1559 glBegin GL_QUADS; 1804 glBegin GL_QUADS;
1560 glTexCoord 0 , 0; glVertex 0 , 0; 1805 glTexCoord 0 , 0; glVertex 0 , 0;
1561 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1806 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1562 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1807 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1563 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1808 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1564 glEnd; 1809 glEnd;
1565 1810
1811 my $ycut1 = List::Util::min 1, $ycut;
1566 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1812 glBindTexture GL_TEXTURE_2D, $t2->{name};
1567 glBegin GL_QUADS; 1813 glBegin GL_QUADS;
1568 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1814 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1569 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1815 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1570 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1816 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1571 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1817 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1572 glEnd; 1818 glEnd;
1819
1820 if ($t3) {
1821 glBindTexture GL_TEXTURE_2D, $t3->{name};
1822 glBegin GL_QUADS;
1823 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1824 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1825 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1826 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1827 glEnd;
1828 }
1573 1829
1574 glDisable GL_BLEND; 1830 glDisable GL_BLEND;
1575 glDisable GL_TEXTURE_2D; 1831 glDisable GL_TEXTURE_2D;
1576} 1832}
1577 1833
… …
1580package CFClient::UI::Gauge; 1836package CFClient::UI::Gauge;
1581 1837
1582our @ISA = CFClient::UI::VBox::; 1838our @ISA = CFClient::UI::VBox::;
1583 1839
1584sub new { 1840sub new {
1585 my ($class, %arg) = shift; 1841 my ($class, %arg) = @_;
1586 1842
1587 my $self = $class->SUPER::new ( 1843 my $self = $class->SUPER::new (
1588 @_, 1844 tooltip => $arg{type},
1845 can_hover => 1,
1846 can_events => 1,
1847 %arg,
1589 ); 1848 );
1590 1849
1591 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1850 $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); 1851 $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"); 1852 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1594 1853
1595 $self 1854 $self
1855}
1856
1857sub set_fontsize {
1858 my ($self, $fsize) = @_;
1859
1860 $self->{value}->set_fontsize ($fsize);
1861 $self->{max} ->set_fontsize ($fsize);
1596} 1862}
1597 1863
1598sub set_value { 1864sub set_value {
1599 my ($self, $val, $max) = @_; 1865 my ($self, $val, $max) = @_;
1600 1866
… …
1757 2023
1758sub new { 2024sub new {
1759 my $class = shift; 2025 my $class = shift;
1760 2026
1761 my $self = $class->SUPER::new ( 2027 my $self = $class->SUPER::new (
1762 fontsize => 1, 2028 fontsize => 1,
2029 can_events => 0,
2030 #font => default_font
1763 @_, 2031 @_,
1764 2032
1765 layout => (new CFClient::Layout), 2033 layout => (new CFClient::Layout),
1766 par => [], 2034 par => [],
1767 height => 0, 2035 height => 0,
1768 children => [ 2036 children => [
1769 (new CFClient::UI::Empty expand => 1), 2037 (new CFClient::UI::Empty expand => 1),
1770 (new CFClient::UI::Slider vertical => 1), 2038 (new CFClient::UI::Slider vertical => 1),
1771 ], 2039 ],
1772 ); 2040 );
1773 2041
… …
1807sub size_allocate { 2075sub size_allocate {
1808 my ($self, $w, $h) = @_; 2076 my ($self, $w, $h) = @_;
1809 2077
1810 $self->SUPER::size_allocate ($w, $h); 2078 $self->SUPER::size_allocate ($w, $h);
1811 2079
2080 $self->{layout}->set_font ($self->{font}) if $self->{font};
1812 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2081 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1813 $self->{layout}->set_width ($self->{children}[0]{w}); 2082 $self->{layout}->set_width ($self->{children}[0]{w});
1814 2083
1815 $self->reflow; 2084 $self->reflow;
1816} 2085}
… …
1869 2138
1870 my $y = 0; 2139 my $y = 0;
1871 2140
1872 my $layout = $self->{layout}; 2141 my $layout = $self->{layout};
1873 2142
2143 $layout->set_font ($self->{font}) if $self->{font};
2144
1874 for my $par (@{$self->{par}}) { 2145 for my $par (@{$self->{par}}) {
1875 my $h = $par->[0]; 2146 my $h = $par->[0];
1876 2147
1877 if ($y0 < $y + $h && $y < $y1) { 2148 if ($y0 < $y + $h && $y < $y1) {
1878 $layout->set_text ($par->[2]); 2149 $layout->set_text ($par->[2]);
… …
1895 my ($self) = @_; 2166 my ($self) = @_;
1896 2167
1897 if ($self->{texture}) { 2168 if ($self->{texture}) {
1898 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
1899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171 glColor 1, 1, 1, 1;
1900 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2172 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1901 glDisable GL_TEXTURE_2D; 2173 glDisable GL_TEXTURE_2D;
1902 } 2174 }
1903 2175
1904 $self->{children}[1]->draw; 2176 $self->{children}[1]->draw;
… …
1955 2227
1956sub new { 2228sub new {
1957 my $class = shift; 2229 my $class = shift;
1958 2230
1959 my $self = $class->SUPER::new ( 2231 my $self = $class->SUPER::new (
1960 state => 0, 2232 state => 0,
1961 connect_activate => \&toggle_flopper, 2233 connect_activate => \&toggle_flopper,
1962 @_ 2234 @_
1963 ); 2235 );
1964 2236
1965 if ($self->{state}) { 2237 if ($self->{state}) {
… …
1986 $self->emit (changed => $self->{state}); 2258 $self->emit (changed => $self->{state});
1987} 2259}
1988 2260
1989############################################################################# 2261#############################################################################
1990 2262
2263package CFClient::UI::Tooltip;
2264
2265our @ISA = CFClient::UI::Bin::;
2266
2267use CFClient::OpenGL;
2268
2269sub new {
2270 my $class = shift;
2271
2272 $class->SUPER::new (
2273 @_,
2274 can_events => 0,
2275 )
2276}
2277
2278sub set_markup {
2279 my ($self, $text) = @_;
2280
2281 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2282 $self->{label}->set_markup ($text);
2283 $self->add ($self->{label});
2284}
2285
2286sub size_request {
2287 my ($self) = @_;
2288
2289 $self->child->set_max_size ($::WIDTH * 0.3);
2290
2291 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2292
2293 ($w + 4, $h + 4)
2294}
2295
2296sub size_allocate {
2297 my ($self, $w, $h) = @_;
2298
2299 $self->SUPER::size_allocate ($w - 4, $h - 4);
2300}
2301
2302sub _draw {
2303 my ($self) = @_;
2304
2305 glPushMatrix;
2306 glTranslate 0.375, 0.375;
2307
2308 my ($w, $h) = @$self{qw(w h)};
2309
2310 glColor 1, 0.8, 0.4;
2311 glBegin GL_QUADS;
2312 glVertex 0 , 0;
2313 glVertex 0 , $h;
2314 glVertex $w, $h;
2315 glVertex $w, 0;
2316 glEnd;
2317
2318 glColor 0, 0, 0;
2319 glBegin GL_LINE_LOOP;
2320 glVertex 0 , 0;
2321 glVertex 0 , $h;
2322 glVertex $w, $h;
2323 glVertex $w, 0;
2324 glEnd;
2325
2326 glPopMatrix;
2327
2328 glTranslate 2, 2;
2329 $self->SUPER::_draw;
2330}
2331
2332#############################################################################
2333
2334package CFClient::UI::Face;
2335
2336our @ISA = CFClient::UI::Base::;
2337
2338use CFClient::OpenGL;
2339
2340sub new {
2341 my $class = shift;
2342
2343 $class->SUPER::new (
2344 aspect => 1,
2345 @_,
2346 )
2347}
2348
2349sub size_request {
2350 (32, 8)
2351}
2352
2353sub draw {
2354 my ($self) = @_;
2355
2356 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2357
2358 if ($tex) {
2359 glEnable GL_BLEND;
2360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361 glEnable GL_TEXTURE_2D;
2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2363 glColor 1, 1, 1, 1;
2364 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2365 glDisable GL_TEXTURE_2D;
2366 glDisable GL_BLEND;
2367 }
2368}
2369
2370#############################################################################
2371
1991package CFClient::UI::Root; 2372package CFClient::UI::Root;
1992 2373
1993our @ISA = CFClient::UI::Container::; 2374our @ISA = CFClient::UI::Container::;
1994 2375
1995use CFClient::OpenGL; 2376use CFClient::OpenGL;
1996 2377
1997sub check_size { 2378sub check_size {
1998 my ($self) = @_; 2379 my ($self) = @_;
1999 2380
2000 $self->configure (0, 0, $::WITH, $::HEIGHT); 2381 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2001} 2382}
2002 2383
2003sub size_request { 2384sub size_request {
2004 ($::WIDTH, $::HEIGHT) 2385 ($::WIDTH, $::HEIGHT)
2005} 2386}
… …
2007sub configure { 2388sub configure {
2008 my ($self, $x, $y, $w, $h) = @_; 2389 my ($self, $x, $y, $w, $h) = @_;
2009 2390
2010 $self->SUPER::configure ($x, $y, $w, $h); 2391 $self->SUPER::configure ($x, $y, $w, $h);
2011 2392
2012 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2013 for @{$self->{children}}; 2393 for my $child (@{$self->{children}}) {
2394 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2395
2396 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2397 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2398 $child->configure ($X, $Y, $W,$H);
2399 }
2014} 2400}
2015 2401
2016sub _topleft { 2402sub _topleft {
2017 my ($self, $x, $y) = @_; 2403 my ($self, $x, $y) = @_;
2018 2404
… …
2026 ::refresh (); 2412 ::refresh ();
2027} 2413}
2028 2414
2029sub add { 2415sub add {
2030 my ($self, $child) = @_; 2416 my ($self, $child) = @_;
2417
2418 # integerize window positions
2419 $child->{x} = int $child->{x};
2420 $child->{y} = int $child->{y};
2031 2421
2032 $self->SUPER::add ($child); 2422 $self->SUPER::add ($child);
2033} 2423}
2034 2424
2035sub on_refresh { 2425sub on_refresh {
… …
2061############################################################################# 2451#############################################################################
2062 2452
2063package CFClient::UI; 2453package CFClient::UI;
2064 2454
2065$ROOT = new CFClient::UI::Root; 2455$ROOT = new CFClient::UI::Root;
2456$TOOLTIP = new CFClient::UI::Tooltip;
2066 2457
20671 24581
2068 2459

Diff Legend

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