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.157 by root, Sun Apr 23 21:47:32 2006 UTC vs.
Revision 1.167 by elmex, Mon Apr 24 08:44:23 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 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31 } 31 }
32 32
33 return; 33 return;
… …
39 delete $TOOLTIP->{owner}; 39 delete $TOOLTIP->{owner};
40} 40}
41 41
42# class methods for events 42# class methods for events
43sub feed_sdl_key_down_event { 43sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
45 if $FOCUS;
45} 46}
46 47
47sub feed_sdl_key_up_event { 48sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
50 if $FOCUS;
49} 51}
50 52
51sub feed_sdl_button_down_event { 53sub feed_sdl_button_down_event {
52 my ($ev) = @_; 54 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 55 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 63 check_tooltip;
62 } 64 }
63 65
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 66 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 67
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 68 if ($GRAB) {
69 ($x, $y) = $GRAB->coord2local ($x, $y);
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
67} 72}
68 73
69sub feed_sdl_button_up_event { 74sub feed_sdl_button_up_event {
70 my ($ev) = @_; 75 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 76 my ($x, $y) = ($ev->{x}, $ev->{y});
72 77
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 78 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 79
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 81
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 82 if ($GRAB) {
83 ($x, $y) = $GRAB->coord2local ($x, $y);
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
78 86
79 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 88 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 89 $grab->update if $grab;
82 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 106 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 107
100 check_tooltip; 108 check_tooltip;
101 } 109 }
102 110
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
114 }
104} 115}
105 116
106# convert position array to integers 117# convert position array to integers
107sub harmonize { 118sub harmonize {
108 my ($vals) = @_; 119 my ($vals) = @_;
… …
126 137
127sub new { 138sub new {
128 my $class = shift; 139 my $class = shift;
129 140
130 my $self = bless { 141 my $self = bless {
131 x => 0, 142 x => 0,
132 y => 0, 143 y => 0,
133 z => 0, 144 z => 0,
134 can_events => 1, 145 can_events => 1,
135 @_ 146 @_
136 }, $class; 147 }, $class;
137 148
138 for (keys %$self) { 149 for (keys %$self) {
… …
142 } 153 }
143 154
144 $self 155 $self
145} 156}
146 157
158sub destroy {
159 my ($self) = @_;
160
161 $self->hide;
162 %$self = ();
163}
164
147sub show { 165sub show {
148 my ($self) = @_; 166 my ($self) = @_;
149 167
150 return if $self->{parent}; 168 return if $self->{parent};
151 169
… …
153} 171}
154 172
155sub hide { 173sub hide {
156 my ($self) = @_; 174 my ($self) = @_;
157 175
158 return unless $self->{parent}; 176 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self;
159 178
160 $self->{parent}->remove ($self); 179 $self->{parent}->remove ($self)
180 if $self->{parent};
161} 181}
162 182
163sub move { 183sub move {
164 my ($self, $x, $y, $z) = @_; 184 my ($self, $x, $y, $z) = @_;
165 185
… …
168 $self->{z} = $z if defined $z; 188 $self->{z} = $z if defined $z;
169 189
170 $self->update; 190 $self->update;
171} 191}
172 192
173sub needs_redraw { 193sub set_size {
174 0 194 my ($self, $w, $h) = @_;
195
196 $self->{user_w} = $w;
197 $self->{user_h} = $h;
198
199 $self->check_size;
175} 200}
176 201
177sub size_request { 202sub size_request {
178 require Carp; 203 require Carp;
179 Carp::confess "size_request is abstract"; 204 Carp::confess "size_request is abstract";
… …
308 glVertex $x + $self->{w}, $y + $self->{h}; 333 glVertex $x + $self->{w}, $y + $self->{h};
309 glVertex $x , $y + $self->{h}; 334 glVertex $x , $y + $self->{h};
310 glEnd; 335 glEnd;
311 glDisable GL_BLEND; 336 glDisable GL_BLEND;
312 } 337 }
338
339 if ($ENV{PCLIENT_DEBUG}) {
340 glPushMatrix;
341 glColor 1, 1, 0, 1;
342 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
343 glBegin GL_LINE_LOOP;
344 glVertex 0 , 0;
345 glVertex $self->{w}, 0;
346 glVertex $self->{w}, $self->{h};
347 glVertex 0 , $self->{h};
348 glEnd;
349 glPopMatrix;
350 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351 }
313} 352}
314 353
315sub _draw { 354sub _draw {
316 my ($self) = @_; 355 my ($self) = @_;
317 356
… …
337} 376}
338 377
339sub check_size { 378sub check_size {
340 my ($self) = @_; 379 my ($self) = @_;
341 380
342 return unless $self->{parent}; 381 $self->{parent}
382 or return 1;
343 383
344 my ($w, $h) = $self->size_request; 384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
345 387
346 if ($w != $self->{req_w} || $h != $self->{req_h}) { 388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
347 $self->{req_w} = $w; 389 $self->{req_w} = $w;
348 $self->{req_h} = $h; 390 $self->{req_h} = $h;
349 391
350 $self->{parent}->check_size; 392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
351 } 401 }
352} 402}
353 403
354sub update { 404sub update {
355 my ($self) = @_; 405 my ($self) = @_;
… …
365} 415}
366 416
367sub emit { 417sub emit {
368 my ($self, $signal, @args) = @_; 418 my ($self, $signal, @args) = @_;
369 419
370 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
371 $cb->($self, @args);
372 }
373} 421}
374 422
375sub DESTROY { 423sub DESTROY {
376 my ($self) = @_; 424 my ($self) = @_;
377 425
… …
444sub new { 492sub new {
445 my ($class, %arg) = @_; 493 my ($class, %arg) = @_;
446 494
447 my $children = delete $arg{children} || []; 495 my $children = delete $arg{children} || [];
448 496
449 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 497 my $self = $class->SUPER::new (
498 children => [],
499 can_events => 0,
500 %arg,
501 );
450 $self->add ($_) for @$children; 502 $self->add ($_) for @$children;
451 503
452 $self 504 $self
453} 505}
454 506
… …
469 521
470sub remove { 522sub remove {
471 my ($self, $child) = @_; 523 my ($self, $child) = @_;
472 524
473 delete $child->{parent}; 525 delete $child->{parent};
526 $child->hide;
474 527
475 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
476 529
477 $self->check_size; 530 $self->check_size;
478 $self->update; 531 $self->update;
532}
533
534sub clear {
535 my ($self) = @_;
536
537 my $children = delete $self->{children};
538 $self->{children} = [];
539
540 for (@$children) {
541 delete $_->{parent};
542 $_->hide;
543 }
479} 544}
480 545
481sub find_widget { 546sub find_widget {
482 my ($self, $x, $y) = @_; 547 my ($self, $x, $y) = @_;
483 548
… …
643 border => 0.8, 708 border => 0.8,
644 @_ 709 @_
645 ); 710 );
646 711
647 $self 712 $self
648}
649
650sub set_size {
651 my ($self, $w, $h) = @_;
652 $self->{req_w} = $w;
653 $self->{req_h} = $h;
654 $self->check_size;
655}
656
657sub size_request {
658 my ($self) = @_;
659 ($self->{req_w}, $self->{req_h})
660}
661
662sub size_allocate {
663 my ($self, $w, $h) = @_;
664 $self->{w} = $w;
665 $self->{h} = $h;
666 $self->child->configure (0, 0, $w, $h);
667} 713}
668 714
669sub _draw { 715sub _draw {
670 my ($self) = @_; 716 my ($self) = @_;
671 717
… …
706 my $class = shift; 752 my $class = shift;
707 753
708 # TODO: user_x, user_y, overwrite moveto? 754 # TODO: user_x, user_y, overwrite moveto?
709 755
710 my $self = $class->SUPER::new ( 756 my $self = $class->SUPER::new (
711 bg => [1, 1, 1, 1], 757 bg => [1, 1, 1, 1],
712 border_bg => [1, 1, 1, 1], 758 border_bg => [1, 1, 1, 1],
713 border => 0.8, 759 border => 0.8,
714 can_events => 1, 760 can_events => 1,
715 @_ 761 @_
716 ); 762 );
717 763
718 $self->{title} &&= new CFClient::UI::Label 764 $self->{title} &&= new CFClient::UI::Label
… …
729} 775}
730 776
731sub size_request { 777sub size_request {
732 my ($self) = @_; 778 my ($self) = @_;
733 779
734 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
735
736 my ($w, $h) = $self->SUPER::size_request; 780 my ($w, $h) = $self->SUPER::size_request;
737 781
738 ( 782 (
739 $w + $self->border * 2, 783 $w + $self->border * 2,
740 $h + $self->border * 2, 784 $h + $self->border * 2,
… …
872 916
873# TODO: move to container class maybe? send childs a signal on removal? 917# TODO: move to container class maybe? send childs a signal on removal?
874sub clear { 918sub clear {
875 my ($self) = @_; 919 my ($self) = @_;
876 920
877 delete $self->{children}; 921 my $children = delete $self->{children};
922
923 for (grep $_, map @$_, grep $_, @$children) {
924 delete $_->{parent};
925 $_->hide;
926 }
927
878 $self->update; 928 $self->update;
879} 929}
880 930
881sub get_wh { 931sub get_wh {
882 my ($self) = @_; 932 my ($self) = @_;
… …
1105 1155
1106sub new { 1156sub new {
1107 my ($class, %arg) = @_; 1157 my ($class, %arg) = @_;
1108 1158
1109 my $self = $class->SUPER::new ( 1159 my $self = $class->SUPER::new (
1110 fg => [1, 1, 1], 1160 fg => [1, 1, 1],
1111 #font => default_font 1161 #font => default_font
1112 fontsize => 1, 1162 fontsize => 1,
1113 text => "", 1163 text => "",
1114 align => -1, 1164 align => -1,
1115 valign => -1, 1165 valign => -1,
1116 padding => 2, 1166 padding => 2,
1117 layout => new CFClient::Layout, 1167 layout => new CFClient::Layout,
1118 can_events => 0, 1168 can_events => 0,
1119 %arg 1169 %arg
1120 ); 1170 );
1121 1171
1122 if (exists $self->{template}) { 1172 if (exists $self->{template}) {
… …
1129 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1179 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1130 1180
1131 $self 1181 $self
1132} 1182}
1133 1183
1134sub escape_text { 1184sub escape {
1135 local $_ = $_[1]; 1185 local $_ = $_[1];
1136 1186
1137 s/&/&amp;/g; 1187 s/&/&amp;/g;
1138 s/>/&gt;/g; 1188 s/>/&gt;/g;
1139 s/</&lt;/g; 1189 s/</&lt;/g;
… …
1246 1296
1247sub new { 1297sub new {
1248 my $class = shift; 1298 my $class = shift;
1249 1299
1250 $class->SUPER::new ( 1300 $class->SUPER::new (
1251 fg => [1, 1, 1], 1301 fg => [1, 1, 1],
1252 bg => [0, 0, 0, 0.2], 1302 bg => [0, 0, 0, 0.2],
1253 active_bg => [1, 1, 1, 0.5], 1303 active_bg => [1, 1, 1, 0.5],
1254 active_fg => [0, 0, 0], 1304 active_fg => [0, 0, 0],
1255 can_hover => 1, 1305 can_hover => 1,
1256 can_focus => 1, 1306 can_focus => 1,
1257 valign => 0, 1307 valign => 0,
1258 can_events => 1, 1308 can_events => 1,
1259 @_ 1309 @_
1260 ) 1310 )
1261} 1311}
1262 1312
… …
1416 my ($self, $ev) = @_; 1466 my ($self, $ev) = @_;
1417 1467
1418 my $sym = $ev->{sym}; 1468 my $sym = $ev->{sym};
1419 1469
1420 if ($sym == 13) { 1470 if ($sym == 13) {
1471 unshift @{$self->{history}},
1472 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1;
1421 $self->emit (activate => $self->get_text); 1474 $self->emit (activate => $txt);
1422 $self->update; 1475 $self->update;
1476
1477 } elsif ($sym == CFClient::SDLK_UP) {
1478 if ($self->{history_pointer} < 0) {
1479 $self->{history_saveback} = $self->get_text;
1480 }
1481 $self->{history_pointer}++;
1482 if ($self->{history_pointer} >= @{$self->{history}}) {
1483 $self->{history_pointer} = @{$self->{history}} - 1;
1484 }
1485 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1486
1487 } elsif ($sym == CFClient::SDLK_DOWN) {
1488 $self->{history_pointer}--;
1489 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490
1491 if ($self->{history_pointer} >= 0) {
1492 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1493 } else {
1494 $self->set_text ($self->{history_saveback});
1495 }
1423 1496
1424 } else { 1497 } else {
1425 $self->SUPER::key_down ($ev); 1498 $self->SUPER::key_down ($ev);
1426 } 1499 }
1427 1500
… …
1441 1514
1442sub new { 1515sub new {
1443 my $class = shift; 1516 my $class = shift;
1444 1517
1445 $class->SUPER::new ( 1518 $class->SUPER::new (
1446 padding => 4, 1519 padding => 4,
1447 fg => [1, 1, 1], 1520 fg => [1, 1, 1],
1448 bg => [1, 1, 1, 0.2], 1521 bg => [1, 1, 1, 0.2],
1449 active_fg => [0, 0, 1], 1522 active_fg => [0, 0, 1],
1450 can_hover => 1, 1523 can_hover => 1,
1451 align => 0, 1524 align => 0,
1452 valign => 0, 1525 valign => 0,
1453 can_events => 1, 1526 can_events => 1,
1454 @_ 1527 @_
1455 ) 1528 )
1456} 1529}
1457 1530
… …
1616 1689
1617package CFClient::UI::VGauge; 1690package CFClient::UI::VGauge;
1618 1691
1619our @ISA = CFClient::UI::Base::; 1692our @ISA = CFClient::UI::Base::;
1620 1693
1694use List::Util qw(min max);
1695
1621use CFClient::OpenGL; 1696use CFClient::OpenGL;
1622 1697
1623my %tex = ( 1698my %tex = (
1624 food => [ 1699 food => [
1625 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1700 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1626 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1701 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1627 ], 1702 ],
1628 grace => [ 1703 grace => [
1629 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1704 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1630 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1705 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1631 ], 1706 ],
1632 hp => [ 1707 hp => [
1633 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1708 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1634 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1709 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1635 ], 1710 ],
1636 mana => [ 1711 mana => [
1637 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1712 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1638 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1713 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1639 ], 1714 ],
1640); 1715);
1641 1716
1642# eg. VGauge->new (gauge => 'food'), default gauge: food 1717# eg. VGauge->new (gauge => 'food'), default gauge: food
1643sub new { 1718sub new {
… …
1681 1756
1682sub _draw { 1757sub _draw {
1683 my ($self) = @_; 1758 my ($self) = @_;
1684 1759
1685 my $tex = $tex{$self->{type}}; 1760 my $tex = $tex{$self->{type}};
1761 my ($t1, $t2, $t3) = @$tex;
1686 1762
1687 my ($w, $h) = ($self->{w}, $self->{h}); 1763 my ($w, $h) = ($self->{w}, $self->{h});
1688 1764
1689 if ($self->{vertical}) { 1765 if ($self->{vertical}) {
1690 glRotate 90, 0, 0, 1; 1766 glRotate 90, 0, 0, 1;
… …
1692 1768
1693 ($w, $h) = ($h, $w); 1769 ($w, $h) = ($h, $w);
1694 } 1770 }
1695 1771
1696 my $ycut = $self->{val} / ($self->{max_val} || 1); 1772 my $ycut = $self->{val} / ($self->{max_val} || 1);
1697 $ycut = 1 if $self->{val} > $self->{max_val};
1698 1773
1699 my $t1 = $tex->[0]; 1774 my $ycut1 = max 0, min 1, $ycut;
1700 my $t2 = $tex->[1]; 1775 my $ycut2 = max 0, min 1, $ycut - 1;
1776
1777 my $h1 = $self->{h} * (1 - $ycut1);
1778 my $h2 = $self->{h} * (1 - $ycut2);
1701 1779
1702 glEnable GL_BLEND; 1780 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1781 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1704 glEnable GL_TEXTURE_2D; 1782 glEnable GL_TEXTURE_2D;
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1783 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1706 1784
1707 my $h1 = $self->{h} - $ycut * $self->{h};
1708 my $h2 = $ycut * $self->{h};
1709
1710 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1785 glBindTexture GL_TEXTURE_2D, $t1->{name};
1711 glBegin GL_QUADS; 1786 glBegin GL_QUADS;
1712 glTexCoord 0 , 0; glVertex 0 , 0; 1787 glTexCoord 0 , 0; glVertex 0 , 0;
1713 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1788 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1714 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1789 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1715 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1790 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1716 glEnd; 1791 glEnd;
1717 1792
1793 my $ycut1 = List::Util::min 1, $ycut;
1718 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1794 glBindTexture GL_TEXTURE_2D, $t2->{name};
1719 glBegin GL_QUADS; 1795 glBegin GL_QUADS;
1720 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1796 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1721 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1797 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1722 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1798 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1723 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1799 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1724 glEnd; 1800 glEnd;
1801
1802 if ($t3) {
1803 glBindTexture GL_TEXTURE_2D, $t3->{name};
1804 glBegin GL_QUADS;
1805 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1806 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1807 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1808 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1809 glEnd;
1810 }
1725 1811
1726 glDisable GL_BLEND; 1812 glDisable GL_BLEND;
1727 glDisable GL_TEXTURE_2D; 1813 glDisable GL_TEXTURE_2D;
1728} 1814}
1729 1815
… …
1735 1821
1736sub new { 1822sub new {
1737 my ($class, %arg) = @_; 1823 my ($class, %arg) = @_;
1738 1824
1739 my $self = $class->SUPER::new ( 1825 my $self = $class->SUPER::new (
1740 tooltip => $arg{type}, 1826 tooltip => $arg{type},
1827 can_hover => 1,
1741 %arg, 1828 %arg,
1742 ); 1829 );
1743 1830
1744 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1831 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1745 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 1832 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1746 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 1833 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1747 1834
1748 $self 1835 $self
1749} 1836}
1750 1837
1751sub set_fontsize { 1838sub set_fontsize {
… …
1917 2004
1918sub new { 2005sub new {
1919 my $class = shift; 2006 my $class = shift;
1920 2007
1921 my $self = $class->SUPER::new ( 2008 my $self = $class->SUPER::new (
1922 fontsize => 1, 2009 fontsize => 1,
2010 can_events => 0,
1923 #font => default_font 2011 #font => default_font
1924 @_, 2012 @_,
1925 2013
1926 layout => (new CFClient::Layout), 2014 layout => (new CFClient::Layout),
1927 par => [], 2015 par => [],
1928 height => 0, 2016 height => 0,
1929 children => [ 2017 children => [
1930 (new CFClient::UI::Empty expand => 1), 2018 (new CFClient::UI::Empty expand => 1),
1931 (new CFClient::UI::Slider vertical => 1), 2019 (new CFClient::UI::Slider vertical => 1),
1932 ], 2020 ],
1933 ); 2021 );
1934 2022
… …
2119 2207
2120sub new { 2208sub new {
2121 my $class = shift; 2209 my $class = shift;
2122 2210
2123 my $self = $class->SUPER::new ( 2211 my $self = $class->SUPER::new (
2124 state => 0, 2212 state => 0,
2125 connect_activate => \&toggle_flopper, 2213 connect_activate => \&toggle_flopper,
2126 can_events => 1,
2127 @_ 2214 @_
2128 ); 2215 );
2129 2216
2130 if ($self->{state}) { 2217 if ($self->{state}) {
2131 $self->{state} = 0; 2218 $self->{state} = 0;
… …
2166 @_, 2253 @_,
2167 can_events => 0, 2254 can_events => 0,
2168 ) 2255 )
2169} 2256}
2170 2257
2171sub set_text { 2258sub set_markup {
2172 my ($self, $text) = @_; 2259 my ($self, $text) = @_;
2173 2260
2174 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2261 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2175 $self->{label}->set_text ($text); 2262 $self->{label}->set_markup ($text);
2176 $self->add ($self->{label}); 2263 $self->add ($self->{label});
2177} 2264}
2178 2265
2179sub size_request { 2266sub size_request {
2180 my ($self) = @_; 2267 my ($self) = @_;
2181 2268
2182 $self->child->set_max_size ($::WIDTH * 0.2); 2269 $self->child->set_max_size ($::WIDTH * 0.3);
2183 2270
2184 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2271 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2185 2272
2186 ($w + 4, $h + 4) 2273 ($w + 4, $h + 4)
2274}
2275
2276sub size_allocate {
2277 my ($self, $w, $h) = @_;
2278
2279 $self->SUPER::size_allocate ($w - 4, $h - 4);
2187} 2280}
2188 2281
2189sub _draw { 2282sub _draw {
2190 my ($self) = @_; 2283 my ($self) = @_;
2191 2284
… …
2216 $self->SUPER::_draw; 2309 $self->SUPER::_draw;
2217} 2310}
2218 2311
2219############################################################################# 2312#############################################################################
2220 2313
2314package CFClient::UI::Face;
2315
2316our @ISA = CFClient::UI::Base::;
2317
2318use CFClient::OpenGL;
2319
2320sub new {
2321 my $class = shift;
2322
2323 $class->SUPER::new (
2324 aspect => 1,
2325 @_,
2326 )
2327}
2328
2329sub size_request {
2330 (32, 8)
2331}
2332
2333sub draw {
2334 my ($self) = @_;
2335
2336 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2337
2338 if ($tex) {
2339 glEnable GL_BLEND;
2340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341 glEnable GL_TEXTURE_2D;
2342 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2343 glColor 1, 1, 1, 1;
2344 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2345 glDisable GL_TEXTURE_2D;
2346 glDisable GL_BLEND;
2347 }
2348}
2349
2350#############################################################################
2351
2221package CFClient::UI::Root; 2352package CFClient::UI::Root;
2222 2353
2223our @ISA = CFClient::UI::Container::; 2354our @ISA = CFClient::UI::Container::;
2224 2355
2225use CFClient::OpenGL; 2356use CFClient::OpenGL;

Diff Legend

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