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.159 by root, Mon Apr 24 03:19:42 2006 UTC vs.
Revision 1.174 by root, Tue Apr 25 11:18:49 2006 UTC

… …
14our $BUTTON_STATE; 14our $BUTTON_STATE;
15 15
16sub check_tooltip { 16sub check_tooltip {
17 if (!$GRAB) { 17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 19 if (length $widget->{tooltip}) {
20 20
21 if ($TOOLTIP->{owner} != $widget) { 21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 22 $TOOLTIP->{owner} = $widget;
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;
598 }; 674 };
599} 675}
600 676
601sub size_allocate {
602 my ($self, $w, $h) = @_;
603
604 $self->child->configure (0, 0, $w, $h);
605
606 $self->render_chld;
607}
608
609sub _draw { 677sub _draw {
610 my ($self) = @_; 678 my ($self) = @_;
611 679
612 my ($w, $h) = ($self->w, $self->h); 680 my ($w, $h) = ($self->w, $self->h);
613 681
614 my $tex = $self->{texture} 682 my $tex = $self->{texture}
615 or return; 683 or return;
616 684
617 glEnable GL_BLEND; 685 glEnable GL_BLEND;
618 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
619 glEnable GL_TEXTURE_2D; 687 glEnable GL_TEXTURE_2D;
620 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;
621 690
622 $tex->draw_quad (0, 0, $w, $h); 691 $tex->draw_quad (0, 0, $w, $h);
623 692
624 glDisable GL_BLEND; 693 glDisable GL_BLEND;
625 glDisable GL_TEXTURE_2D; 694 glDisable GL_TEXTURE_2D;
… …
710 my $class = shift; 779 my $class = shift;
711 780
712 # TODO: user_x, user_y, overwrite moveto? 781 # TODO: user_x, user_y, overwrite moveto?
713 782
714 my $self = $class->SUPER::new ( 783 my $self = $class->SUPER::new (
715 bg => [1, 1, 1, 1], 784 bg => [1, 1, 1, 1],
716 border_bg => [1, 1, 1, 1], 785 border_bg => [1, 1, 1, 1],
717 border => 0.8, 786 border => 0.8,
718 can_events => 1, 787 can_events => 1,
719 @_ 788 @_
720 ); 789 );
721 790
722 $self->{title} &&= new CFClient::UI::Label 791 $self->{title} &&= new CFClient::UI::Label
… …
870 $self->{children}[$y][$x] = $child; 939 $self->{children}[$y][$x] = $child;
871 940
872 $child->check_size; 941 $child->check_size;
873} 942}
874 943
944sub children {
945 grep $_, map @$_, grep $_, @{ $_[0]{children} }
946}
947
875# 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?
876sub clear { 949sub clear {
877 my ($self) = @_; 950 my ($self) = @_;
878 951
952 my @children = $self->children;
879 delete $self->{children}; 953 delete $self->{children};
954
955 for (@children) {
956 delete $_->{parent};
957 $_->hide;
958 }
959
880 $self->update; 960 $self->update;
881} 961}
882 962
883sub get_wh { 963sub get_wh {
884 my ($self) = @_; 964 my ($self) = @_;
… …
1107 1187
1108sub new { 1188sub new {
1109 my ($class, %arg) = @_; 1189 my ($class, %arg) = @_;
1110 1190
1111 my $self = $class->SUPER::new ( 1191 my $self = $class->SUPER::new (
1112 fg => [1, 1, 1], 1192 fg => [1, 1, 1],
1113 #font => default_font 1193 #font => default_font
1114 fontsize => 1, 1194 fontsize => 1,
1115 text => "", 1195 text => "",
1116 align => -1, 1196 align => -1,
1117 valign => -1, 1197 valign => -1,
1118 padding => 2, 1198 padding => 2,
1119 layout => new CFClient::Layout, 1199 layout => new CFClient::Layout,
1120 can_events => 0, 1200 can_events => 0,
1121 %arg 1201 %arg
1122 ); 1202 );
1123 1203
1124 if (exists $self->{template}) { 1204 if (exists $self->{template}) {
… …
1131 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1211 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1132 1212
1133 $self 1213 $self
1134} 1214}
1135 1215
1136sub escape_text { 1216sub escape {
1137 local $_ = $_[1]; 1217 local $_ = $_[1];
1138 1218
1139 s/&/&amp;/g; 1219 s/&/&amp;/g;
1140 s/>/&gt;/g; 1220 s/>/&gt;/g;
1141 s/</&lt;/g; 1221 s/</&lt;/g;
1142 1222
1143 $_[1] 1223 $_[1]
1144} 1224}
1145 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
1146sub set_text { 1239sub set_text {
1147 my ($self, $text) = @_; 1240 my ($self, $text) = @_;
1148 1241
1242 return if $self->{text} eq "T$text";
1243 $self->{text} = "T$text";
1244
1149 $self->{layout}->set_text ($text); 1245 $self->{layout}->set_text ($text);
1150 1246
1151 delete $self->{texture}; 1247 delete $self->{texture};
1248 $self->update;
1152 $self->check_size; 1249 $self->check_size;
1153 $self->update;
1154} 1250}
1155 1251
1156sub set_markup { 1252sub set_markup {
1157 my ($self, $markup) = @_; 1253 my ($self, $markup) = @_;
1158 1254
1255 return if $self->{text} eq "M$markup";
1256 $self->{text} = "M$markup";
1257
1159 $self->{layout}->set_markup ($markup); 1258 $self->{layout}->set_markup ($markup);
1160 1259
1161 delete $self->{texture}; 1260 delete $self->{texture};
1261 $self->update;
1162 $self->check_size; 1262 $self->check_size;
1163 $self->update;
1164} 1263}
1165 1264
1166sub size_request { 1265sub size_request {
1167 my ($self) = @_; 1266 my ($self) = @_;
1168 1267
… …
1248 1347
1249sub new { 1348sub new {
1250 my $class = shift; 1349 my $class = shift;
1251 1350
1252 $class->SUPER::new ( 1351 $class->SUPER::new (
1253 fg => [1, 1, 1], 1352 fg => [1, 1, 1],
1254 bg => [0, 0, 0, 0.2], 1353 bg => [0, 0, 0, 0.2],
1255 active_bg => [1, 1, 1, 0.5], 1354 active_bg => [1, 1, 1, 0.5],
1256 active_fg => [0, 0, 0], 1355 active_fg => [0, 0, 0],
1257 can_hover => 1, 1356 can_hover => 1,
1258 can_focus => 1, 1357 can_focus => 1,
1259 valign => 0, 1358 valign => 0,
1260 can_events => 1, 1359 can_events => 1,
1261 @_ 1360 @_
1262 ) 1361 )
1263} 1362}
1264 1363
… …
1418 my ($self, $ev) = @_; 1517 my ($self, $ev) = @_;
1419 1518
1420 my $sym = $ev->{sym}; 1519 my $sym = $ev->{sym};
1421 1520
1422 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} = '';
1423 $self->emit (activate => $self->get_text); 1526 $self->emit (activate => $txt);
1424 $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 }
1425 1550
1426 } else { 1551 } else {
1427 $self->SUPER::key_down ($ev); 1552 $self->SUPER::key_down ($ev);
1428 } 1553 }
1429 1554
… …
1443 1568
1444sub new { 1569sub new {
1445 my $class = shift; 1570 my $class = shift;
1446 1571
1447 $class->SUPER::new ( 1572 $class->SUPER::new (
1448 padding => 4, 1573 padding => 4,
1449 fg => [1, 1, 1], 1574 fg => [1, 1, 1],
1450 bg => [1, 1, 1, 0.2], 1575 bg => [1, 1, 1, 0.2],
1451 active_fg => [0, 0, 1], 1576 active_fg => [0, 0, 1],
1452 can_hover => 1, 1577 can_hover => 1,
1453 align => 0, 1578 align => 0,
1454 valign => 0, 1579 valign => 0,
1455 can_events => 1, 1580 can_events => 1,
1456 @_ 1581 @_
1457 ) 1582 )
1458} 1583}
1459 1584
… …
1666} 1791}
1667 1792
1668sub set_max { 1793sub set_max {
1669 my ($self, $max) = @_; 1794 my ($self, $max) = @_;
1670 1795
1796 return if $self->{max_val} == $max;
1797
1671 $self->{max_val} = $max; 1798 $self->{max_val} = $max;
1799 $self->update;
1672} 1800}
1673 1801
1674sub set_value { 1802sub set_value {
1675 my ($self, $val, $max) = @_; 1803 my ($self, $val, $max) = @_;
1676 1804
1677 $self->set_max ($max) 1805 $self->set_max ($max)
1678 if defined $max; 1806 if defined $max;
1679 1807
1680 $max = $self->{max_val}; 1808 return if $self->{val} == $val;
1809
1681 $self->{val} = $val; 1810 $self->{val} = $val;
1682
1683 $self->update; 1811 $self->update;
1684} 1812}
1685 1813
1686sub _draw { 1814sub _draw {
1687 my ($self) = @_; 1815 my ($self) = @_;
… …
1750 1878
1751sub new { 1879sub new {
1752 my ($class, %arg) = @_; 1880 my ($class, %arg) = @_;
1753 1881
1754 my $self = $class->SUPER::new ( 1882 my $self = $class->SUPER::new (
1755 tooltip => $arg{type}, 1883 tooltip => $arg{type},
1884 can_hover => 1,
1885 can_events => 1,
1756 %arg, 1886 %arg,
1757 ); 1887 );
1758 1888
1759 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1889 $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); 1890 $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); 1891 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1762 1892
1763 $self 1893 $self
1764} 1894}
1765 1895
1766sub set_fontsize { 1896sub set_fontsize {
… …
1768 1898
1769 $self->{value}->set_fontsize ($fsize); 1899 $self->{value}->set_fontsize ($fsize);
1770 $self->{max} ->set_fontsize ($fsize); 1900 $self->{max} ->set_fontsize ($fsize);
1771} 1901}
1772 1902
1903sub set_max {
1904 my ($self, $max) = @_;
1905
1906 $self->{gauge}->set_max ($max);
1907 $self->{max}->set_text ($max);
1908}
1909
1773sub set_value { 1910sub set_value {
1774 my ($self, $val, $max) = @_; 1911 my ($self, $val, $max) = @_;
1775 1912
1776 $self->set_max ($max) 1913 $self->set_max ($max)
1777 if defined $max; 1914 if defined $max;
1778 1915
1779 $self->{gauge}->set_value ($val, $max); 1916 $self->{gauge}->set_value ($val, $max);
1780 $self->{value}->set_text ($val); 1917 $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} 1918}
1789 1919
1790############################################################################# 1920#############################################################################
1791 1921
1792package CFClient::UI::Slider; 1922package CFClient::UI::Slider;
… …
1932 2062
1933sub new { 2063sub new {
1934 my $class = shift; 2064 my $class = shift;
1935 2065
1936 my $self = $class->SUPER::new ( 2066 my $self = $class->SUPER::new (
1937 fontsize => 1, 2067 fontsize => 1,
2068 can_events => 0,
1938 #font => default_font 2069 #font => default_font
1939 @_, 2070 @_,
1940 2071
1941 layout => (new CFClient::Layout), 2072 layout => (new CFClient::Layout),
1942 par => [], 2073 par => [],
1943 height => 0, 2074 height => 0,
1944 children => [ 2075 children => [
1945 (new CFClient::UI::Empty expand => 1), 2076 (new CFClient::UI::Empty expand => 1),
1946 (new CFClient::UI::Slider vertical => 1), 2077 (new CFClient::UI::Slider vertical => 1),
1947 ], 2078 ],
1948 ); 2079 );
1949 2080
… …
2074 my ($self) = @_; 2205 my ($self) = @_;
2075 2206
2076 if ($self->{texture}) { 2207 if ($self->{texture}) {
2077 glEnable GL_TEXTURE_2D; 2208 glEnable GL_TEXTURE_2D;
2078 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;
2079 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2211 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
2080 glDisable GL_TEXTURE_2D; 2212 glDisable GL_TEXTURE_2D;
2081 } 2213 }
2082 2214
2083 $self->{children}[1]->draw; 2215 $self->{children}[1]->draw;
… …
2134 2266
2135sub new { 2267sub new {
2136 my $class = shift; 2268 my $class = shift;
2137 2269
2138 my $self = $class->SUPER::new ( 2270 my $self = $class->SUPER::new (
2139 state => 0, 2271 state => 0,
2140 connect_activate => \&toggle_flopper, 2272 connect_activate => \&toggle_flopper,
2141 can_events => 1,
2142 @_ 2273 @_
2143 ); 2274 );
2144 2275
2145 if ($self->{state}) { 2276 if ($self->{state}) {
2146 $self->{state} = 0; 2277 $self->{state} = 0;
… …
2181 @_, 2312 @_,
2182 can_events => 0, 2313 can_events => 0,
2183 ) 2314 )
2184} 2315}
2185 2316
2186sub set_text { 2317sub set_markup {
2187 my ($self, $text) = @_; 2318 my ($self, $text) = @_;
2188 2319
2189 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2320 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2190 $self->{label}->set_text ($text); 2321 $self->{label}->set_markup ($text);
2191 $self->add ($self->{label}); 2322 $self->add ($self->{label});
2192} 2323}
2193 2324
2194sub size_request { 2325sub size_request {
2195 my ($self) = @_; 2326 my ($self) = @_;
2196 2327
2197 $self->child->set_max_size ($::WIDTH * 0.2); 2328 $self->child->set_max_size ($::WIDTH * 0.3);
2198 2329
2199 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2330 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2200 2331
2201 ($w + 4, $h + 4) 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);
2202} 2339}
2203 2340
2204sub _draw { 2341sub _draw {
2205 my ($self) = @_; 2342 my ($self) = @_;
2206 2343
… …
2231 $self->SUPER::_draw; 2368 $self->SUPER::_draw;
2232} 2369}
2233 2370
2234############################################################################# 2371#############################################################################
2235 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
2236package CFClient::UI::Root; 2411package CFClient::UI::Root;
2237 2412
2238our @ISA = CFClient::UI::Container::; 2413our @ISA = CFClient::UI::Container::;
2239 2414
2240use CFClient::OpenGL; 2415use CFClient::OpenGL;

Diff Legend

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