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.150 by elmex, Sun Apr 23 00:08:29 2006 UTC vs.
Revision 1.176 by root, Tue Apr 25 12:10:58 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,
101 can_events => 1, 153 can_events => 1,
102 @_ 154 @_
103 }, $class; 155 }, $class;
104 156
105 for (keys %$self) { 157 for (keys %$self) {
… …
109 } 161 }
110 162
111 $self 163 $self
112} 164}
113 165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
114sub show { 173sub show {
115 my ($self) = @_; 174 my ($self) = @_;
116 175
117 return if $self->{parent}; 176 return if $self->{parent};
118 177
… …
120} 179}
121 180
122sub hide { 181sub hide {
123 my ($self) = @_; 182 my ($self) = @_;
124 183
125 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
126 186
127 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
128} 189}
129 190
130sub move { 191sub move {
131 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
132 193
… …
135 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
136 197
137 $self->update; 198 $self->update;
138} 199}
139 200
140sub needs_redraw { 201sub set_size {
141 0 202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
142} 208}
143 209
144sub size_request { 210sub size_request {
145 require Carp; 211 require Carp;
146 Carp::confess "size_request is abstract"; 212 Carp::confess "size_request is abstract";
… …
178 244
179sub size_allocate { 245sub size_allocate {
180 # nothing to be done 246 # nothing to be done
181} 247}
182 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
183# return top left coordinates 269# return top left coordinates
184sub _topleft { 270sub _topleft {
185 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
186 275
187 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
188} 277}
189 278
190# translate global coordinates to local coordinate system 279# translate global coordinates to local coordinate system
… …
268 glVertex $x + $self->{w}, $y + $self->{h}; 357 glVertex $x + $self->{w}, $y + $self->{h};
269 glVertex $x , $y + $self->{h}; 358 glVertex $x , $y + $self->{h};
270 glEnd; 359 glEnd;
271 glDisable GL_BLEND; 360 glDisable GL_BLEND;
272 } 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 }
273} 376}
274 377
275sub _draw { 378sub _draw {
276 my ($self) = @_; 379 my ($self) = @_;
277 380
… …
297} 400}
298 401
299sub check_size { 402sub check_size {
300 my ($self) = @_; 403 my ($self) = @_;
301 404
302 return unless $self->{parent}; 405 $self->{parent}
406 or return 1;
303 407
304 my ($w, $h) = $self->size_request; 408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
305 411
306 if ($w != $self->{req_w} || $h != $self->{req_h}) { 412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
307 $self->{req_w} = $w; 413 $self->{req_w} = $w;
308 $self->{req_h} = $h; 414 $self->{req_h} = $h;
309 415
310 $self->{parent}->check_size; 416 $self->{parent}->check_size
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
311 } 425 }
312} 426}
313 427
314sub update { 428sub update {
315 my ($self) = @_; 429 my ($self) = @_;
… …
325} 439}
326 440
327sub emit { 441sub emit {
328 my ($self, $signal, @args) = @_; 442 my ($self, $signal, @args) = @_;
329 443
330 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
331 $cb->($self, @args);
332 }
333} 445}
334 446
335sub DESTROY { 447sub DESTROY {
336 my ($self) = @_; 448 my ($self) = @_;
337 449
… …
404sub new { 516sub new {
405 my ($class, %arg) = @_; 517 my ($class, %arg) = @_;
406 518
407 my $children = delete $arg{children} || []; 519 my $children = delete $arg{children} || [];
408 520
409 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 521 my $self = $class->SUPER::new (
522 children => [],
523 can_events => 0,
524 %arg,
525 );
410 $self->add ($_) for @$children; 526 $self->add ($_) for @$children;
411 527
412 $self 528 $self
413} 529}
414 530
… …
425 ]; 541 ];
426 542
427 $child->check_size; 543 $child->check_size;
428} 544}
429 545
546sub children {
547 @{ $_[0]{children} }
548}
549
430sub remove { 550sub remove {
431 my ($self, $child) = @_; 551 my ($self, $child) = @_;
432 552
433 delete $child->{parent}; 553 delete $child->{parent};
554 $child->hide;
434 555
435 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
436 557
437 $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 }
438} 572}
439 573
440sub find_widget { 574sub find_widget {
441 my ($self, $x, $y) = @_; 575 my ($self, $x, $y) = @_;
442 576
… …
517} 651}
518 652
519sub update { 653sub update {
520 my ($self) = @_; 654 my ($self) = @_;
521 655
522 # we want to do this delayed... 656 $ROOT->on_refresh ($self => sub { $self->render_child });
523 $self->render_chld;
524 $self->SUPER::update; 657 $self->SUPER::update;
525} 658}
526 659
660sub size_allocate {
661 my ($self, $w, $h) = @_;
662
663 $self->SUPER::size_allocate ($w, $h);
664 $self->update;
665}
666
527sub render_chld { 667sub render_child {
528 my ($self) = @_; 668 my ($self) = @_;
529 669
530 $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 {
531 glClearColor 0, 0, 0, 1; 671 glClearColor 0, 0, 0, 0;
532 glClear GL_COLOR_BUFFER_BIT; 672 glClear GL_COLOR_BUFFER_BIT;
533 $self->child->draw; 673 $self->child->draw;
674# glColorMask 1, 1, 1, 0;
675# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h};
679# glDisable GL_BLEND;
680# glColorMask 1, 1, 1, 1;
534 }; 681 };
535}
536
537sub size_allocate {
538 my ($self, $w, $h) = @_;
539
540 $self->child->configure (0, 0, $w, $h);
541
542 $self->render_chld;
543} 682}
544 683
545sub _draw { 684sub _draw {
546 my ($self) = @_; 685 my ($self) = @_;
547 686
… …
549 688
550 my $tex = $self->{texture} 689 my $tex = $self->{texture}
551 or return; 690 or return;
552 691
553 glEnable GL_BLEND; 692 glEnable GL_BLEND;
554 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
555 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1;
557 697
558 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad (0, 0, $w, $h);
559 699
560 glDisable GL_BLEND; 700 glDisable GL_BLEND;
561 glDisable GL_TEXTURE_2D; 701 glDisable GL_TEXTURE_2D;
… …
602 border => 0.8, 742 border => 0.8,
603 @_ 743 @_
604 ); 744 );
605 745
606 $self 746 $self
607}
608
609sub set_size {
610 my ($self, $w, $h) = @_;
611 $self->{req_w} = $w;
612 $self->{req_h} = $h;
613 $self->check_size;
614}
615
616sub size_request {
617 my ($self) = @_;
618 ($self->{req_w}, $self->{req_h})
619}
620
621sub size_allocate {
622 my ($self, $w, $h) = @_;
623 $self->{w} = $w;
624 $self->{h} = $h;
625 $self->child->configure (0, 0, $w, $h);
626} 747}
627 748
628sub _draw { 749sub _draw {
629 my ($self) = @_; 750 my ($self) = @_;
630 751
… …
665 my $class = shift; 786 my $class = shift;
666 787
667 # TODO: user_x, user_y, overwrite moveto? 788 # TODO: user_x, user_y, overwrite moveto?
668 789
669 my $self = $class->SUPER::new ( 790 my $self = $class->SUPER::new (
670 bg => [1, 1, 1, 1], 791 bg => [1, 1, 1, 1],
671 border_bg => [1, 1, 1, 1], 792 border_bg => [1, 1, 1, 1],
672 border => 0.8, 793 border => 0.6,
673 can_events => 1, 794 can_events => 1,
674 @_ 795 @_
675 ); 796 );
676 797
677 $self->{title} &&= new CFClient::UI::Label 798 $self->{title} &&= new CFClient::UI::Label
678 align => 0, 799 align => 0,
679 valign => 1, 800 valign => 1,
680 text => $self->{title}, 801 text => $self->{title},
681 fontsize => 1; 802 fontsize => $self->{border};
682 803
683 $self 804 $self
684} 805}
685 806
686sub border { 807sub border {
687 int $_[0]{border} * $::FONTSIZE 808 int $_[0]{border} * $::FONTSIZE
688} 809}
689 810
690sub size_request { 811sub size_request {
691 my ($self) = @_; 812 my ($self) = @_;
692
693 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
694 813
695 my ($w, $h) = $self->SUPER::size_request; 814 my ($w, $h) = $self->SUPER::size_request;
696 815
697 ( 816 (
698 $w + $self->border * 2, 817 $w + $self->border * 2,
… …
713} 832}
714 833
715sub button_down { 834sub button_down {
716 my ($self, $ev, $x, $y) = @_; 835 my ($self, $ev, $x, $y) = @_;
717 836
837 my ($w, $h) = @$self{qw(w h)};
718 my $border = $self->border; 838 my $border = $self->border;
719 839
720 if ($x < $self->{w} && $x >= $self->{w} - $border 840 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
721 && $y < $self->{h} && $y >= $self->{h} - $border) { 841 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
722 842
843 if ($lr & $td) {
844 my ($wx, $wy) = ($self->{x}, $self->{y});
723 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 845 my ($ox, $oy) = ($ev->{x}, $ev->{y});
724 my ($bw, $bh) = ($self->{w}, $self->{h}); 846 my ($bw, $bh) = ($self->{w}, $self->{h});
725 847
848 my $mx = $x < $border;
849 my $my = $y < $border;
850
726 $self->{motion} = sub { 851 $self->{motion} = sub {
727 my ($ev, $x, $y) = @_; 852 my ($ev, $x, $y) = @_;
728 853
729 ($x, $y) = ($ev->{x}, $ev->{y}); 854 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy;
730 856
731 $self->{user_w} = $bw + $x - $ox; 857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
732 $self->{user_h} = $bh + $y - $oy; 858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
859 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
733 $self->check_size; 860 $self->check_size;
734 }; 861 };
735 862
736 } elsif ($x >= 0 && $x < $self->{w} 863 } elsif ($lr ^ $td) {
737 && $y >= 0 && $y < $border) {
738
739 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 864 my ($ox, $oy) = ($ev->{x}, $ev->{y});
740 my ($bx, $by) = ($self->{x}, $self->{y}); 865 my ($bx, $by) = ($self->{x}, $self->{y});
741 866
742 $self->{motion} = sub { 867 $self->{motion} = sub {
743 my ($ev, $x, $y) = @_; 868 my ($ev, $x, $y) = @_;
… …
827 $self->{children}[$y][$x] = $child; 952 $self->{children}[$y][$x] = $child;
828 953
829 $child->check_size; 954 $child->check_size;
830} 955}
831 956
957sub children {
958 grep $_, map @$_, grep $_, @{ $_[0]{children} }
959}
960
832# TODO: move to container class maybe? send childs a signal on removal? 961# TODO: move to container class maybe? send childs a signal on removal?
833sub clear { 962sub clear {
834 my ($self) = @_; 963 my ($self) = @_;
835 964
965 my @children = $self->children;
836 delete $self->{children}; 966 delete $self->{children};
967
968 for (@children) {
969 delete $_->{parent};
970 $_->hide;
971 }
972
837 $self->update; 973 $self->update;
838} 974}
839 975
840sub get_wh { 976sub get_wh {
841 my ($self) = @_; 977 my ($self) = @_;
… …
1064 1200
1065sub new { 1201sub new {
1066 my ($class, %arg) = @_; 1202 my ($class, %arg) = @_;
1067 1203
1068 my $self = $class->SUPER::new ( 1204 my $self = $class->SUPER::new (
1069 fg => [1, 1, 1], 1205 fg => [1, 1, 1],
1206 #font => default_font
1070 fontsize => 1, 1207 fontsize => 1,
1071 text => "", 1208 text => "",
1072 align => -1, 1209 align => -1,
1073 valign => -1, 1210 valign => -1,
1074 padding => 2, 1211 padding => 2,
1075 layout => new CFClient::Layout, 1212 layout => new CFClient::Layout,
1076 can_events => 0, 1213 can_events => 0,
1077 %arg 1214 %arg
1078 ); 1215 );
1079 1216
1080 if (exists $self->{template}) { 1217 if (exists $self->{template}) {
… …
1087 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1224 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1088 1225
1089 $self 1226 $self
1090} 1227}
1091 1228
1092sub escape_text { 1229sub escape {
1093 local $_ = $_[1]; 1230 local $_ = $_[1];
1094 1231
1095 s/&/&amp;/g; 1232 s/&/&amp;/g;
1096 s/>/&gt;/g; 1233 s/>/&gt;/g;
1097 s/</&lt;/g; 1234 s/</&lt;/g;
1098 1235
1099 $_[1] 1236 $_[1]
1100} 1237}
1101 1238
1239sub update {
1240 my ($self) = @_;
1241
1242 delete $self->{texture};
1243 $self->SUPER::update;
1244}
1245
1246sub reconfigure {
1247 my ($self) = @_;
1248
1249 delete $self->{texture};
1250}
1251
1102sub set_text { 1252sub set_text {
1103 my ($self, $text) = @_; 1253 my ($self, $text) = @_;
1104 1254
1255 return if $self->{text} eq "T$text";
1256 $self->{text} = "T$text";
1257
1105 $self->{layout}->set_text ($text); 1258 $self->{layout}->set_text ($text);
1106 1259
1107 delete $self->{texture}; 1260 delete $self->{texture};
1261 $self->update;
1108 $self->check_size; 1262 $self->check_size;
1109 $self->update;
1110} 1263}
1111 1264
1112sub set_markup { 1265sub set_markup {
1113 my ($self, $markup) = @_; 1266 my ($self, $markup) = @_;
1114 1267
1268 return if $self->{text} eq "M$markup";
1269 $self->{text} = "M$markup";
1270
1115 $self->{layout}->set_markup ($markup); 1271 $self->{layout}->set_markup ($markup);
1116 1272
1117 delete $self->{texture}; 1273 delete $self->{texture};
1274 $self->update;
1118 $self->check_size; 1275 $self->check_size;
1119 $self->update;
1120} 1276}
1121 1277
1122sub size_request { 1278sub size_request {
1123 my ($self) = @_; 1279 my ($self) = @_;
1124 1280
1125 $self->{layout}->set_width; 1281 $self->{layout}->set_font ($self->{font}) if $self->{font};
1282 $self->{layout}->set_width ($self->{max_w} || -1);
1126 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1283 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1127 1284
1128 my ($w, $h) = $self->{layout}->size; 1285 my ($w, $h) = $self->{layout}->size;
1129 1286
1130 if (exists $self->{template}) { 1287 if (exists $self->{template}) {
1288 $self->{template}->set_font ($self->{font}) if $self->{font};
1131 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1289 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1132 1290
1133 my ($w2, $h2) = $self->{template}->size; 1291 my ($w2, $h2) = $self->{template}->size;
1134 1292
1135 $w = List::Util::max $w, $w2; 1293 $w = List::Util::max $w, $w2;
… …
1150 1308
1151sub set_fontsize { 1309sub set_fontsize {
1152 my ($self, $fontsize) = @_; 1310 my ($self, $fontsize) = @_;
1153 1311
1154 $self->{fontsize} = $fontsize; 1312 $self->{fontsize} = $fontsize;
1313 delete $self->{texture};
1155 $self->check_size; 1314 $self->check_size;
1315 $self->update;
1156} 1316}
1157 1317
1158sub _draw { 1318sub _draw {
1159 my ($self) = @_; 1319 my ($self) = @_;
1160 1320
1161 my $tex = $self->{texture} ||= do { 1321 my $tex = $self->{texture} ||= do {
1322 $self->{layout}->set_font ($self->{font}) if $self->{font};
1162 $self->{layout}->set_width ($self->{w}); 1323 $self->{layout}->set_width ($self->{w});
1163 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1324 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1164 new_from_layout CFClient::Texture $self->{layout} 1325 new_from_layout CFClient::Texture $self->{layout}
1165 }; 1326 };
1166 1327
… …
1199 1360
1200sub new { 1361sub new {
1201 my $class = shift; 1362 my $class = shift;
1202 1363
1203 $class->SUPER::new ( 1364 $class->SUPER::new (
1204 fg => [1, 1, 1], 1365 fg => [1, 1, 1],
1205 bg => [0, 0, 0, 0.2], 1366 bg => [0, 0, 0, 0.2],
1206 active_bg => [1, 1, 1, 0.5], 1367 active_bg => [1, 1, 1, 0.5],
1207 active_fg => [0, 0, 0], 1368 active_fg => [0, 0, 0],
1208 can_hover => 1, 1369 can_hover => 1,
1209 can_focus => 1, 1370 can_focus => 1,
1210 valign => 0, 1371 valign => 0,
1211 can_events => 1, 1372 can_events => 1,
1212 @_ 1373 @_
1213 ) 1374 )
1214} 1375}
1215 1376
… …
1369 my ($self, $ev) = @_; 1530 my ($self, $ev) = @_;
1370 1531
1371 my $sym = $ev->{sym}; 1532 my $sym = $ev->{sym};
1372 1533
1373 if ($sym == 13) { 1534 if ($sym == 13) {
1535 unshift @{$self->{history}},
1536 my $txt = $self->get_text;
1537 $self->{history_pointer} = -1;
1538 $self->{history_saveback} = '';
1374 $self->emit (activate => $self->get_text); 1539 $self->emit (activate => $txt);
1375 $self->update; 1540 $self->update;
1541
1542 } elsif ($sym == CFClient::SDLK_UP) {
1543 if ($self->{history_pointer} < 0) {
1544 $self->{history_saveback} = $self->get_text;
1545 }
1546 if (@{$self->{history} || []} > 0) {
1547 $self->{history_pointer}++;
1548 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1549 $self->{history_pointer} = @{$self->{history} || []} - 1;
1550 }
1551 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1552 }
1553
1554 } elsif ($sym == CFClient::SDLK_DOWN) {
1555 $self->{history_pointer}--;
1556 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1557
1558 if ($self->{history_pointer} >= 0) {
1559 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1560 } else {
1561 $self->set_text ($self->{history_saveback});
1562 }
1376 1563
1377 } else { 1564 } else {
1378 $self->SUPER::key_down ($ev); 1565 $self->SUPER::key_down ($ev);
1379 } 1566 }
1380 1567
… …
1394 1581
1395sub new { 1582sub new {
1396 my $class = shift; 1583 my $class = shift;
1397 1584
1398 $class->SUPER::new ( 1585 $class->SUPER::new (
1399 padding => 4, 1586 padding => 4,
1400 fg => [1, 1, 1], 1587 fg => [1, 1, 1],
1401 bg => [1, 1, 1, 0.2], 1588 bg => [1, 1, 1, 0.2],
1402 active_fg => [0, 0, 1], 1589 active_fg => [0, 0, 1],
1403 can_hover => 1, 1590 can_hover => 1,
1404 align => 0, 1591 align => 0,
1405 valign => 0, 1592 valign => 0,
1406 can_events => 1, 1593 can_events => 1,
1407 @_ 1594 @_
1408 ) 1595 )
1409} 1596}
1410 1597
… …
1569 1756
1570package CFClient::UI::VGauge; 1757package CFClient::UI::VGauge;
1571 1758
1572our @ISA = CFClient::UI::Base::; 1759our @ISA = CFClient::UI::Base::;
1573 1760
1761use List::Util qw(min max);
1762
1574use CFClient::OpenGL; 1763use CFClient::OpenGL;
1575 1764
1576my %tex = ( 1765my %tex = (
1577 food => [ 1766 food => [
1578 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1767 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1579 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1768 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1580 ], 1769 ],
1581 grace => [ 1770 grace => [
1582 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1771 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1583 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1772 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1584 ], 1773 ],
1585 hp => [ 1774 hp => [
1586 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1775 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1587 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1776 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1588 ], 1777 ],
1589 mana => [ 1778 mana => [
1590 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1779 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1591 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1780 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1592 ], 1781 ],
1593); 1782);
1594 1783
1595# eg. VGauge->new (gauge => 'food'), default gauge: food 1784# eg. VGauge->new (gauge => 'food'), default gauge: food
1596sub new { 1785sub new {
… …
1615} 1804}
1616 1805
1617sub set_max { 1806sub set_max {
1618 my ($self, $max) = @_; 1807 my ($self, $max) = @_;
1619 1808
1809 return if $self->{max_val} == $max;
1810
1620 $self->{max_val} = $max; 1811 $self->{max_val} = $max;
1812 $self->update;
1621} 1813}
1622 1814
1623sub set_value { 1815sub set_value {
1624 my ($self, $val, $max) = @_; 1816 my ($self, $val, $max) = @_;
1625 1817
1626 $self->set_max ($max) 1818 $self->set_max ($max)
1627 if defined $max; 1819 if defined $max;
1628 1820
1629 $max = $self->{max_val}; 1821 return if $self->{val} == $val;
1822
1630 $self->{val} = $val; 1823 $self->{val} = $val;
1631
1632 $self->update; 1824 $self->update;
1633} 1825}
1634 1826
1635sub _draw { 1827sub _draw {
1636 my ($self) = @_; 1828 my ($self) = @_;
1637 1829
1638 my $tex = $tex{$self->{type}}; 1830 my $tex = $tex{$self->{type}};
1831 my ($t1, $t2, $t3) = @$tex;
1639 1832
1640 my ($w, $h) = ($self->{w}, $self->{h}); 1833 my ($w, $h) = ($self->{w}, $self->{h});
1641 1834
1642 if ($self->{vertical}) { 1835 if ($self->{vertical}) {
1643 glRotate 90, 0, 0, 1; 1836 glRotate 90, 0, 0, 1;
… …
1645 1838
1646 ($w, $h) = ($h, $w); 1839 ($w, $h) = ($h, $w);
1647 } 1840 }
1648 1841
1649 my $ycut = $self->{val} / ($self->{max_val} || 1); 1842 my $ycut = $self->{val} / ($self->{max_val} || 1);
1650 $ycut = 1 if $self->{val} > $self->{max_val};
1651 1843
1652 my $t1 = $tex->[0]; 1844 my $ycut1 = max 0, min 1, $ycut;
1653 my $t2 = $tex->[1]; 1845 my $ycut2 = max 0, min 1, $ycut - 1;
1846
1847 my $h1 = $self->{h} * (1 - $ycut1);
1848 my $h2 = $self->{h} * (1 - $ycut2);
1654 1849
1655 glEnable GL_BLEND; 1850 glEnable GL_BLEND;
1656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1851 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1657 glEnable GL_TEXTURE_2D; 1852 glEnable GL_TEXTURE_2D;
1658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1659 1854
1660 my $h1 = $self->{h} - $ycut * $self->{h};
1661 my $h2 = $ycut * $self->{h};
1662
1663 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1855 glBindTexture GL_TEXTURE_2D, $t1->{name};
1664 glBegin GL_QUADS; 1856 glBegin GL_QUADS;
1665 glTexCoord 0 , 0; glVertex 0 , 0; 1857 glTexCoord 0 , 0; glVertex 0 , 0;
1666 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1858 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1667 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1859 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1668 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1860 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1669 glEnd; 1861 glEnd;
1670 1862
1863 my $ycut1 = List::Util::min 1, $ycut;
1671 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1864 glBindTexture GL_TEXTURE_2D, $t2->{name};
1672 glBegin GL_QUADS; 1865 glBegin GL_QUADS;
1673 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1866 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1674 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1867 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1675 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1868 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1676 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1869 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1677 glEnd; 1870 glEnd;
1871
1872 if ($t3) {
1873 glBindTexture GL_TEXTURE_2D, $t3->{name};
1874 glBegin GL_QUADS;
1875 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1876 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1877 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1878 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1879 glEnd;
1880 }
1678 1881
1679 glDisable GL_BLEND; 1882 glDisable GL_BLEND;
1680 glDisable GL_TEXTURE_2D; 1883 glDisable GL_TEXTURE_2D;
1681} 1884}
1682 1885
… …
1685package CFClient::UI::Gauge; 1888package CFClient::UI::Gauge;
1686 1889
1687our @ISA = CFClient::UI::VBox::; 1890our @ISA = CFClient::UI::VBox::;
1688 1891
1689sub new { 1892sub new {
1690 my ($class, %arg) = shift; 1893 my ($class, %arg) = @_;
1691 1894
1692 my $self = $class->SUPER::new ( 1895 my $self = $class->SUPER::new (
1693 @_, 1896 tooltip => $arg{type},
1897 can_hover => 1,
1898 can_events => 1,
1899 %arg,
1694 ); 1900 );
1695 1901
1696 $self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"; 1902 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1903 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1697 $self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"; 1904 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1698 $self->add ($self->{value});
1699 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1700 $self->add ($self->{max});
1701 1905
1702 $self 1906 $self
1703}
1704
1705sub size_request {
1706 my ($self) = @_;
1707 (($self->{max}->size_request)[0], 0)
1708} 1907}
1709 1908
1710sub set_fontsize { 1909sub set_fontsize {
1711 my ($self, $fsize) = @_; 1910 my ($self, $fsize) = @_;
1712 1911
1713 $self->{value}->set_fontsize ($fsize); 1912 $self->{value}->set_fontsize ($fsize);
1714 $self->{max} ->set_fontsize ($fsize); 1913 $self->{max} ->set_fontsize ($fsize);
1715} 1914}
1716 1915
1916sub set_max {
1917 my ($self, $max) = @_;
1918
1919 $self->{gauge}->set_max ($max);
1920 $self->{max}->set_text ($max);
1921}
1922
1717sub set_value { 1923sub set_value {
1718 my ($self, $val, $max) = @_; 1924 my ($self, $val, $max) = @_;
1719 1925
1720 $self->set_max ($max) 1926 $self->set_max ($max)
1721 if defined $max; 1927 if defined $max;
1722 1928
1723 $self->{gauge}->set_value ($val, $max); 1929 $self->{gauge}->set_value ($val, $max);
1724 $self->{value}->set_text ($val); 1930 $self->{value}->set_text ($val);
1725}
1726
1727sub set_max {
1728 my ($self, $max) = @_;
1729
1730 $self->{gauge}->set_max ($max);
1731 $self->{max}->set_text ($max);
1732} 1931}
1733 1932
1734############################################################################# 1933#############################################################################
1735 1934
1736package CFClient::UI::Slider; 1935package CFClient::UI::Slider;
… …
1876 2075
1877sub new { 2076sub new {
1878 my $class = shift; 2077 my $class = shift;
1879 2078
1880 my $self = $class->SUPER::new ( 2079 my $self = $class->SUPER::new (
1881 fontsize => 1, 2080 fontsize => 1,
2081 can_events => 0,
2082 #font => default_font
1882 @_, 2083 @_,
1883 2084
1884 layout => (new CFClient::Layout), 2085 layout => (new CFClient::Layout),
1885 par => [], 2086 par => [],
1886 height => 0, 2087 height => 0,
1887 children => [ 2088 children => [
1888 (new CFClient::UI::Empty expand => 1), 2089 (new CFClient::UI::Empty expand => 1),
1889 (new CFClient::UI::Slider vertical => 1), 2090 (new CFClient::UI::Slider vertical => 1),
1890 ], 2091 ],
1891 ); 2092 );
1892 2093
1893 $self->{children}[1]->connect (changed => sub { 2094 $self->{children}[1]->connect (changed => sub { $self->update });
1894 $self->update;
1895 });
1896 2095
1897 $self 2096 $self
1898} 2097}
1899 2098
1900sub set_fontsize { 2099sub set_fontsize {
… …
1908 my ($self, $text) = @_; 2107 my ($self, $text) = @_;
1909 2108
1910 my $layout = $self->{layout}; 2109 my $layout = $self->{layout};
1911 2110
1912 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2111 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1913 $layout->set_width ($self->{w}); 2112 $layout->set_width ($self->{children}[0]{w});
1914 $layout->set_text ($text); 2113 $layout->set_text ($text);
1915 2114
1916 ($layout->size)[1] 2115 ($layout->size)[1]
1917} 2116}
1918 2117
… …
1926sub size_allocate { 2125sub size_allocate {
1927 my ($self, $w, $h) = @_; 2126 my ($self, $w, $h) = @_;
1928 2127
1929 $self->SUPER::size_allocate ($w, $h); 2128 $self->SUPER::size_allocate ($w, $h);
1930 2129
2130 $self->{layout}->set_font ($self->{font}) if $self->{font};
1931 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2131 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1932 $self->{layout}->set_width ($self->{children}[0]{w}); 2132 $self->{layout}->set_width ($self->{children}[0]{w});
1933 2133
1934 $self->reflow; 2134 $self->reflow;
1935} 2135}
… …
1970 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2170 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1971 2171
1972 delete $self->{texture}; 2172 delete $self->{texture};
1973 } 2173 }
1974 2174
1975 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2175 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1976 glClearColor 0, 0, 0, 1; 2176 glClearColor 0, 0, 0, 0;
1977 glClear GL_COLOR_BUFFER_BIT; 2177 glClear GL_COLOR_BUFFER_BIT;
1978 2178
1979 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
1980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2180 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1981 glEnable GL_TEXTURE_2D; 2181 glEnable GL_TEXTURE_2D;
… …
1988 2188
1989 my $y = 0; 2189 my $y = 0;
1990 2190
1991 my $layout = $self->{layout}; 2191 my $layout = $self->{layout};
1992 2192
2193 $layout->set_font ($self->{font}) if $self->{font};
2194
1993 for my $par (@{$self->{par}}) { 2195 for my $par (@{$self->{par}}) {
1994 my $h = $par->[0]; 2196 my $h = $par->[0];
1995 2197
1996 if ($y0 < $y + $h && $y < $y1) { 2198 if ($y0 < $y + $h && $y < $y1) {
1997 $layout->set_text ($par->[2]); 2199 $layout->set_text ($par->[2]);
… …
2011} 2213}
2012 2214
2013sub _draw { 2215sub _draw {
2014 my ($self) = @_; 2216 my ($self) = @_;
2015 2217
2016 if ($self->{texture}) { 2218 glEnable GL_BLEND;
2219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2017 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
2018 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222 glColor 1, 1, 1, 1;
2019 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2223 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2020 glDisable GL_TEXTURE_2D; 2224 glDisable GL_TEXTURE_2D;
2021 } 2225 glDisable GL_BLEND;
2022 2226
2023 $self->{children}[1]->draw; 2227 $self->{children}[1]->draw;
2024 2228
2025} 2229}
2026 2230
… …
2074 2278
2075sub new { 2279sub new {
2076 my $class = shift; 2280 my $class = shift;
2077 2281
2078 my $self = $class->SUPER::new ( 2282 my $self = $class->SUPER::new (
2079 state => 0, 2283 state => 0,
2080 connect_activate => \&toggle_flopper, 2284 connect_activate => \&toggle_flopper,
2081 can_events => 1,
2082 @_ 2285 @_
2083 ); 2286 );
2084 2287
2085 if ($self->{state}) { 2288 if ($self->{state}) {
2086 $self->{state} = 0; 2289 $self->{state} = 0;
… …
2106 $self->emit (changed => $self->{state}); 2309 $self->emit (changed => $self->{state});
2107} 2310}
2108 2311
2109############################################################################# 2312#############################################################################
2110 2313
2314package CFClient::UI::Tooltip;
2315
2316our @ISA = CFClient::UI::Bin::;
2317
2318use CFClient::OpenGL;
2319
2320sub new {
2321 my $class = shift;
2322
2323 $class->SUPER::new (
2324 @_,
2325 can_events => 0,
2326 )
2327}
2328
2329sub set_markup {
2330 my ($self, $text) = @_;
2331
2332 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2333 $self->{label}->set_markup ($text);
2334 $self->add ($self->{label});
2335}
2336
2337sub size_request {
2338 my ($self) = @_;
2339
2340 $self->child->set_max_size ($::WIDTH * 0.3);
2341
2342 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2343
2344 ($w + 4, $h + 4)
2345}
2346
2347sub size_allocate {
2348 my ($self, $w, $h) = @_;
2349
2350 $self->SUPER::size_allocate ($w - 4, $h - 4);
2351}
2352
2353sub _draw {
2354 my ($self) = @_;
2355
2356 glPushMatrix;
2357 glTranslate 0.375, 0.375;
2358
2359 my ($w, $h) = @$self{qw(w h)};
2360
2361 glColor 1, 0.8, 0.4;
2362 glBegin GL_QUADS;
2363 glVertex 0 , 0;
2364 glVertex 0 , $h;
2365 glVertex $w, $h;
2366 glVertex $w, 0;
2367 glEnd;
2368
2369 glColor 0, 0, 0;
2370 glBegin GL_LINE_LOOP;
2371 glVertex 0 , 0;
2372 glVertex 0 , $h;
2373 glVertex $w, $h;
2374 glVertex $w, 0;
2375 glEnd;
2376
2377 glPopMatrix;
2378
2379 glTranslate 2, 2;
2380 $self->SUPER::_draw;
2381}
2382
2383#############################################################################
2384
2385package CFClient::UI::Face;
2386
2387our @ISA = CFClient::UI::Base::;
2388
2389use CFClient::OpenGL;
2390
2391sub new {
2392 my $class = shift;
2393
2394 $class->SUPER::new (
2395 aspect => 1,
2396 @_,
2397 )
2398}
2399
2400sub size_request {
2401 (32, 8)
2402}
2403
2404sub draw {
2405 my ($self) = @_;
2406
2407 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2408
2409 if ($tex) {
2410 glEnable GL_BLEND;
2411 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2412 glEnable GL_TEXTURE_2D;
2413 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2414 glColor 1, 1, 1, 1;
2415 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2416 glDisable GL_TEXTURE_2D;
2417 glDisable GL_BLEND;
2418 }
2419}
2420
2421#############################################################################
2422
2111package CFClient::UI::Root; 2423package CFClient::UI::Root;
2112 2424
2113our @ISA = CFClient::UI::Container::; 2425our @ISA = CFClient::UI::Container::;
2114 2426
2115use CFClient::OpenGL; 2427use CFClient::OpenGL;
… …
2190############################################################################# 2502#############################################################################
2191 2503
2192package CFClient::UI; 2504package CFClient::UI;
2193 2505
2194$ROOT = new CFClient::UI::Root; 2506$ROOT = new CFClient::UI::Root;
2507$TOOLTIP = new CFClient::UI::Tooltip;
2195 2508
21961 25091
2197 2510

Diff Legend

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