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.148 by elmex, Sat Apr 22 12:14:45 2006 UTC vs.
Revision 1.174 by root, Tue Apr 25 11:18:49 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
30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48}
14 49
15# class methods for events 50# class methods for events
16sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
18} 54}
19 55
20sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
22} 59}
23 60
24sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
25 my ($ev) = @_; 62 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 65 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 66 my $widget = $ROOT->find_widget ($x, $y);
30 67
31 $GRAB = $widget; 68 $GRAB = $widget;
32 $GRAB->update if $GRAB; 69 $GRAB->update if $GRAB;
70
71 check_tooltip;
33 } 72 }
34 73
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 75
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 76 if ($GRAB) {
77 ($x, $y) = $GRAB->coord2local ($x, $y);
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
38} 80}
39 81
40sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
41 my ($ev) = @_; 83 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
43 85
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 87
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 89
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 90 if ($GRAB) {
91 ($x, $y) = $GRAB->coord2local ($x, $y);
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
49 94
50 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 97 $grab->update if $grab;
53 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
99
100 check_tooltip;
54 } 101 }
55} 102}
56 103
57sub feed_sdl_motion_event { 104sub feed_sdl_motion_event {
58 my ($ev) = @_; 105 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 110 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 111 my $hover = $HOVER; $HOVER = $widget;
65 112
66 $hover->update if $hover && $hover->{can_hover}; 113 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 115
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 116 check_tooltip;
117 }
118
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
122 }
71} 123}
72 124
73# convert position array to integers 125# convert position array to integers
74sub harmonize { 126sub harmonize {
75 my ($vals) = @_; 127 my ($vals) = @_;
… …
93 145
94sub new { 146sub new {
95 my $class = shift; 147 my $class = shift;
96 148
97 my $self = bless { 149 my $self = bless {
98 x => 0, 150 x => 0,
99 y => 0, 151 y => 0,
100 z => 0, 152 z => 0,
153 can_events => 1,
101 @_ 154 @_
102 }, $class; 155 }, $class;
103 156
104 for (keys %$self) { 157 for (keys %$self) {
105 if (/^connect_(.*)$/) { 158 if (/^connect_(.*)$/) {
… …
108 } 161 }
109 162
110 $self 163 $self
111} 164}
112 165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
113sub show { 173sub show {
114 my ($self) = @_; 174 my ($self) = @_;
115 175
116 return if $self->{parent}; 176 return if $self->{parent};
117 177
… …
119} 179}
120 180
121sub hide { 181sub hide {
122 my ($self) = @_; 182 my ($self) = @_;
123 183
124 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
125 186
126 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
127} 189}
128 190
129sub move { 191sub move {
130 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
131 193
… …
134 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
135 197
136 $self->update; 198 $self->update;
137} 199}
138 200
139sub needs_redraw { 201sub set_size {
140 0 202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
141} 208}
142 209
143sub size_request { 210sub size_request {
144 require Carp; 211 require Carp;
145 Carp::confess "size_request is abstract"; 212 Carp::confess "size_request is abstract";
… …
177 244
178sub size_allocate { 245sub size_allocate {
179 # nothing to be done 246 # nothing to be done
180} 247}
181 248
249sub children {
250}
251
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260}
261
262sub set_max_size {
263 my ($self, $w, $h) = @_;
264
265 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h;
267}
268
182# return top left coordinates 269# return top left coordinates
183sub _topleft { 270sub _topleft {
184 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
185 275
186 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
187} 277}
188 278
189# translate global coordinates to local coordinate system 279# translate global coordinates to local coordinate system
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 357 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 358 glVertex $x , $y + $self->{h};
269 glEnd; 359 glEnd;
270 glDisable GL_BLEND; 360 glDisable GL_BLEND;
271 } 361 }
362
363 if ($ENV{PCLIENT_DEBUG}) {
364 glPushMatrix;
365 glColor 1, 1, 0, 1;
366 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
367 glBegin GL_LINE_LOOP;
368 glVertex 0 , 0;
369 glVertex $self->{w}, 0;
370 glVertex $self->{w}, $self->{h};
371 glVertex 0 , $self->{h};
372 glEnd;
373 glPopMatrix;
374 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
375 }
272} 376}
273 377
274sub _draw { 378sub _draw {
275 my ($self) = @_; 379 my ($self) = @_;
276 380
277 warn "no draw defined for $self\n"; 381 warn "no draw defined for $self\n";
278} 382}
279 383
280sub find_widget { 384sub find_widget {
281 my ($self, $x, $y) = @_; 385 my ($self, $x, $y) = @_;
386
387 return () unless $self->{can_events};
282 388
283 return $self 389 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 390 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 391 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286 392
… …
294} 400}
295 401
296sub check_size { 402sub check_size {
297 my ($self) = @_; 403 my ($self) = @_;
298 404
299 my ($w, $h) = $self->size_request; 405 $self->{parent}
406 or return 1;
300 407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
301 if ($w != $self->{req_w} || $h != $self->{req_h}) { 412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
302 $self->{req_w} = $w; 413 $self->{req_w} = $w;
303 $self->{req_h} = $h; 414 $self->{req_h} = $h;
304 415
305 $self->{parent}->check_size 416 $self->{parent}->check_size
306 if $self->{parent}; 417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
307 } 425 }
308} 426}
309 427
310sub update { 428sub update {
311 my ($self) = @_; 429 my ($self) = @_;
… …
321} 439}
322 440
323sub emit { 441sub emit {
324 my ($self, $signal, @args) = @_; 442 my ($self, $signal, @args) = @_;
325 443
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
327 $cb->($self, @args);
328 }
329} 445}
330 446
331sub DESTROY { 447sub DESTROY {
332 my ($self) = @_; 448 my ($self) = @_;
333 449
… …
378 494
379package CFClient::UI::Empty; 495package CFClient::UI::Empty;
380 496
381our @ISA = CFClient::UI::Base::; 497our @ISA = CFClient::UI::Base::;
382 498
499sub new {
500 my ($class, %arg) = @_;
501 $class->SUPER::new (can_events => 0, %arg);
502}
503
383sub size_request { 504sub size_request {
384 (0, 0) 505 (0, 0)
385} 506}
386 507
387sub draw { } 508sub draw { }
… …
395sub new { 516sub new {
396 my ($class, %arg) = @_; 517 my ($class, %arg) = @_;
397 518
398 my $children = delete $arg{children} || []; 519 my $children = delete $arg{children} || [];
399 520
400 my $self = $class->SUPER::new (children => [], %arg); 521 my $self = $class->SUPER::new (
522 children => [],
523 can_events => 0,
524 %arg,
525 );
401 $self->add ($_) for @$children; 526 $self->add ($_) for @$children;
402 527
403 $self 528 $self
404} 529}
405 530
… …
416 ]; 541 ];
417 542
418 $child->check_size; 543 $child->check_size;
419} 544}
420 545
546sub children {
547 @{ $_[0]{children} }
548}
549
421sub remove { 550sub remove {
422 my ($self, $child) = @_; 551 my ($self, $child) = @_;
423 552
424 delete $child->{parent}; 553 delete $child->{parent};
554 $child->hide;
425 555
426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427 557
428 $self->check_size; 558 $self->check_size;
559 $self->update;
560}
561
562sub clear {
563 my ($self) = @_;
564
565 my $children = delete $self->{children};
566 $self->{children} = [];
567
568 for (@$children) {
569 delete $_->{parent};
570 $_->hide;
571 }
429} 572}
430 573
431sub find_widget { 574sub find_widget {
432 my ($self, $x, $y) = @_; 575 my ($self, $x, $y) = @_;
433 576
… …
508} 651}
509 652
510sub update { 653sub update {
511 my ($self) = @_; 654 my ($self) = @_;
512 655
513 # we want to do this delayed... 656 $ROOT->on_refresh ($self => sub { $self->render_child });
514 $self->render_chld;
515 $self->SUPER::update; 657 $self->SUPER::update;
516} 658}
517 659
660sub size_allocate {
661 my ($self, $w, $h) = @_;
662
663 $self->SUPER::size_allocate ($w, $h);
664 $self->update;
665}
666
518sub render_chld { 667sub render_child {
519 my ($self) = @_; 668 my ($self) = @_;
520 669
521 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
522 glClearColor 0, 0, 0, 1; 671 glClearColor 0, 0, 0, 0;
523 glClear GL_COLOR_BUFFER_BIT; 672 glClear GL_COLOR_BUFFER_BIT;
524 $self->child->draw; 673 $self->child->draw;
525 }; 674 };
526} 675}
527 676
528sub size_allocate {
529 my ($self, $w, $h) = @_;
530
531 $self->child->configure (0, 0, $w, $h);
532
533 $self->render_chld;
534}
535
536sub _draw { 677sub _draw {
537 my ($self) = @_; 678 my ($self) = @_;
538 679
539 my ($w, $h) = ($self->w, $self->h); 680 my ($w, $h) = ($self->w, $self->h);
540 681
541 my $tex = $self->{texture} 682 my $tex = $self->{texture}
542 or return; 683 or return;
543 684
544 glEnable GL_BLEND; 685 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glEnable GL_TEXTURE_2D; 687 glEnable GL_TEXTURE_2D;
547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 688 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
689 glColor 0, 0, 0, 1;
548 690
549 $tex->draw_quad (0, 0, $w, $h); 691 $tex->draw_quad (0, 0, $w, $h);
550 692
551 glDisable GL_BLEND; 693 glDisable GL_BLEND;
552 glDisable GL_TEXTURE_2D; 694 glDisable GL_TEXTURE_2D;
… …
561sub new { die } 703sub new { die }
562 704
563sub size_request { 705sub size_request {
564 my ($self) = @_; 706 my ($self) = @_;
565 707
566 @$self{qw(child_w child_h)} = $self->child->size_request; 708 @$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)}); 709 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
568 710
569 @$self{qw(child_w child_h)} 711 @$self{qw(child_w child_h)}
570} 712}
571 713
… …
593 border => 0.8, 735 border => 0.8,
594 @_ 736 @_
595 ); 737 );
596 738
597 $self 739 $self
598}
599
600sub set_size {
601 my ($self, $w, $h) = @_;
602 $self->{req_w} = $w;
603 $self->{req_h} = $h;
604 $self->check_size;
605}
606
607sub size_request {
608 my ($self) = @_;
609 ($self->{req_w}, $self->{req_h})
610}
611
612sub size_allocate {
613 my ($self, $w, $h) = @_;
614 $self->{w} = $w;
615 $self->{h} = $h;
616 $self->child->configure (0, 0, $w, $h);
617} 740}
618 741
619sub _draw { 742sub _draw {
620 my ($self) = @_; 743 my ($self) = @_;
621 744
… …
656 my $class = shift; 779 my $class = shift;
657 780
658 # TODO: user_x, user_y, overwrite moveto? 781 # TODO: user_x, user_y, overwrite moveto?
659 782
660 my $self = $class->SUPER::new ( 783 my $self = $class->SUPER::new (
661 bg => [1, 1, 1, 1], 784 bg => [1, 1, 1, 1],
662 border_bg => [1, 1, 1, 1], 785 border_bg => [1, 1, 1, 1],
663 border => 0.8, 786 border => 0.8,
787 can_events => 1,
664 @_ 788 @_
665 ); 789 );
666 790
667 $self->{title} &&= new CFClient::UI::Label 791 $self->{title} &&= new CFClient::UI::Label
668 align => 0, 792 align => 0,
… …
678} 802}
679 803
680sub size_request { 804sub size_request {
681 my ($self) = @_; 805 my ($self) = @_;
682 806
683 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
684
685 my ($w, $h) = $self->SUPER::size_request; 807 my ($w, $h) = $self->SUPER::size_request;
686 808
687 ( 809 (
688 $w + $self->border * 2, 810 $w + $self->border * 2,
689 $h + $self->border * 2, 811 $h + $self->border * 2,
… …
817 $self->{children}[$y][$x] = $child; 939 $self->{children}[$y][$x] = $child;
818 940
819 $child->check_size; 941 $child->check_size;
820} 942}
821 943
944sub children {
945 grep $_, map @$_, grep $_, @{ $_[0]{children} }
946}
947
822# TODO: move to container class maybe? send childs a signal on removal? 948# TODO: move to container class maybe? send childs a signal on removal?
823sub clear { 949sub clear {
824 my ($self) = @_; 950 my ($self) = @_;
825 951
952 my @children = $self->children;
826 delete $self->{children}; 953 delete $self->{children};
954
955 for (@children) {
956 delete $_->{parent};
957 $_->hide;
958 }
959
827 $self->update; 960 $self->update;
828} 961}
829 962
830sub get_wh { 963sub get_wh {
831 my ($self) = @_; 964 my ($self) = @_;
… …
837 or next; 970 or next;
838 971
839 for my $x (0 .. $#$row) { 972 for my $x (0 .. $#$row) {
840 my $widget = $row->[$x] 973 my $widget = $row->[$x]
841 or next; 974 or next;
842 my ($w, $h) = $widget->size_request; 975 my ($w, $h) = @$widget{qw(req_w req_h)};
843 976
844 $w[$x] = max $w[$x], $w; 977 $w[$x] = max $w[$x], $w;
845 $h[$y] = max $h[$y], $h; 978 $h[$y] = max $h[$y], $h;
846 } 979 }
847 } 980 }
… …
952 1085
953 ($h, $w) = ($w, $h); 1086 ($h, $w) = ($w, $h);
954 1087
955 my $children = $self->{children}; 1088 my $children = $self->{children};
956 1089
957 my @h = map +($_->size_request)[0], @$children; 1090 my @h = map $_->{req_w}, @$children;
958 1091
959 my $req_h = List::Util::sum @h; 1092 my $req_h = List::Util::sum @h;
960 1093
961 if ($req_h > $h) { 1094 if ($req_h > $h) {
962 # ah well, not enough space 1095 # ah well, not enough space
… …
1010sub size_allocate { 1143sub size_allocate {
1011 my ($self, $w, $h) = @_; 1144 my ($self, $w, $h) = @_;
1012 1145
1013 my $children = $self->{children}; 1146 my $children = $self->{children};
1014 1147
1015 my @h = map +($_->size_request)[1], @$children; 1148 my @h = map $_->{req_h}, @$children;
1016 1149
1017 my $req_h = List::Util::sum @h; 1150 my $req_h = List::Util::sum @h;
1018 1151
1019 if ($req_h > $h) { 1152 if ($req_h > $h) {
1020 # ah well, not enough space 1153 # ah well, not enough space
… …
1054 1187
1055sub new { 1188sub new {
1056 my ($class, %arg) = @_; 1189 my ($class, %arg) = @_;
1057 1190
1058 my $self = $class->SUPER::new ( 1191 my $self = $class->SUPER::new (
1059 fg => [1, 1, 1], 1192 fg => [1, 1, 1],
1193 #font => default_font
1060 fontsize => 1, 1194 fontsize => 1,
1061 text => "", 1195 text => "",
1062 align => -1, 1196 align => -1,
1063 valign => -1, 1197 valign => -1,
1064 padding => 2, 1198 padding => 2,
1065 layout => new CFClient::Layout, 1199 layout => new CFClient::Layout,
1200 can_events => 0,
1066 %arg 1201 %arg
1067 ); 1202 );
1068 1203
1069 if (exists $self->{template}) { 1204 if (exists $self->{template}) {
1070 my $layout = new CFClient::Layout; 1205 my $layout = new CFClient::Layout;
… …
1076 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1211 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1077 1212
1078 $self 1213 $self
1079} 1214}
1080 1215
1081sub escape_text { 1216sub escape {
1082 local $_ = $_[1]; 1217 local $_ = $_[1];
1083 1218
1084 s/&/&amp;/g; 1219 s/&/&amp;/g;
1085 s/>/&gt;/g; 1220 s/>/&gt;/g;
1086 s/</&lt;/g; 1221 s/</&lt;/g;
1087 1222
1088 $_[1] 1223 $_[1]
1089} 1224}
1090 1225
1226sub update {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230 $self->SUPER::update;
1231}
1232
1233sub reconfigure {
1234 my ($self) = @_;
1235
1236 delete $self->{texture};
1237}
1238
1091sub set_text { 1239sub set_text {
1092 my ($self, $text) = @_; 1240 my ($self, $text) = @_;
1093 1241
1242 return if $self->{text} eq "T$text";
1243 $self->{text} = "T$text";
1244
1094 $self->{layout}->set_text ($text); 1245 $self->{layout}->set_text ($text);
1095 1246
1096 delete $self->{texture}; 1247 delete $self->{texture};
1097 $self->update; 1248 $self->update;
1249 $self->check_size;
1098} 1250}
1099 1251
1100sub set_markup { 1252sub set_markup {
1101 my ($self, $markup) = @_; 1253 my ($self, $markup) = @_;
1102 1254
1255 return if $self->{text} eq "M$markup";
1256 $self->{text} = "M$markup";
1257
1103 $self->{layout}->set_markup ($markup); 1258 $self->{layout}->set_markup ($markup);
1104 1259
1105 delete $self->{texture}; 1260 delete $self->{texture};
1106 $self->update; 1261 $self->update;
1262 $self->check_size;
1107} 1263}
1108 1264
1109sub size_request { 1265sub size_request {
1110 my ($self) = @_; 1266 my ($self) = @_;
1111 1267
1112 $self->{layout}->set_width; 1268 $self->{layout}->set_font ($self->{font}) if $self->{font};
1269 $self->{layout}->set_width ($self->{max_w} || -1);
1113 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1270 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1114 1271
1115 my ($w, $h) = $self->{layout}->size; 1272 my ($w, $h) = $self->{layout}->size;
1116 1273
1117 if (exists $self->{template}) { 1274 if (exists $self->{template}) {
1275 $self->{template}->set_font ($self->{font}) if $self->{font};
1118 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1276 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1119 1277
1120 my ($w2, $h2) = $self->{template}->size; 1278 my ($w2, $h2) = $self->{template}->size;
1121 1279
1122 $w = List::Util::max $w, $w2; 1280 $w = List::Util::max $w, $w2;
… …
1137 1295
1138sub set_fontsize { 1296sub set_fontsize {
1139 my ($self, $fontsize) = @_; 1297 my ($self, $fontsize) = @_;
1140 1298
1141 $self->{fontsize} = $fontsize; 1299 $self->{fontsize} = $fontsize;
1300 delete $self->{texture};
1142 $self->check_size; 1301 $self->check_size;
1302 $self->update;
1143} 1303}
1144 1304
1145sub _draw { 1305sub _draw {
1146 my ($self) = @_; 1306 my ($self) = @_;
1147 1307
1148 my $tex = $self->{texture} ||= do { 1308 my $tex = $self->{texture} ||= do {
1309 $self->{layout}->set_font ($self->{font}) if $self->{font};
1149 $self->{layout}->set_width ($self->{w}); 1310 $self->{layout}->set_width ($self->{w});
1150 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1311 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1151 new_from_layout CFClient::Texture $self->{layout} 1312 new_from_layout CFClient::Texture $self->{layout}
1152 }; 1313 };
1153 1314
… …
1186 1347
1187sub new { 1348sub new {
1188 my $class = shift; 1349 my $class = shift;
1189 1350
1190 $class->SUPER::new ( 1351 $class->SUPER::new (
1191 fg => [1, 1, 1], 1352 fg => [1, 1, 1],
1192 bg => [0, 0, 0, 0.2], 1353 bg => [0, 0, 0, 0.2],
1193 active_bg => [1, 1, 1, 0.5], 1354 active_bg => [1, 1, 1, 0.5],
1194 active_fg => [0, 0, 0], 1355 active_fg => [0, 0, 0],
1195 can_hover => 1, 1356 can_hover => 1,
1196 can_focus => 1, 1357 can_focus => 1,
1197 valign => 0, 1358 valign => 0,
1359 can_events => 1,
1198 @_ 1360 @_
1199 ) 1361 )
1200} 1362}
1201 1363
1202sub _set_text { 1364sub _set_text {
… …
1230} 1392}
1231 1393
1232sub size_allocate { 1394sub size_allocate {
1233 my ($self, $w, $h) = @_; 1395 my ($self, $w, $h) = @_;
1234 1396
1235 $self->_set_text ($self->{text}); 1397 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1236} 1398}
1237 1399
1238sub set_text { 1400sub set_text {
1239 my ($self, $text) = @_; 1401 my ($self, $text) = @_;
1240 1402
… …
1355 my ($self, $ev) = @_; 1517 my ($self, $ev) = @_;
1356 1518
1357 my $sym = $ev->{sym}; 1519 my $sym = $ev->{sym};
1358 1520
1359 if ($sym == 13) { 1521 if ($sym == 13) {
1522 unshift @{$self->{history}},
1523 my $txt = $self->get_text;
1524 $self->{history_pointer} = -1;
1525 $self->{history_saveback} = '';
1360 $self->emit (activate => $self->get_text); 1526 $self->emit (activate => $txt);
1361 $self->update; 1527 $self->update;
1528
1529 } elsif ($sym == CFClient::SDLK_UP) {
1530 if ($self->{history_pointer} < 0) {
1531 $self->{history_saveback} = $self->get_text;
1532 }
1533 if (@{$self->{history} || []} > 0) {
1534 $self->{history_pointer}++;
1535 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1536 $self->{history_pointer} = @{$self->{history} || []} - 1;
1537 }
1538 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1539 }
1540
1541 } elsif ($sym == CFClient::SDLK_DOWN) {
1542 $self->{history_pointer}--;
1543 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1544
1545 if ($self->{history_pointer} >= 0) {
1546 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1547 } else {
1548 $self->set_text ($self->{history_saveback});
1549 }
1362 1550
1363 } else { 1551 } else {
1364 $self->SUPER::key_down ($ev); 1552 $self->SUPER::key_down ($ev);
1365 } 1553 }
1366 1554
… …
1380 1568
1381sub new { 1569sub new {
1382 my $class = shift; 1570 my $class = shift;
1383 1571
1384 $class->SUPER::new ( 1572 $class->SUPER::new (
1385 padding => 4, 1573 padding => 4,
1386 fg => [1, 1, 1], 1574 fg => [1, 1, 1],
1387 bg => [1, 1, 1, 0.2], 1575 bg => [1, 1, 1, 0.2],
1388 active_fg => [0, 0, 1], 1576 active_fg => [0, 0, 1],
1389 can_hover => 1, 1577 can_hover => 1,
1390 align => 0, 1578 align => 0,
1391 valign => 0, 1579 valign => 0,
1580 can_events => 1,
1392 @_ 1581 @_
1393 ) 1582 )
1394} 1583}
1395 1584
1396sub button_up { 1585sub button_up {
… …
1501our %loaded_images; 1690our %loaded_images;
1502 1691
1503sub new { 1692sub new {
1504 my $class = shift; 1693 my $class = shift;
1505 1694
1506 my $self = $class->SUPER::new (@_); 1695 my $self = $class->SUPER::new (can_events => 0, @_);
1507 1696
1508 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 1697 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1509 1698
1510 $loaded_images{$self->{image}} ||= 1699 $loaded_images{$self->{image}} ||=
1511 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 1700 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
… …
1553############################################################################# 1742#############################################################################
1554 1743
1555package CFClient::UI::VGauge; 1744package CFClient::UI::VGauge;
1556 1745
1557our @ISA = CFClient::UI::Base::; 1746our @ISA = CFClient::UI::Base::;
1747
1748use List::Util qw(min max);
1558 1749
1559use CFClient::OpenGL; 1750use CFClient::OpenGL;
1560 1751
1561my %tex = ( 1752my %tex = (
1562 food => [ 1753 food => [
1563 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1754 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1564 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1755 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1565 ], 1756 ],
1566 grace => [ 1757 grace => [
1567 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1758 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1568 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1759 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1569 ], 1760 ],
1570 hp => [ 1761 hp => [
1571 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1762 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1572 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1763 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1573 ], 1764 ],
1574 mana => [ 1765 mana => [
1575 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1766 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1576 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1767 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1577 ], 1768 ],
1578); 1769);
1579 1770
1580# eg. VGauge->new (gauge => 'food'), default gauge: food 1771# eg. VGauge->new (gauge => 'food'), default gauge: food
1581sub new { 1772sub new {
… …
1600} 1791}
1601 1792
1602sub set_max { 1793sub set_max {
1603 my ($self, $max) = @_; 1794 my ($self, $max) = @_;
1604 1795
1796 return if $self->{max_val} == $max;
1797
1605 $self->{max_val} = $max; 1798 $self->{max_val} = $max;
1799 $self->update;
1606} 1800}
1607 1801
1608sub set_value { 1802sub set_value {
1609 my ($self, $val, $max) = @_; 1803 my ($self, $val, $max) = @_;
1610 1804
1611 $self->set_max ($max) 1805 $self->set_max ($max)
1612 if defined $max; 1806 if defined $max;
1613 1807
1614 $max = $self->{max_val}; 1808 return if $self->{val} == $val;
1809
1615 $self->{val} = $val; 1810 $self->{val} = $val;
1616
1617 $self->update; 1811 $self->update;
1618} 1812}
1619 1813
1620sub _draw { 1814sub _draw {
1621 my ($self) = @_; 1815 my ($self) = @_;
1622 1816
1623 my $tex = $tex{$self->{type}}; 1817 my $tex = $tex{$self->{type}};
1818 my ($t1, $t2, $t3) = @$tex;
1624 1819
1625 my ($w, $h) = ($self->{w}, $self->{h}); 1820 my ($w, $h) = ($self->{w}, $self->{h});
1626 1821
1627 if ($self->{vertical}) { 1822 if ($self->{vertical}) {
1628 glRotate 90, 0, 0, 1; 1823 glRotate 90, 0, 0, 1;
… …
1630 1825
1631 ($w, $h) = ($h, $w); 1826 ($w, $h) = ($h, $w);
1632 } 1827 }
1633 1828
1634 my $ycut = $self->{val} / ($self->{max_val} || 1); 1829 my $ycut = $self->{val} / ($self->{max_val} || 1);
1635 $ycut = 1 if $self->{val} > $self->{max_val};
1636 1830
1637 my $t1 = $tex->[0]; 1831 my $ycut1 = max 0, min 1, $ycut;
1638 my $t2 = $tex->[1]; 1832 my $ycut2 = max 0, min 1, $ycut - 1;
1833
1834 my $h1 = $self->{h} * (1 - $ycut1);
1835 my $h2 = $self->{h} * (1 - $ycut2);
1639 1836
1640 glEnable GL_BLEND; 1837 glEnable GL_BLEND;
1641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1642 glEnable GL_TEXTURE_2D; 1839 glEnable GL_TEXTURE_2D;
1643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1644 1841
1645 my $h1 = $self->{h} - $ycut * $self->{h};
1646 my $h2 = $ycut * $self->{h};
1647
1648 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1842 glBindTexture GL_TEXTURE_2D, $t1->{name};
1649 glBegin GL_QUADS; 1843 glBegin GL_QUADS;
1650 glTexCoord 0 , 0; glVertex 0 , 0; 1844 glTexCoord 0 , 0; glVertex 0 , 0;
1651 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1845 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1652 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1846 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1653 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1847 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1654 glEnd; 1848 glEnd;
1655 1849
1850 my $ycut1 = List::Util::min 1, $ycut;
1656 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1851 glBindTexture GL_TEXTURE_2D, $t2->{name};
1657 glBegin GL_QUADS; 1852 glBegin GL_QUADS;
1658 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1853 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1659 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1854 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1660 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1855 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1661 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1856 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1662 glEnd; 1857 glEnd;
1858
1859 if ($t3) {
1860 glBindTexture GL_TEXTURE_2D, $t3->{name};
1861 glBegin GL_QUADS;
1862 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1863 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1864 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1865 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1866 glEnd;
1867 }
1663 1868
1664 glDisable GL_BLEND; 1869 glDisable GL_BLEND;
1665 glDisable GL_TEXTURE_2D; 1870 glDisable GL_TEXTURE_2D;
1666} 1871}
1667 1872
… …
1670package CFClient::UI::Gauge; 1875package CFClient::UI::Gauge;
1671 1876
1672our @ISA = CFClient::UI::VBox::; 1877our @ISA = CFClient::UI::VBox::;
1673 1878
1674sub new { 1879sub new {
1675 my ($class, %arg) = shift; 1880 my ($class, %arg) = @_;
1676 1881
1677 my $self = $class->SUPER::new ( 1882 my $self = $class->SUPER::new (
1678 @_, 1883 tooltip => $arg{type},
1884 can_hover => 1,
1885 can_events => 1,
1886 %arg,
1679 ); 1887 );
1680 1888
1681 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1889 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1682 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1890 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1683 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1891 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1684 1892
1685 $self 1893 $self
1686} 1894}
1687 1895
1688sub set_fontsize { 1896sub set_fontsize {
… …
1690 1898
1691 $self->{value}->set_fontsize ($fsize); 1899 $self->{value}->set_fontsize ($fsize);
1692 $self->{max} ->set_fontsize ($fsize); 1900 $self->{max} ->set_fontsize ($fsize);
1693} 1901}
1694 1902
1903sub set_max {
1904 my ($self, $max) = @_;
1905
1906 $self->{gauge}->set_max ($max);
1907 $self->{max}->set_text ($max);
1908}
1909
1695sub set_value { 1910sub set_value {
1696 my ($self, $val, $max) = @_; 1911 my ($self, $val, $max) = @_;
1697 1912
1698 $self->set_max ($max) 1913 $self->set_max ($max)
1699 if defined $max; 1914 if defined $max;
1700 1915
1701 $self->{gauge}->set_value ($val, $max); 1916 $self->{gauge}->set_value ($val, $max);
1702 $self->{value}->set_text ($val); 1917 $self->{value}->set_text ($val);
1703}
1704
1705sub set_max {
1706 my ($self, $max) = @_;
1707
1708 $self->{gauge}->set_max ($max);
1709 $self->{max}->set_text ($max);
1710} 1918}
1711 1919
1712############################################################################# 1920#############################################################################
1713 1921
1714package CFClient::UI::Slider; 1922package CFClient::UI::Slider;
… …
1854 2062
1855sub new { 2063sub new {
1856 my $class = shift; 2064 my $class = shift;
1857 2065
1858 my $self = $class->SUPER::new ( 2066 my $self = $class->SUPER::new (
1859 fontsize => 1, 2067 fontsize => 1,
2068 can_events => 0,
2069 #font => default_font
1860 @_, 2070 @_,
1861 2071
1862 layout => (new CFClient::Layout), 2072 layout => (new CFClient::Layout),
1863 par => [], 2073 par => [],
1864 height => 0, 2074 height => 0,
1865 children => [ 2075 children => [
1866 (new CFClient::UI::Empty expand => 1), 2076 (new CFClient::UI::Empty expand => 1),
1867 (new CFClient::UI::Slider vertical => 1), 2077 (new CFClient::UI::Slider vertical => 1),
1868 ], 2078 ],
1869 ); 2079 );
1870 2080
… …
1904sub size_allocate { 2114sub size_allocate {
1905 my ($self, $w, $h) = @_; 2115 my ($self, $w, $h) = @_;
1906 2116
1907 $self->SUPER::size_allocate ($w, $h); 2117 $self->SUPER::size_allocate ($w, $h);
1908 2118
2119 $self->{layout}->set_font ($self->{font}) if $self->{font};
1909 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2120 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1910 $self->{layout}->set_width ($self->{children}[0]{w}); 2121 $self->{layout}->set_width ($self->{children}[0]{w});
1911 2122
1912 $self->reflow; 2123 $self->reflow;
1913} 2124}
… …
1966 2177
1967 my $y = 0; 2178 my $y = 0;
1968 2179
1969 my $layout = $self->{layout}; 2180 my $layout = $self->{layout};
1970 2181
2182 $layout->set_font ($self->{font}) if $self->{font};
2183
1971 for my $par (@{$self->{par}}) { 2184 for my $par (@{$self->{par}}) {
1972 my $h = $par->[0]; 2185 my $h = $par->[0];
1973 2186
1974 if ($y0 < $y + $h && $y < $y1) { 2187 if ($y0 < $y + $h && $y < $y1) {
1975 $layout->set_text ($par->[2]); 2188 $layout->set_text ($par->[2]);
… …
1992 my ($self) = @_; 2205 my ($self) = @_;
1993 2206
1994 if ($self->{texture}) { 2207 if ($self->{texture}) {
1995 glEnable GL_TEXTURE_2D; 2208 glEnable GL_TEXTURE_2D;
1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2209 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2210 glColor 1, 1, 1, 1;
1997 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2211 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1998 glDisable GL_TEXTURE_2D; 2212 glDisable GL_TEXTURE_2D;
1999 } 2213 }
2000 2214
2001 $self->{children}[1]->draw; 2215 $self->{children}[1]->draw;
… …
2052 2266
2053sub new { 2267sub new {
2054 my $class = shift; 2268 my $class = shift;
2055 2269
2056 my $self = $class->SUPER::new ( 2270 my $self = $class->SUPER::new (
2057 state => 0, 2271 state => 0,
2058 connect_activate => \&toggle_flopper, 2272 connect_activate => \&toggle_flopper,
2059 @_ 2273 @_
2060 ); 2274 );
2061 2275
2062 if ($self->{state}) { 2276 if ($self->{state}) {
… …
2083 $self->emit (changed => $self->{state}); 2297 $self->emit (changed => $self->{state});
2084} 2298}
2085 2299
2086############################################################################# 2300#############################################################################
2087 2301
2302package CFClient::UI::Tooltip;
2303
2304our @ISA = CFClient::UI::Bin::;
2305
2306use CFClient::OpenGL;
2307
2308sub new {
2309 my $class = shift;
2310
2311 $class->SUPER::new (
2312 @_,
2313 can_events => 0,
2314 )
2315}
2316
2317sub set_markup {
2318 my ($self, $text) = @_;
2319
2320 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2321 $self->{label}->set_markup ($text);
2322 $self->add ($self->{label});
2323}
2324
2325sub size_request {
2326 my ($self) = @_;
2327
2328 $self->child->set_max_size ($::WIDTH * 0.3);
2329
2330 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2331
2332 ($w + 4, $h + 4)
2333}
2334
2335sub size_allocate {
2336 my ($self, $w, $h) = @_;
2337
2338 $self->SUPER::size_allocate ($w - 4, $h - 4);
2339}
2340
2341sub _draw {
2342 my ($self) = @_;
2343
2344 glPushMatrix;
2345 glTranslate 0.375, 0.375;
2346
2347 my ($w, $h) = @$self{qw(w h)};
2348
2349 glColor 1, 0.8, 0.4;
2350 glBegin GL_QUADS;
2351 glVertex 0 , 0;
2352 glVertex 0 , $h;
2353 glVertex $w, $h;
2354 glVertex $w, 0;
2355 glEnd;
2356
2357 glColor 0, 0, 0;
2358 glBegin GL_LINE_LOOP;
2359 glVertex 0 , 0;
2360 glVertex 0 , $h;
2361 glVertex $w, $h;
2362 glVertex $w, 0;
2363 glEnd;
2364
2365 glPopMatrix;
2366
2367 glTranslate 2, 2;
2368 $self->SUPER::_draw;
2369}
2370
2371#############################################################################
2372
2373package CFClient::UI::Face;
2374
2375our @ISA = CFClient::UI::Base::;
2376
2377use CFClient::OpenGL;
2378
2379sub new {
2380 my $class = shift;
2381
2382 $class->SUPER::new (
2383 aspect => 1,
2384 @_,
2385 )
2386}
2387
2388sub size_request {
2389 (32, 8)
2390}
2391
2392sub draw {
2393 my ($self) = @_;
2394
2395 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2396
2397 if ($tex) {
2398 glEnable GL_BLEND;
2399 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2400 glEnable GL_TEXTURE_2D;
2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2402 glColor 1, 1, 1, 1;
2403 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2404 glDisable GL_TEXTURE_2D;
2405 glDisable GL_BLEND;
2406 }
2407}
2408
2409#############################################################################
2410
2088package CFClient::UI::Root; 2411package CFClient::UI::Root;
2089 2412
2090our @ISA = CFClient::UI::Container::; 2413our @ISA = CFClient::UI::Container::;
2091 2414
2092use CFClient::OpenGL; 2415use CFClient::OpenGL;
2093 2416
2094sub check_size { 2417sub check_size {
2095 my ($self) = @_; 2418 my ($self) = @_;
2096 2419
2097 $self->configure (0, 0, $::WITH, $::HEIGHT); 2420 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2098} 2421}
2099 2422
2100sub size_request { 2423sub size_request {
2101 ($::WIDTH, $::HEIGHT) 2424 ($::WIDTH, $::HEIGHT)
2102} 2425}
… …
2104sub configure { 2427sub configure {
2105 my ($self, $x, $y, $w, $h) = @_; 2428 my ($self, $x, $y, $w, $h) = @_;
2106 2429
2107 $self->SUPER::configure ($x, $y, $w, $h); 2430 $self->SUPER::configure ($x, $y, $w, $h);
2108 2431
2109 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2110 for @{$self->{children}}; 2432 for my $child (@{$self->{children}}) {
2433 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2434
2435 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2436 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2437 $child->configure ($X, $Y, $W,$H);
2438 }
2111} 2439}
2112 2440
2113sub _topleft { 2441sub _topleft {
2114 my ($self, $x, $y) = @_; 2442 my ($self, $x, $y) = @_;
2115 2443
… …
2162############################################################################# 2490#############################################################################
2163 2491
2164package CFClient::UI; 2492package CFClient::UI;
2165 2493
2166$ROOT = new CFClient::UI::Root; 2494$ROOT = new CFClient::UI::Root;
2495$TOOLTIP = new CFClient::UI::Tooltip;
2167 2496
21681 24971
2169 2498

Diff Legend

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