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.140 by root, Thu Apr 20 04:20:52 2006 UTC vs.
Revision 1.173 by root, Tue Apr 25 10:30:48 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
151 $self->{x} = $x;
152 $self->{y} = $y;
153
154 if ($self->{aspect}) { 210 if ($self->{aspect}) {
155 $w = List::Util::min $w, int $h * $self->{aspect}; 211 my $w2 = List::Util::min $w, int $h * $self->{aspect};
156 $h = List::Util::min $h, int $w / $self->{aspect}; 212 my $h2 = List::Util::min $h, int $w / $self->{aspect};
157 }
158 213
214 # use alignment to adjust x, y
215
216 $x += int +($w - $w2) * 0.5;
217 $y += int +($h - $h2) * 0.5;
218
219 ($w, $h) = ($w2, $h2);
220 }
221
222 if ($self->{x} != $x || $self->{y} != $y) {
223 $self->{x} = $x;
224 $self->{y} = $y;
225 $self->update;
226 }
227
159 return unless $self->{w} != $w || $self->{h} != $h; 228 if ($self->{w} != $w || $self->{h} != $h) {
160
161 $self->{w} = $w; 229 $self->{w} = $w;
162 $self->{h} = $h; 230 $self->{h} = $h;
163 231
164 $self->size_allocate ($w, $h); 232 $self->size_allocate ($w, $h);
165 $self->update; 233 $self->update;
234 }
166} 235}
167 236
168sub size_allocate { 237sub size_allocate {
169 # nothing to be done 238 # nothing to be done
239}
240
241sub children {
242}
243
244# call when resoltuion changes etc.
245sub reconfigure {
246 my ($self) = @_;
247
248 $_->reconfigure
249 for $self->children;
250
251 $_->check_size;
252}
253
254sub set_max_size {
255 my ($self, $w, $h) = @_;
256
257 delete $self->{max_w}; $self->{max_w} = $w if $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h;
170} 259}
171 260
172# return top left coordinates 261# return top left coordinates
173sub _topleft { 262sub _topleft {
174 my ($self, $x, $y) = @_; 263 my ($self, $x, $y) = @_;
264
265 $self->{parent}
266 or Carp::confess "no parent widget in _topleft\n";#d#
175 267
176 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 268 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
177} 269}
178 270
179# translate global coordinates to local coordinate system 271# translate global coordinates to local coordinate system
… …
257 glVertex $x + $self->{w}, $y + $self->{h}; 349 glVertex $x + $self->{w}, $y + $self->{h};
258 glVertex $x , $y + $self->{h}; 350 glVertex $x , $y + $self->{h};
259 glEnd; 351 glEnd;
260 glDisable GL_BLEND; 352 glDisable GL_BLEND;
261 } 353 }
354
355 if ($ENV{PCLIENT_DEBUG}) {
356 glPushMatrix;
357 glColor 1, 1, 0, 1;
358 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
359 glBegin GL_LINE_LOOP;
360 glVertex 0 , 0;
361 glVertex $self->{w}, 0;
362 glVertex $self->{w}, $self->{h};
363 glVertex 0 , $self->{h};
364 glEnd;
365 glPopMatrix;
366 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
367 }
262} 368}
263 369
264sub _draw { 370sub _draw {
265 my ($self) = @_; 371 my ($self) = @_;
266 372
267 warn "no draw defined for $self\n"; 373 warn "no draw defined for $self\n";
268} 374}
269 375
270sub find_widget { 376sub find_widget {
271 my ($self, $x, $y) = @_; 377 my ($self, $x, $y) = @_;
378
379 return () unless $self->{can_events};
272 380
273 return $self 381 return $self
274 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 382 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
275 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 383 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
276 384
… …
284} 392}
285 393
286sub check_size { 394sub check_size {
287 my ($self) = @_; 395 my ($self) = @_;
288 396
289 my ($w, $h) = $self->size_request; 397 $self->{parent}
398 or return 1;
290 399
400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
403
291 if ($w != $self->{req_w} || $h != $self->{req_h}) { 404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
292 $self->{req_w} = $w; 405 $self->{req_w} = $w;
293 $self->{req_h} = $h; 406 $self->{req_h} = $h;
294 407
295 $self->{parent}->check_size 408 $self->{parent}->check_size
296 if $self->{parent}; 409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
297 } 417 }
298} 418}
299 419
300sub update { 420sub update {
301 my ($self) = @_; 421 my ($self) = @_;
… …
311} 431}
312 432
313sub emit { 433sub emit {
314 my ($self, $signal, @args) = @_; 434 my ($self, $signal, @args) = @_;
315 435
316 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
317 $cb->($self, @args);
318 }
319} 437}
320 438
321sub DESTROY { 439sub DESTROY {
322 my ($self) = @_; 440 my ($self) = @_;
323 441
… …
368 486
369package CFClient::UI::Empty; 487package CFClient::UI::Empty;
370 488
371our @ISA = CFClient::UI::Base::; 489our @ISA = CFClient::UI::Base::;
372 490
491sub new {
492 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg);
494}
495
373sub size_request { 496sub size_request {
374 (0, 0) 497 (0, 0)
375} 498}
376 499
377sub draw { } 500sub draw { }
… …
385sub new { 508sub new {
386 my ($class, %arg) = @_; 509 my ($class, %arg) = @_;
387 510
388 my $children = delete $arg{children} || []; 511 my $children = delete $arg{children} || [];
389 512
390 my $self = $class->SUPER::new (children => [], %arg); 513 my $self = $class->SUPER::new (
514 children => [],
515 can_events => 0,
516 %arg,
517 );
391 $self->add ($_) for @$children; 518 $self->add ($_) for @$children;
392 519
393 $self 520 $self
394} 521}
395 522
… …
406 ]; 533 ];
407 534
408 $child->check_size; 535 $child->check_size;
409} 536}
410 537
538sub children {
539 @{ $_[0]{children} }
540}
541
411sub remove { 542sub remove {
412 my ($self, $child) = @_; 543 my ($self, $child) = @_;
413 544
414 delete $child->{parent}; 545 delete $child->{parent};
546 $child->hide;
415 547
416 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 548 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
417 549
418 $self->check_size; 550 $self->check_size;
551 $self->update;
552}
553
554sub clear {
555 my ($self) = @_;
556
557 my $children = delete $self->{children};
558 $self->{children} = [];
559
560 for (@$children) {
561 delete $_->{parent};
562 $_->hide;
563 }
419} 564}
420 565
421sub find_widget { 566sub find_widget {
422 my ($self, $x, $y) = @_; 567 my ($self, $x, $y) = @_;
423 568
… …
551sub new { die } 696sub new { die }
552 697
553sub size_request { 698sub size_request {
554 my ($self) = @_; 699 my ($self) = @_;
555 700
556 @$self{qw(child_w child_h)} = $self->child->size_request; 701 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
557 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
558 703
559 @$self{qw(child_w child_h)} 704 @$self{qw(child_w child_h)}
560} 705}
561 706
… …
571package CFClient::UI::Frame; 716package CFClient::UI::Frame;
572 717
573our @ISA = CFClient::UI::Bin::; 718our @ISA = CFClient::UI::Bin::;
574 719
575use CFClient::OpenGL; 720use CFClient::OpenGL;
576
577sub size_request {
578 my ($self) = @_;
579 my $chld = $self->child
580 or return (0, 0);
581
582 $chld->move (2, 2);
583
584 map { $_ + 4 } $chld->size_request;
585}
586
587sub size_allocate {
588 my ($self, $x, $y, $w, $h) = @_;
589
590 $self->child->configure (2, 2, $w - 4, $h - 4);
591}
592
593sub _draw {
594 my ($self) = @_;
595
596 my $chld = $self->child;
597
598 my ($w, $h) = $chld->size_request;
599
600 glBegin GL_QUADS;
601 glColor 0, 0, 0;
602 glVertex 0 , 0;
603 glVertex 0 , $h + 4;
604 glVertex $w + 4 , $h + 4;
605 glVertex $w + 4 , 0;
606 glEnd;
607
608 $chld->draw;
609}
610
611#############################################################################
612
613package CFClient::UI::FancyFrame;
614
615our @ISA = CFClient::UI::Bin::;
616
617use CFClient::OpenGL;
618
619my @tex =
620 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
621 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
622 721
623sub new { 722sub new {
624 my $class = shift; 723 my $class = shift;
625 724
626 # TODO: user_x, user_y, overwrite moveto?
627
628 $class->SUPER::new ( 725 my $self = $class->SUPER::new (
629 bg => [1, 1, 1, 1], 726 bg => [1, 1, 1, 1],
630 border_bg => [1, 1, 1, 1], 727 border_bg => [1, 1, 1, 1],
631 border => 0.8, 728 border => 0.8,
632 @_ 729 @_
633 ) 730 );
731
732 $self
733}
734
735sub _draw {
736 my ($self) = @_;
737
738 my ($w, $h) = ($self->{w}, $self->{h});
739
740 glEnable GL_BLEND;
741 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
742 glEnable GL_TEXTURE_2D;
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744
745# glBegin GL_QUADS;
746# glColor 0, 0, 0, 0;
747# glVertex 0 , 0;
748# glVertex 0 , $h;
749# glVertex $w, $h;
750# glVertex $w, 0;
751# glEnd;
752
753
754 $self->child->draw;
755 glDisable GL_BLEND;
756 glDisable GL_TEXTURE_2D;
757}
758
759#############################################################################
760
761package CFClient::UI::FancyFrame;
762
763our @ISA = CFClient::UI::Bin::;
764
765use CFClient::OpenGL;
766
767my @tex =
768 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
769 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
770
771sub new {
772 my $class = shift;
773
774 # TODO: user_x, user_y, overwrite moveto?
775
776 my $self = $class->SUPER::new (
777 bg => [1, 1, 1, 1],
778 border_bg => [1, 1, 1, 1],
779 border => 0.8,
780 can_events => 1,
781 @_
782 );
783
784 $self->{title} &&= new CFClient::UI::Label
785 align => 0,
786 valign => 1,
787 text => $self->{title},
788 fontsize => 1;
789
790 $self
634} 791}
635 792
636sub border { 793sub border {
637 int $_[0]{border} * $::FONTSIZE 794 int $_[0]{border} * $::FONTSIZE
638} 795}
639 796
640sub size_request { 797sub size_request {
641 my ($self) = @_; 798 my ($self) = @_;
642
643 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
644 799
645 my ($w, $h) = $self->SUPER::size_request; 800 my ($w, $h) = $self->SUPER::size_request;
646 801
647 ( 802 (
648 $w + $self->border * 2, 803 $w + $self->border * 2,
… …
653sub size_allocate { 808sub size_allocate {
654 my ($self, $w, $h) = @_; 809 my ($self, $w, $h) = @_;
655 810
656 $h -= List::Util::max 0, $self->border * 2; 811 $h -= List::Util::max 0, $self->border * 2;
657 $w -= List::Util::max 0, $self->border * 2; 812 $w -= List::Util::max 0, $self->border * 2;
813
814 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
815 if $self->{title};
658 816
659 $self->child->configure ($self->border, $self->border, $w, $h); 817 $self->child->configure ($self->border, $self->border, $w, $h);
660} 818}
661 819
662sub button_down { 820sub button_down {
… …
742 $bg->draw_quad ($border, $border, $cw, $ch); 900 $bg->draw_quad ($border, $border, $cw, $ch);
743 901
744 glDisable GL_TEXTURE_2D; 902 glDisable GL_TEXTURE_2D;
745 glDisable GL_BLEND; 903 glDisable GL_BLEND;
746 904
905 $self->{title}->draw if $self->{title};
747 $self->child->draw; 906 $self->child->draw;
748} 907}
749 908
750############################################################################# 909#############################################################################
751 910
… …
773 $self->{children}[$y][$x] = $child; 932 $self->{children}[$y][$x] = $child;
774 933
775 $child->check_size; 934 $child->check_size;
776} 935}
777 936
937sub children {
938 grep $_, map @$_, grep $_, @{ $_[0]{children} }
939}
940
778# TODO: move to container class maybe? send childs a signal on removal? 941# TODO: move to container class maybe? send childs a signal on removal?
779sub clear { 942sub clear {
780 my ($self) = @_; 943 my ($self) = @_;
781 944
945 my @children = $self->children;
782 delete $self->{children}; 946 delete $self->{children};
947
948 for (@children) {
949 delete $_->{parent};
950 $_->hide;
951 }
952
783 $self->update; 953 $self->update;
784} 954}
785 955
786sub get_wh { 956sub get_wh {
787 my ($self) = @_; 957 my ($self) = @_;
… …
793 or next; 963 or next;
794 964
795 for my $x (0 .. $#$row) { 965 for my $x (0 .. $#$row) {
796 my $widget = $row->[$x] 966 my $widget = $row->[$x]
797 or next; 967 or next;
798 my ($w, $h) = $widget->size_request; 968 my ($w, $h) = @$widget{qw(req_w req_h)};
799 969
800 $w[$x] = max $w[$x], $w; 970 $w[$x] = max $w[$x], $w;
801 $h[$y] = max $h[$y], $h; 971 $h[$y] = max $h[$y], $h;
802 } 972 }
803 } 973 }
… …
908 1078
909 ($h, $w) = ($w, $h); 1079 ($h, $w) = ($w, $h);
910 1080
911 my $children = $self->{children}; 1081 my $children = $self->{children};
912 1082
913 my @h = map +($_->size_request)[0], @$children; 1083 my @h = map $_->{req_w}, @$children;
914 1084
915 my $req_h = List::Util::sum @h; 1085 my $req_h = List::Util::sum @h;
916 1086
917 if ($req_h > $h) { 1087 if ($req_h > $h) {
918 # ah well, not enough space 1088 # ah well, not enough space
… …
966sub size_allocate { 1136sub size_allocate {
967 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
968 1138
969 my $children = $self->{children}; 1139 my $children = $self->{children};
970 1140
971 my @h = map +($_->size_request)[1], @$children; 1141 my @h = map $_->{req_h}, @$children;
972 1142
973 my $req_h = List::Util::sum @h; 1143 my $req_h = List::Util::sum @h;
974 1144
975 if ($req_h > $h) { 1145 if ($req_h > $h) {
976 # ah well, not enough space 1146 # ah well, not enough space
… …
1010 1180
1011sub new { 1181sub new {
1012 my ($class, %arg) = @_; 1182 my ($class, %arg) = @_;
1013 1183
1014 my $self = $class->SUPER::new ( 1184 my $self = $class->SUPER::new (
1015 fg => [1, 1, 1], 1185 fg => [1, 1, 1],
1186 #font => default_font
1016 fontsize => 1, 1187 fontsize => 1,
1017 text => "", 1188 text => "",
1018 align => -1, 1189 align => -1,
1019 valign => -1, 1190 valign => -1,
1020 padding => 2, 1191 padding => 2,
1021 layout => new CFClient::Layout, 1192 layout => new CFClient::Layout,
1193 can_events => 0,
1022 %arg 1194 %arg
1023 ); 1195 );
1024 1196
1025 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1197 if (exists $self->{template}) {
1198 my $layout = new CFClient::Layout;
1199 $layout->set_text (delete $self->{template});
1200 $self->{template} = $layout;
1201 }
1026 1202
1027 $self->set_text (delete $self->{text}) if exists $self->{text}; 1203 $self->set_text (delete $self->{text}) if exists $self->{text};
1028 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1204 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1029 1205
1030 $self 1206 $self
1031} 1207}
1032 1208
1033sub escape_text { 1209sub escape {
1034 local $_ = $_[1]; 1210 local $_ = $_[1];
1035 1211
1036 s/&/&amp;/g; 1212 s/&/&amp;/g;
1037 s/>/&gt;/g; 1213 s/>/&gt;/g;
1038 s/</&lt;/g; 1214 s/</&lt;/g;
1039 1215
1040 $_[1] 1216 $_[1]
1041} 1217}
1042 1218
1219sub update {
1220 my ($self) = @_;
1221
1222 delete $self->{texture};
1223 $self->SUPER::update;
1224}
1225
1226sub reconfigure {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230}
1231
1043sub set_text { 1232sub set_text {
1044 my ($self, $text) = @_; 1233 my ($self, $text) = @_;
1045 1234
1235 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text";
1237
1046 $self->{layout}->set_text ($text); 1238 $self->{layout}->set_text ($text);
1047 1239
1048 delete $self->{texture}; 1240 delete $self->{texture};
1049 $self->update; 1241 $self->update;
1242 $self->check_size;
1050} 1243}
1051 1244
1052sub set_markup { 1245sub set_markup {
1053 my ($self, $markup) = @_; 1246 my ($self, $markup) = @_;
1054 1247
1248 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup";
1250
1055 $self->{layout}->set_markup ($markup); 1251 $self->{layout}->set_markup ($markup);
1056 1252
1057 delete $self->{texture}; 1253 delete $self->{texture};
1058 $self->update; 1254 $self->update;
1255 $self->check_size;
1059} 1256}
1060 1257
1061sub size_request { 1258sub size_request {
1062 my ($self) = @_; 1259 my ($self) = @_;
1063 1260
1064 $self->{layout}->set_width; 1261 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $self->{layout}->set_width ($self->{max_w} || -1);
1065 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1066 1264
1067 my ($w, $h) = $self->{layout}->size; 1265 my ($w, $h) = $self->{layout}->size;
1266
1267 if (exists $self->{template}) {
1268 $self->{template}->set_font ($self->{font}) if $self->{font};
1269 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1270
1271 my ($w2, $h2) = $self->{template}->size;
1272
1273 $w = List::Util::max $w, $w2;
1274 $h = List::Util::max $h, $h2;
1275 }
1068 1276
1069 ( 1277 (
1070 $w + $self->{padding} * 2, 1278 $w + $self->{padding} * 2,
1071 $h + $self->{padding} * 2, 1279 $h + $self->{padding} * 2,
1072 ) 1280 )
… …
1076 my ($self, $w, $h) = @_; 1284 my ($self, $w, $h) = @_;
1077 1285
1078 delete $self->{texture}; 1286 delete $self->{texture};
1079} 1287}
1080 1288
1289sub set_fontsize {
1290 my ($self, $fontsize) = @_;
1291
1292 $self->{fontsize} = $fontsize;
1293 delete $self->{texture};
1294 $self->check_size;
1295 $self->update;
1296}
1297
1081sub _draw { 1298sub _draw {
1082 my ($self) = @_; 1299 my ($self) = @_;
1083 1300
1084 my $tex = $self->{texture} ||= do { 1301 my $tex = $self->{texture} ||= do {
1302 $self->{layout}->set_font ($self->{font}) if $self->{font};
1085 $self->{layout}->set_width ($self->{w}); 1303 $self->{layout}->set_width ($self->{w});
1086 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1304 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1087 new_from_layout CFClient::Texture $self->{layout} 1305 new_from_layout CFClient::Texture $self->{layout}
1088 }; 1306 };
1089 1307
… …
1122 1340
1123sub new { 1341sub new {
1124 my $class = shift; 1342 my $class = shift;
1125 1343
1126 $class->SUPER::new ( 1344 $class->SUPER::new (
1127 fg => [1, 1, 1], 1345 fg => [1, 1, 1],
1128 bg => [0, 0, 0, 0.2], 1346 bg => [0, 0, 0, 0.2],
1129 active_bg => [1, 1, 1, 0.5], 1347 active_bg => [1, 1, 1, 0.5],
1130 active_fg => [0, 0, 0], 1348 active_fg => [0, 0, 0],
1131 can_hover => 1, 1349 can_hover => 1,
1132 can_focus => 1, 1350 can_focus => 1,
1133 valign => 0, 1351 valign => 0,
1352 can_events => 1,
1134 @_ 1353 @_
1135 ) 1354 )
1136} 1355}
1137 1356
1138sub _set_text { 1357sub _set_text {
… …
1166} 1385}
1167 1386
1168sub size_allocate { 1387sub size_allocate {
1169 my ($self, $w, $h) = @_; 1388 my ($self, $w, $h) = @_;
1170 1389
1171 $self->_set_text ($self->{text}); 1390 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1172} 1391}
1173 1392
1174sub set_text { 1393sub set_text {
1175 my ($self, $text) = @_; 1394 my ($self, $text) = @_;
1176 1395
… …
1291 my ($self, $ev) = @_; 1510 my ($self, $ev) = @_;
1292 1511
1293 my $sym = $ev->{sym}; 1512 my $sym = $ev->{sym};
1294 1513
1295 if ($sym == 13) { 1514 if ($sym == 13) {
1515 unshift @{$self->{history}},
1516 my $txt = $self->get_text;
1517 $self->{history_pointer} = -1;
1518 $self->{history_saveback} = '';
1296 $self->emit (activate => $self->get_text); 1519 $self->emit (activate => $txt);
1297 $self->update; 1520 $self->update;
1521
1522 } elsif ($sym == CFClient::SDLK_UP) {
1523 if ($self->{history_pointer} < 0) {
1524 $self->{history_saveback} = $self->get_text;
1525 }
1526 if (@{$self->{history} || []} > 0) {
1527 $self->{history_pointer}++;
1528 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1529 $self->{history_pointer} = @{$self->{history} || []} - 1;
1530 }
1531 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1532 }
1533
1534 } elsif ($sym == CFClient::SDLK_DOWN) {
1535 $self->{history_pointer}--;
1536 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1537
1538 if ($self->{history_pointer} >= 0) {
1539 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1540 } else {
1541 $self->set_text ($self->{history_saveback});
1542 }
1298 1543
1299 } else { 1544 } else {
1300 $self->SUPER::key_down ($ev); 1545 $self->SUPER::key_down ($ev);
1301 } 1546 }
1302 1547
… …
1309our @ISA = CFClient::UI::Label::; 1554our @ISA = CFClient::UI::Label::;
1310 1555
1311use CFClient::OpenGL; 1556use CFClient::OpenGL;
1312 1557
1313my @tex = 1558my @tex =
1314 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1559 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1315 qw(b1_button_active.png); 1560 qw(b1_button_active.png);
1316 1561
1317sub new { 1562sub new {
1318 my $class = shift; 1563 my $class = shift;
1319 1564
1320 $class->SUPER::new ( 1565 $class->SUPER::new (
1321 padding => 4, 1566 padding => 4,
1322 fg => [1, 1, 1], 1567 fg => [1, 1, 1],
1323 bg => [1, 1, 1, 0.2], 1568 bg => [1, 1, 1, 0.2],
1324 active_fg => [0, 0, 1], 1569 active_fg => [0, 0, 1],
1325 can_hover => 1, 1570 can_hover => 1,
1326 align => 0, 1571 align => 0,
1327 valign => 0, 1572 valign => 0,
1573 can_events => 1,
1328 @_ 1574 @_
1329 ) 1575 )
1330} 1576}
1331 1577
1332sub button_up { 1578sub button_up {
… …
1366package CFClient::UI::CheckBox; 1612package CFClient::UI::CheckBox;
1367 1613
1368our @ISA = CFClient::UI::DrawBG::; 1614our @ISA = CFClient::UI::DrawBG::;
1369 1615
1370my @tex = 1616my @tex =
1371 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1372 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1618 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1373 1619
1374use CFClient::OpenGL; 1620use CFClient::OpenGL;
1375 1621
1376sub new { 1622sub new {
… …
1425 glDisable GL_BLEND; 1671 glDisable GL_BLEND;
1426} 1672}
1427 1673
1428############################################################################# 1674#############################################################################
1429 1675
1430package CFClient::UI::VGauge; 1676package CFClient::UI::Image;
1431 1677
1432our @ISA = CFClient::UI::Base::; 1678our @ISA = CFClient::UI::Base::;
1433 1679
1434use CFClient::OpenGL; 1680use CFClient::OpenGL;
1681use Carp qw/confess/;
1435 1682
1436my %tex = ( 1683our %loaded_images;
1437 food => [
1438 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1439 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1440 ],
1441 grace => [
1442 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1443 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1444 ],
1445 hp => [
1446 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1447 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1448 ],
1449 mana => [
1450 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1451 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1452 ],
1453);
1454 1684
1455# eg. VGauge->new (gauge => 'food'), default gauge: food
1456sub new { 1685sub new {
1457 my $class = shift; 1686 my $class = shift;
1458 1687
1459 my $self = $class->SUPER::new ( 1688 my $self = $class->SUPER::new (can_events => 0, @_);
1460 gauge => 'food',
1461 @_
1462 );
1463 1689
1464 $self->{aspect} = $tex{$self->{gauge}}[0]{w} / $tex{$self->{gauge}}[0]{h}; 1690 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1691
1692 $loaded_images{$self->{image}} ||=
1693 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1694
1695 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1696
1697 Scalar::Util::weaken $loaded_images{$self->{image}};
1698
1699 $self->{aspect} = $tex->{w} / $tex->{h};
1465 1700
1466 $self 1701 $self
1467} 1702}
1468 1703
1469sub size_request { 1704sub size_request {
1470 my ($self) = @_; 1705 my ($self) = @_;
1471 1706
1472 my $tex = $tex{$self->{gauge}}[0]; 1707 ($self->{tex}->{w}, $self->{tex}->{h})
1473
1474 @$tex{qw(w h)}
1475}
1476
1477sub set_max {
1478 my ($self, $max) = @_;
1479
1480 $self->{max_val} = $max;
1481}
1482
1483sub set_value {
1484 my ($self, $val, $max) = @_;
1485
1486 $self->set_max ($max)
1487 if defined $max;
1488
1489 $max = $self->{max_val};
1490 $self->{val} = $val;
1491
1492 $self->update;
1493} 1708}
1494 1709
1495sub _draw { 1710sub _draw {
1496 my ($self) = @_; 1711 my ($self) = @_;
1497 1712
1498 my $tex = $tex{$self->{gauge}}; 1713 my $tex = $self->{tex};
1499 1714
1500 my ($w, $h) = ($self->{w}, $self->{h}); 1715 my ($w, $h) = ($self->{w}, $self->{h});
1501 1716
1502 my $ycut = $self->{val} / ($self->{max_val} || 1); 1717 if ($self->{rot90}) {
1503 $ycut = 1 if $self->{val} > $self->{max_val}; 1718 glRotate 90, 0, 0, 1;
1719 glTranslate 0, -$self->{w}, 0;
1504 1720
1505 my $t1 = $tex->[0]; 1721 ($w, $h) = ($h, $w);
1506 my $t2 = $tex->[1]; 1722 }
1507 1723
1508 glEnable GL_BLEND; 1724 glEnable GL_BLEND;
1509 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1510 glEnable GL_TEXTURE_2D; 1726 glEnable GL_TEXTURE_2D;
1511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1512 1728
1729 $tex->draw_quad (0, 0, $w, $h);
1730
1731 glDisable GL_BLEND;
1732 glDisable GL_TEXTURE_2D;
1733}
1734
1735#############################################################################
1736
1737package CFClient::UI::VGauge;
1738
1739our @ISA = CFClient::UI::Base::;
1740
1741use List::Util qw(min max);
1742
1743use CFClient::OpenGL;
1744
1745my %tex = (
1746 food => [
1747 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1748 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1749 ],
1750 grace => [
1751 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1752 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1753 ],
1754 hp => [
1755 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1756 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1757 ],
1758 mana => [
1759 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1760 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1761 ],
1762);
1763
1764# eg. VGauge->new (gauge => 'food'), default gauge: food
1765sub new {
1766 my $class = shift;
1767
1768 my $self = $class->SUPER::new (
1769 type => 'food',
1770 @_
1771 );
1772
1773 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1774
1775 $self
1776}
1777
1778sub size_request {
1779 my ($self) = @_;
1780
1781 #my $tex = $tex{$self->{type}}[0];
1782 #@$tex{qw(w h)}
1783 (0, 0)
1784}
1785
1786sub set_max {
1787 my ($self, $max) = @_;
1788
1789 return if $self->{max_val} == $max;
1790
1791 $self->{max_val} = $max;
1792 $self->update;
1793}
1794
1795sub set_value {
1796 my ($self, $val, $max) = @_;
1797
1798 $self->set_max ($max)
1799 if defined $max;
1800
1801 return if $self->{val} == $val;
1802
1803 $self->{val} = $val;
1804 $self->update;
1805}
1806
1807sub _draw {
1808 my ($self) = @_;
1809
1810 my $tex = $tex{$self->{type}};
1811 my ($t1, $t2, $t3) = @$tex;
1812
1813 my ($w, $h) = ($self->{w}, $self->{h});
1814
1815 if ($self->{vertical}) {
1816 glRotate 90, 0, 0, 1;
1817 glTranslate 0, -$self->{w}, 0;
1818
1819 ($w, $h) = ($h, $w);
1820 }
1821
1822 my $ycut = $self->{val} / ($self->{max_val} || 1);
1823
1824 my $ycut1 = max 0, min 1, $ycut;
1825 my $ycut2 = max 0, min 1, $ycut - 1;
1826
1513 my $h1 = $self->{h} - $ycut * $self->{h}; 1827 my $h1 = $self->{h} * (1 - $ycut1);
1514 my $h2 = $ycut * $self->{h}; 1828 my $h2 = $self->{h} * (1 - $ycut2);
1515 1829
1516 my $yp = 0; 1830 glEnable GL_BLEND;
1831 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1832 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1517 1834
1518 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1835 glBindTexture GL_TEXTURE_2D, $t1->{name};
1519 glBegin GL_QUADS; 1836 glBegin GL_QUADS;
1520 glTexCoord 0 , 0; glVertex 0 , $yp; 1837 glTexCoord 0 , 0; glVertex 0 , 0;
1521 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1; 1838 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1522 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1; 1839 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1523 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp; 1840 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1524 glEnd; 1841 glEnd;
1525 1842
1526 $yp += $h1; 1843 my $ycut1 = List::Util::min 1, $ycut;
1527
1528 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1844 glBindTexture GL_TEXTURE_2D, $t2->{name};
1529 glBegin GL_QUADS; 1845 glBegin GL_QUADS;
1530 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp; 1846 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1531 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2; 1847 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1532 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1533 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp; 1848 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1849 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1534 glEnd; 1850 glEnd;
1851
1852 if ($t3) {
1853 glBindTexture GL_TEXTURE_2D, $t3->{name};
1854 glBegin GL_QUADS;
1855 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1856 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1857 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1858 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1859 glEnd;
1860 }
1535 1861
1536 glDisable GL_BLEND; 1862 glDisable GL_BLEND;
1537 glDisable GL_TEXTURE_2D; 1863 glDisable GL_TEXTURE_2D;
1864}
1865
1866#############################################################################
1867
1868package CFClient::UI::Gauge;
1869
1870our @ISA = CFClient::UI::VBox::;
1871
1872sub new {
1873 my ($class, %arg) = @_;
1874
1875 my $self = $class->SUPER::new (
1876 tooltip => $arg{type},
1877 can_hover => 1,
1878 can_events => 1,
1879 %arg,
1880 );
1881
1882 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1883 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1884 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1885
1886 $self
1887}
1888
1889sub set_fontsize {
1890 my ($self, $fsize) = @_;
1891
1892 $self->{value}->set_fontsize ($fsize);
1893 $self->{max} ->set_fontsize ($fsize);
1894}
1895
1896sub set_max {
1897 my ($self, $max) = @_;
1898
1899 $self->{gauge}->set_max ($max);
1900 $self->{max}->set_text ($max);
1901}
1902
1903sub set_value {
1904 my ($self, $val, $max) = @_;
1905
1906 $self->set_max ($max)
1907 if defined $max;
1908
1909 $self->{gauge}->set_value ($val, $max);
1910 $self->{value}->set_text ($val);
1538} 1911}
1539 1912
1540############################################################################# 1913#############################################################################
1541 1914
1542package CFClient::UI::Slider; 1915package CFClient::UI::Slider;
… …
1682 2055
1683sub new { 2056sub new {
1684 my $class = shift; 2057 my $class = shift;
1685 2058
1686 my $self = $class->SUPER::new ( 2059 my $self = $class->SUPER::new (
1687 fontsize => 1, 2060 fontsize => 1,
2061 can_events => 0,
2062 #font => default_font
1688 @_, 2063 @_,
1689 2064
1690 layout => (new CFClient::Layout), 2065 layout => (new CFClient::Layout),
1691 par => [], 2066 par => [],
1692 height => 0, 2067 height => 0,
1693 children => [ 2068 children => [
1694 (new CFClient::UI::Empty expand => 1), 2069 (new CFClient::UI::Empty expand => 1),
1695 (new CFClient::UI::Slider vertical => 1), 2070 (new CFClient::UI::Slider vertical => 1),
1696 ], 2071 ],
1697 ); 2072 );
1698 2073
… …
1732sub size_allocate { 2107sub size_allocate {
1733 my ($self, $w, $h) = @_; 2108 my ($self, $w, $h) = @_;
1734 2109
1735 $self->SUPER::size_allocate ($w, $h); 2110 $self->SUPER::size_allocate ($w, $h);
1736 2111
2112 $self->{layout}->set_font ($self->{font}) if $self->{font};
1737 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2113 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1738 $self->{layout}->set_width ($self->{children}[0]{w}); 2114 $self->{layout}->set_width ($self->{children}[0]{w});
1739 2115
1740 $self->reflow; 2116 $self->reflow;
1741} 2117}
… …
1794 2170
1795 my $y = 0; 2171 my $y = 0;
1796 2172
1797 my $layout = $self->{layout}; 2173 my $layout = $self->{layout};
1798 2174
2175 $layout->set_font ($self->{font}) if $self->{font};
2176
1799 for my $par (@{$self->{par}}) { 2177 for my $par (@{$self->{par}}) {
1800 my $h = $par->[0]; 2178 my $h = $par->[0];
1801 2179
1802 if ($y0 < $y + $h && $y < $y1) { 2180 if ($y0 < $y + $h && $y < $y1) {
1803 $layout->set_text ($par->[2]); 2181 $layout->set_text ($par->[2]);
… …
1820 my ($self) = @_; 2198 my ($self) = @_;
1821 2199
1822 if ($self->{texture}) { 2200 if ($self->{texture}) {
1823 glEnable GL_TEXTURE_2D; 2201 glEnable GL_TEXTURE_2D;
1824 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1;
1825 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2204 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1826 glDisable GL_TEXTURE_2D; 2205 glDisable GL_TEXTURE_2D;
1827 } 2206 }
1828 2207
1829 $self->{children}[1]->draw; 2208 $self->{children}[1]->draw;
… …
1880 2259
1881sub new { 2260sub new {
1882 my $class = shift; 2261 my $class = shift;
1883 2262
1884 my $self = $class->SUPER::new ( 2263 my $self = $class->SUPER::new (
1885 state => 0, 2264 state => 0,
1886 connect_activate => \&toggle_flopper, 2265 connect_activate => \&toggle_flopper,
1887 @_ 2266 @_
1888 ); 2267 );
1889 2268
1890 if ($self->{state}) { 2269 if ($self->{state}) {
… …
1911 $self->emit (changed => $self->{state}); 2290 $self->emit (changed => $self->{state});
1912} 2291}
1913 2292
1914############################################################################# 2293#############################################################################
1915 2294
2295package CFClient::UI::Tooltip;
2296
2297our @ISA = CFClient::UI::Bin::;
2298
2299use CFClient::OpenGL;
2300
2301sub new {
2302 my $class = shift;
2303
2304 $class->SUPER::new (
2305 @_,
2306 can_events => 0,
2307 )
2308}
2309
2310sub set_markup {
2311 my ($self, $text) = @_;
2312
2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2314 $self->{label}->set_markup ($text);
2315 $self->add ($self->{label});
2316}
2317
2318sub size_request {
2319 my ($self) = @_;
2320
2321 $self->child->set_max_size ($::WIDTH * 0.3);
2322
2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324
2325 ($w + 4, $h + 4)
2326}
2327
2328sub size_allocate {
2329 my ($self, $w, $h) = @_;
2330
2331 $self->SUPER::size_allocate ($w - 4, $h - 4);
2332}
2333
2334sub _draw {
2335 my ($self) = @_;
2336
2337 glPushMatrix;
2338 glTranslate 0.375, 0.375;
2339
2340 my ($w, $h) = @$self{qw(w h)};
2341
2342 glColor 1, 0.8, 0.4;
2343 glBegin GL_QUADS;
2344 glVertex 0 , 0;
2345 glVertex 0 , $h;
2346 glVertex $w, $h;
2347 glVertex $w, 0;
2348 glEnd;
2349
2350 glColor 0, 0, 0;
2351 glBegin GL_LINE_LOOP;
2352 glVertex 0 , 0;
2353 glVertex 0 , $h;
2354 glVertex $w, $h;
2355 glVertex $w, 0;
2356 glEnd;
2357
2358 glPopMatrix;
2359
2360 glTranslate 2, 2;
2361 $self->SUPER::_draw;
2362}
2363
2364#############################################################################
2365
2366package CFClient::UI::Face;
2367
2368our @ISA = CFClient::UI::Base::;
2369
2370use CFClient::OpenGL;
2371
2372sub new {
2373 my $class = shift;
2374
2375 $class->SUPER::new (
2376 aspect => 1,
2377 @_,
2378 )
2379}
2380
2381sub size_request {
2382 (32, 8)
2383}
2384
2385sub draw {
2386 my ($self) = @_;
2387
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2389
2390 if ($tex) {
2391 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395 glColor 1, 1, 1, 1;
2396 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2397 glDisable GL_TEXTURE_2D;
2398 glDisable GL_BLEND;
2399 }
2400}
2401
2402#############################################################################
2403
1916package CFClient::UI::Root; 2404package CFClient::UI::Root;
1917 2405
1918our @ISA = CFClient::UI::Container::; 2406our @ISA = CFClient::UI::Container::;
1919 2407
1920use CFClient::OpenGL; 2408use CFClient::OpenGL;
1921 2409
1922sub check_size { 2410sub check_size {
1923 my ($self) = @_; 2411 my ($self) = @_;
1924 2412
1925 $self->configure (0, 0, $::WITH, $::HEIGHT); 2413 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
1926} 2414}
1927 2415
1928sub size_request { 2416sub size_request {
1929 ($::WIDTH, $::HEIGHT) 2417 ($::WIDTH, $::HEIGHT)
1930} 2418}
… …
1932sub configure { 2420sub configure {
1933 my ($self, $x, $y, $w, $h) = @_; 2421 my ($self, $x, $y, $w, $h) = @_;
1934 2422
1935 $self->SUPER::configure ($x, $y, $w, $h); 2423 $self->SUPER::configure ($x, $y, $w, $h);
1936 2424
1937 $_->configure ($_->{x}, $_->{y}, $_->size_request)
1938 for @{$self->{children}}; 2425 for my $child (@{$self->{children}}) {
2426 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2427
2428 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2429 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2430 $child->configure ($X, $Y, $W,$H);
2431 }
1939} 2432}
1940 2433
1941sub _topleft { 2434sub _topleft {
1942 my ($self, $x, $y) = @_; 2435 my ($self, $x, $y) = @_;
1943 2436
… …
1951 ::refresh (); 2444 ::refresh ();
1952} 2445}
1953 2446
1954sub add { 2447sub add {
1955 my ($self, $child) = @_; 2448 my ($self, $child) = @_;
2449
2450 # integerize window positions
2451 $child->{x} = int $child->{x};
2452 $child->{y} = int $child->{y};
1956 2453
1957 $self->SUPER::add ($child); 2454 $self->SUPER::add ($child);
1958} 2455}
1959 2456
1960sub on_refresh { 2457sub on_refresh {
… …
1986############################################################################# 2483#############################################################################
1987 2484
1988package CFClient::UI; 2485package CFClient::UI;
1989 2486
1990$ROOT = new CFClient::UI::Root; 2487$ROOT = new CFClient::UI::Root;
2488$TOOLTIP = new CFClient::UI::Tooltip;
1991 2489
19921 24901
1993 2491

Diff Legend

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