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.160 by root, Mon Apr 24 03:33:51 2006 UTC vs.
Revision 1.176 by root, Tue Apr 25 12:10:58 2006 UTC

… …
23 23
24 my $tip = $widget->{tooltip}; 24 my $tip = $widget->{tooltip};
25 25
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 27
28 $TOOLTIP->set_text ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29
30 $TOOLTIP->show; 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);
31 } 39 }
32 40
33 return; 41 return;
34 } 42 }
35 } 43 }
… …
39 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
40} 48}
41 49
42# class methods for events 50# class methods for events
43sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
45} 54}
46 55
47sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
49} 59}
50 60
51sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
52 my ($ev) = @_; 62 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 71 check_tooltip;
62 } 72 }
63 73
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 75
66 $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 }
67} 80}
68 81
69sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
70 my ($ev) = @_; 83 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
72 85
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 87
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 89
77 $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 }
78 94
79 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 97 $grab->update if $grab;
82 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 115
100 check_tooltip; 116 check_tooltip;
101 } 117 }
102 118
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 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 }
104} 123}
105 124
106# convert position array to integers 125# convert position array to integers
107sub harmonize { 126sub harmonize {
108 my ($vals) = @_; 127 my ($vals) = @_;
… …
126 145
127sub new { 146sub new {
128 my $class = shift; 147 my $class = shift;
129 148
130 my $self = bless { 149 my $self = bless {
131 x => 0, 150 x => 0,
132 y => 0, 151 y => 0,
133 z => 0, 152 z => 0,
134 can_events => 1, 153 can_events => 1,
135 @_ 154 @_
136 }, $class; 155 }, $class;
137 156
138 for (keys %$self) { 157 for (keys %$self) {
… …
160} 179}
161 180
162sub hide { 181sub hide {
163 my ($self) = @_; 182 my ($self) = @_;
164 183
165 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
166 186
167 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
168} 189}
169 190
170sub move { 191sub move {
171 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
172 193
… …
223 244
224sub size_allocate { 245sub size_allocate {
225 # nothing to be done 246 # nothing to be done
226} 247}
227 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
228sub set_max_size { 262sub set_max_size {
229 my ($self, $w, $h) = @_; 263 my ($self, $w, $h) = @_;
230 264
231 delete $self->{max_w}; $self->{max_w} = $w if $w; 265 delete $self->{max_w}; $self->{max_w} = $w if $w;
232 delete $self->{max_h}; $self->{max_h} = $h if $h; 266 delete $self->{max_h}; $self->{max_h} = $h if $h;
233} 267}
234 268
235# return top left coordinates 269# return top left coordinates
236sub _topleft { 270sub _topleft {
237 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
238 275
239 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
240} 277}
241 278
242# translate global coordinates to local coordinate system 279# translate global coordinates to local coordinate system
… …
320 glVertex $x + $self->{w}, $y + $self->{h}; 357 glVertex $x + $self->{w}, $y + $self->{h};
321 glVertex $x , $y + $self->{h}; 358 glVertex $x , $y + $self->{h};
322 glEnd; 359 glEnd;
323 glDisable GL_BLEND; 360 glDisable GL_BLEND;
324 } 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 }
325} 376}
326 377
327sub _draw { 378sub _draw {
328 my ($self) = @_; 379 my ($self) = @_;
329 380
… …
388} 439}
389 440
390sub emit { 441sub emit {
391 my ($self, $signal, @args) = @_; 442 my ($self, $signal, @args) = @_;
392 443
393 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
394 $cb->($self, @args);
395 }
396} 445}
397 446
398sub DESTROY { 447sub DESTROY {
399 my ($self) = @_; 448 my ($self) = @_;
400 449
… …
467sub new { 516sub new {
468 my ($class, %arg) = @_; 517 my ($class, %arg) = @_;
469 518
470 my $children = delete $arg{children} || []; 519 my $children = delete $arg{children} || [];
471 520
472 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 );
473 $self->add ($_) for @$children; 526 $self->add ($_) for @$children;
474 527
475 $self 528 $self
476} 529}
477 530
… …
488 ]; 541 ];
489 542
490 $child->check_size; 543 $child->check_size;
491} 544}
492 545
546sub children {
547 @{ $_[0]{children} }
548}
549
493sub remove { 550sub remove {
494 my ($self, $child) = @_; 551 my ($self, $child) = @_;
495 552
496 delete $child->{parent}; 553 delete $child->{parent};
554 $child->hide;
497 555
498 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
499 557
500 $self->check_size; 558 $self->check_size;
501 $self->update; 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 }
502} 572}
503 573
504sub find_widget { 574sub find_widget {
505 my ($self, $x, $y) = @_; 575 my ($self, $x, $y) = @_;
506 576
… …
581} 651}
582 652
583sub update { 653sub update {
584 my ($self) = @_; 654 my ($self) = @_;
585 655
586 # we want to do this delayed... 656 $ROOT->on_refresh ($self => sub { $self->render_child });
587 $self->render_chld;
588 $self->SUPER::update; 657 $self->SUPER::update;
589} 658}
590 659
660sub size_allocate {
661 my ($self, $w, $h) = @_;
662
663 $self->SUPER::size_allocate ($w, $h);
664 $self->update;
665}
666
591sub render_chld { 667sub render_child {
592 my ($self) = @_; 668 my ($self) = @_;
593 669
594 $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 {
595 glClearColor 0, 0, 0, 1; 671 glClearColor 0, 0, 0, 0;
596 glClear GL_COLOR_BUFFER_BIT; 672 glClear GL_COLOR_BUFFER_BIT;
597 $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;
598 }; 681 };
599}
600
601sub size_allocate {
602 my ($self, $w, $h) = @_;
603
604 $self->child->configure (0, 0, $w, $h);
605
606 $self->render_chld;
607} 682}
608 683
609sub _draw { 684sub _draw {
610 my ($self) = @_; 685 my ($self) = @_;
611 686
… …
613 688
614 my $tex = $self->{texture} 689 my $tex = $self->{texture}
615 or return; 690 or return;
616 691
617 glEnable GL_BLEND; 692 glEnable GL_BLEND;
618 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
619 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
620 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;
621 697
622 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad (0, 0, $w, $h);
623 699
624 glDisable GL_BLEND; 700 glDisable GL_BLEND;
625 glDisable GL_TEXTURE_2D; 701 glDisable GL_TEXTURE_2D;
… …
710 my $class = shift; 786 my $class = shift;
711 787
712 # TODO: user_x, user_y, overwrite moveto? 788 # TODO: user_x, user_y, overwrite moveto?
713 789
714 my $self = $class->SUPER::new ( 790 my $self = $class->SUPER::new (
715 bg => [1, 1, 1, 1], 791 bg => [1, 1, 1, 1],
716 border_bg => [1, 1, 1, 1], 792 border_bg => [1, 1, 1, 1],
717 border => 0.8, 793 border => 0.6,
718 can_events => 1, 794 can_events => 1,
719 @_ 795 @_
720 ); 796 );
721 797
722 $self->{title} &&= new CFClient::UI::Label 798 $self->{title} &&= new CFClient::UI::Label
723 align => 0, 799 align => 0,
724 valign => 1, 800 valign => 1,
725 text => $self->{title}, 801 text => $self->{title},
726 fontsize => 1; 802 fontsize => $self->{border};
727 803
728 $self 804 $self
729} 805}
730 806
731sub border { 807sub border {
… …
756} 832}
757 833
758sub button_down { 834sub button_down {
759 my ($self, $ev, $x, $y) = @_; 835 my ($self, $ev, $x, $y) = @_;
760 836
837 my ($w, $h) = @$self{qw(w h)};
761 my $border = $self->border; 838 my $border = $self->border;
762 839
763 if ($x < $self->{w} && $x >= $self->{w} - $border 840 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
764 && $y < $self->{h} && $y >= $self->{h} - $border) { 841 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
765 842
843 if ($lr & $td) {
844 my ($wx, $wy) = ($self->{x}, $self->{y});
766 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 845 my ($ox, $oy) = ($ev->{x}, $ev->{y});
767 my ($bw, $bh) = ($self->{w}, $self->{h}); 846 my ($bw, $bh) = ($self->{w}, $self->{h});
768 847
848 my $mx = $x < $border;
849 my $my = $y < $border;
850
769 $self->{motion} = sub { 851 $self->{motion} = sub {
770 my ($ev, $x, $y) = @_; 852 my ($ev, $x, $y) = @_;
771 853
772 ($x, $y) = ($ev->{x}, $ev->{y}); 854 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy;
773 856
774 $self->{user_w} = $bw + $x - $ox; 857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
775 $self->{user_h} = $bh + $y - $oy; 858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
859 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
776 $self->check_size; 860 $self->check_size;
777 }; 861 };
778 862
779 } elsif ($x >= 0 && $x < $self->{w} 863 } elsif ($lr ^ $td) {
780 && $y >= 0 && $y < $border) {
781
782 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 864 my ($ox, $oy) = ($ev->{x}, $ev->{y});
783 my ($bx, $by) = ($self->{x}, $self->{y}); 865 my ($bx, $by) = ($self->{x}, $self->{y});
784 866
785 $self->{motion} = sub { 867 $self->{motion} = sub {
786 my ($ev, $x, $y) = @_; 868 my ($ev, $x, $y) = @_;
… …
870 $self->{children}[$y][$x] = $child; 952 $self->{children}[$y][$x] = $child;
871 953
872 $child->check_size; 954 $child->check_size;
873} 955}
874 956
957sub children {
958 grep $_, map @$_, grep $_, @{ $_[0]{children} }
959}
960
875# 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?
876sub clear { 962sub clear {
877 my ($self) = @_; 963 my ($self) = @_;
878 964
965 my @children = $self->children;
879 delete $self->{children}; 966 delete $self->{children};
967
968 for (@children) {
969 delete $_->{parent};
970 $_->hide;
971 }
972
880 $self->update; 973 $self->update;
881} 974}
882 975
883sub get_wh { 976sub get_wh {
884 my ($self) = @_; 977 my ($self) = @_;
… …
1107 1200
1108sub new { 1201sub new {
1109 my ($class, %arg) = @_; 1202 my ($class, %arg) = @_;
1110 1203
1111 my $self = $class->SUPER::new ( 1204 my $self = $class->SUPER::new (
1112 fg => [1, 1, 1], 1205 fg => [1, 1, 1],
1113 #font => default_font 1206 #font => default_font
1114 fontsize => 1, 1207 fontsize => 1,
1115 text => "", 1208 text => "",
1116 align => -1, 1209 align => -1,
1117 valign => -1, 1210 valign => -1,
1118 padding => 2, 1211 padding => 2,
1119 layout => new CFClient::Layout, 1212 layout => new CFClient::Layout,
1120 can_events => 0, 1213 can_events => 0,
1121 %arg 1214 %arg
1122 ); 1215 );
1123 1216
1124 if (exists $self->{template}) { 1217 if (exists $self->{template}) {
… …
1131 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1224 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1132 1225
1133 $self 1226 $self
1134} 1227}
1135 1228
1136sub escape_text { 1229sub escape {
1137 local $_ = $_[1]; 1230 local $_ = $_[1];
1138 1231
1139 s/&/&amp;/g; 1232 s/&/&amp;/g;
1140 s/>/&gt;/g; 1233 s/>/&gt;/g;
1141 s/</&lt;/g; 1234 s/</&lt;/g;
1142 1235
1143 $_[1] 1236 $_[1]
1144} 1237}
1145 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
1146sub set_text { 1252sub set_text {
1147 my ($self, $text) = @_; 1253 my ($self, $text) = @_;
1148 1254
1255 return if $self->{text} eq "T$text";
1256 $self->{text} = "T$text";
1257
1149 $self->{layout}->set_text ($text); 1258 $self->{layout}->set_text ($text);
1150 1259
1151 delete $self->{texture}; 1260 delete $self->{texture};
1261 $self->update;
1152 $self->check_size; 1262 $self->check_size;
1153 $self->update;
1154} 1263}
1155 1264
1156sub set_markup { 1265sub set_markup {
1157 my ($self, $markup) = @_; 1266 my ($self, $markup) = @_;
1158 1267
1268 return if $self->{text} eq "M$markup";
1269 $self->{text} = "M$markup";
1270
1159 $self->{layout}->set_markup ($markup); 1271 $self->{layout}->set_markup ($markup);
1160 1272
1161 delete $self->{texture}; 1273 delete $self->{texture};
1274 $self->update;
1162 $self->check_size; 1275 $self->check_size;
1163 $self->update;
1164} 1276}
1165 1277
1166sub size_request { 1278sub size_request {
1167 my ($self) = @_; 1279 my ($self) = @_;
1168 1280
… …
1248 1360
1249sub new { 1361sub new {
1250 my $class = shift; 1362 my $class = shift;
1251 1363
1252 $class->SUPER::new ( 1364 $class->SUPER::new (
1253 fg => [1, 1, 1], 1365 fg => [1, 1, 1],
1254 bg => [0, 0, 0, 0.2], 1366 bg => [0, 0, 0, 0.2],
1255 active_bg => [1, 1, 1, 0.5], 1367 active_bg => [1, 1, 1, 0.5],
1256 active_fg => [0, 0, 0], 1368 active_fg => [0, 0, 0],
1257 can_hover => 1, 1369 can_hover => 1,
1258 can_focus => 1, 1370 can_focus => 1,
1259 valign => 0, 1371 valign => 0,
1260 can_events => 1, 1372 can_events => 1,
1261 @_ 1373 @_
1262 ) 1374 )
1263} 1375}
1264 1376
… …
1418 my ($self, $ev) = @_; 1530 my ($self, $ev) = @_;
1419 1531
1420 my $sym = $ev->{sym}; 1532 my $sym = $ev->{sym};
1421 1533
1422 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} = '';
1423 $self->emit (activate => $self->get_text); 1539 $self->emit (activate => $txt);
1424 $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 }
1425 1563
1426 } else { 1564 } else {
1427 $self->SUPER::key_down ($ev); 1565 $self->SUPER::key_down ($ev);
1428 } 1566 }
1429 1567
… …
1443 1581
1444sub new { 1582sub new {
1445 my $class = shift; 1583 my $class = shift;
1446 1584
1447 $class->SUPER::new ( 1585 $class->SUPER::new (
1448 padding => 4, 1586 padding => 4,
1449 fg => [1, 1, 1], 1587 fg => [1, 1, 1],
1450 bg => [1, 1, 1, 0.2], 1588 bg => [1, 1, 1, 0.2],
1451 active_fg => [0, 0, 1], 1589 active_fg => [0, 0, 1],
1452 can_hover => 1, 1590 can_hover => 1,
1453 align => 0, 1591 align => 0,
1454 valign => 0, 1592 valign => 0,
1455 can_events => 1, 1593 can_events => 1,
1456 @_ 1594 @_
1457 ) 1595 )
1458} 1596}
1459 1597
… …
1666} 1804}
1667 1805
1668sub set_max { 1806sub set_max {
1669 my ($self, $max) = @_; 1807 my ($self, $max) = @_;
1670 1808
1809 return if $self->{max_val} == $max;
1810
1671 $self->{max_val} = $max; 1811 $self->{max_val} = $max;
1812 $self->update;
1672} 1813}
1673 1814
1674sub set_value { 1815sub set_value {
1675 my ($self, $val, $max) = @_; 1816 my ($self, $val, $max) = @_;
1676 1817
1677 $self->set_max ($max) 1818 $self->set_max ($max)
1678 if defined $max; 1819 if defined $max;
1679 1820
1680 $max = $self->{max_val}; 1821 return if $self->{val} == $val;
1822
1681 $self->{val} = $val; 1823 $self->{val} = $val;
1682
1683 $self->update; 1824 $self->update;
1684} 1825}
1685 1826
1686sub _draw { 1827sub _draw {
1687 my ($self) = @_; 1828 my ($self) = @_;
… …
1750 1891
1751sub new { 1892sub new {
1752 my ($class, %arg) = @_; 1893 my ($class, %arg) = @_;
1753 1894
1754 my $self = $class->SUPER::new ( 1895 my $self = $class->SUPER::new (
1755 tooltip => $arg{type}, 1896 tooltip => $arg{type},
1897 can_hover => 1,
1898 can_events => 1,
1756 %arg, 1899 %arg,
1757 ); 1900 );
1758 1901
1759 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1902 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1760 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 1903 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1761 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 1904 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1762 1905
1763 $self 1906 $self
1764} 1907}
1765 1908
1766sub set_fontsize { 1909sub set_fontsize {
… …
1768 1911
1769 $self->{value}->set_fontsize ($fsize); 1912 $self->{value}->set_fontsize ($fsize);
1770 $self->{max} ->set_fontsize ($fsize); 1913 $self->{max} ->set_fontsize ($fsize);
1771} 1914}
1772 1915
1916sub set_max {
1917 my ($self, $max) = @_;
1918
1919 $self->{gauge}->set_max ($max);
1920 $self->{max}->set_text ($max);
1921}
1922
1773sub set_value { 1923sub set_value {
1774 my ($self, $val, $max) = @_; 1924 my ($self, $val, $max) = @_;
1775 1925
1776 $self->set_max ($max) 1926 $self->set_max ($max)
1777 if defined $max; 1927 if defined $max;
1778 1928
1779 $self->{gauge}->set_value ($val, $max); 1929 $self->{gauge}->set_value ($val, $max);
1780 $self->{value}->set_text ($val); 1930 $self->{value}->set_text ($val);
1781}
1782
1783sub set_max {
1784 my ($self, $max) = @_;
1785
1786 $self->{gauge}->set_max ($max);
1787 $self->{max}->set_text ($max);
1788} 1931}
1789 1932
1790############################################################################# 1933#############################################################################
1791 1934
1792package CFClient::UI::Slider; 1935package CFClient::UI::Slider;
… …
1932 2075
1933sub new { 2076sub new {
1934 my $class = shift; 2077 my $class = shift;
1935 2078
1936 my $self = $class->SUPER::new ( 2079 my $self = $class->SUPER::new (
1937 fontsize => 1, 2080 fontsize => 1,
2081 can_events => 0,
1938 #font => default_font 2082 #font => default_font
1939 @_, 2083 @_,
1940 2084
1941 layout => (new CFClient::Layout), 2085 layout => (new CFClient::Layout),
1942 par => [], 2086 par => [],
1943 height => 0, 2087 height => 0,
1944 children => [ 2088 children => [
1945 (new CFClient::UI::Empty expand => 1), 2089 (new CFClient::UI::Empty expand => 1),
1946 (new CFClient::UI::Slider vertical => 1), 2090 (new CFClient::UI::Slider vertical => 1),
1947 ], 2091 ],
1948 ); 2092 );
1949 2093
1950 $self->{children}[1]->connect (changed => sub { 2094 $self->{children}[1]->connect (changed => sub { $self->update });
1951 $self->update;
1952 });
1953 2095
1954 $self 2096 $self
1955} 2097}
1956 2098
1957sub set_fontsize { 2099sub set_fontsize {
… …
1965 my ($self, $text) = @_; 2107 my ($self, $text) = @_;
1966 2108
1967 my $layout = $self->{layout}; 2109 my $layout = $self->{layout};
1968 2110
1969 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2111 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1970 $layout->set_width ($self->{w}); 2112 $layout->set_width ($self->{children}[0]{w});
1971 $layout->set_text ($text); 2113 $layout->set_text ($text);
1972 2114
1973 ($layout->size)[1] 2115 ($layout->size)[1]
1974} 2116}
1975 2117
… …
2028 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2170 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2029 2171
2030 delete $self->{texture}; 2172 delete $self->{texture};
2031 } 2173 }
2032 2174
2033 $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 {
2034 glClearColor 0, 0, 0, 1; 2176 glClearColor 0, 0, 0, 0;
2035 glClear GL_COLOR_BUFFER_BIT; 2177 glClear GL_COLOR_BUFFER_BIT;
2036 2178
2037 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
2038 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2180 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2039 glEnable GL_TEXTURE_2D; 2181 glEnable GL_TEXTURE_2D;
… …
2071} 2213}
2072 2214
2073sub _draw { 2215sub _draw {
2074 my ($self) = @_; 2216 my ($self) = @_;
2075 2217
2076 if ($self->{texture}) { 2218 glEnable GL_BLEND;
2219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2077 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
2078 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;
2079 $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});
2080 glDisable GL_TEXTURE_2D; 2224 glDisable GL_TEXTURE_2D;
2081 } 2225 glDisable GL_BLEND;
2082 2226
2083 $self->{children}[1]->draw; 2227 $self->{children}[1]->draw;
2084 2228
2085} 2229}
2086 2230
… …
2134 2278
2135sub new { 2279sub new {
2136 my $class = shift; 2280 my $class = shift;
2137 2281
2138 my $self = $class->SUPER::new ( 2282 my $self = $class->SUPER::new (
2139 state => 0, 2283 state => 0,
2140 connect_activate => \&toggle_flopper, 2284 connect_activate => \&toggle_flopper,
2141 can_events => 1,
2142 @_ 2285 @_
2143 ); 2286 );
2144 2287
2145 if ($self->{state}) { 2288 if ($self->{state}) {
2146 $self->{state} = 0; 2289 $self->{state} = 0;
… …
2181 @_, 2324 @_,
2182 can_events => 0, 2325 can_events => 0,
2183 ) 2326 )
2184} 2327}
2185 2328
2186sub set_text { 2329sub set_markup {
2187 my ($self, $text) = @_; 2330 my ($self, $text) = @_;
2188 2331
2189 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2332 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2190 $self->{label}->set_text ($text); 2333 $self->{label}->set_markup ($text);
2191 $self->add ($self->{label}); 2334 $self->add ($self->{label});
2192} 2335}
2193 2336
2194sub size_request { 2337sub size_request {
2195 my ($self) = @_; 2338 my ($self) = @_;
… …
2197 $self->child->set_max_size ($::WIDTH * 0.3); 2340 $self->child->set_max_size ($::WIDTH * 0.3);
2198 2341
2199 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2342 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2200 2343
2201 ($w + 4, $h + 4) 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);
2202} 2351}
2203 2352
2204sub _draw { 2353sub _draw {
2205 my ($self) = @_; 2354 my ($self) = @_;
2206 2355
… …
2231 $self->SUPER::_draw; 2380 $self->SUPER::_draw;
2232} 2381}
2233 2382
2234############################################################################# 2383#############################################################################
2235 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
2236package CFClient::UI::Root; 2423package CFClient::UI::Root;
2237 2424
2238our @ISA = CFClient::UI::Container::; 2425our @ISA = CFClient::UI::Container::;
2239 2426
2240use CFClient::OpenGL; 2427use CFClient::OpenGL;

Diff Legend

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