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.161 by root, Mon Apr 24 03:43:51 2006 UTC vs.
Revision 1.175 by root, Tue Apr 25 11:48:31 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.8,
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
… …
870 $self->{children}[$y][$x] = $child; 946 $self->{children}[$y][$x] = $child;
871 947
872 $child->check_size; 948 $child->check_size;
873} 949}
874 950
951sub children {
952 grep $_, map @$_, grep $_, @{ $_[0]{children} }
953}
954
875# TODO: move to container class maybe? send childs a signal on removal? 955# TODO: move to container class maybe? send childs a signal on removal?
876sub clear { 956sub clear {
877 my ($self) = @_; 957 my ($self) = @_;
878 958
959 my @children = $self->children;
879 delete $self->{children}; 960 delete $self->{children};
961
962 for (@children) {
963 delete $_->{parent};
964 $_->hide;
965 }
966
880 $self->update; 967 $self->update;
881} 968}
882 969
883sub get_wh { 970sub get_wh {
884 my ($self) = @_; 971 my ($self) = @_;
… …
1107 1194
1108sub new { 1195sub new {
1109 my ($class, %arg) = @_; 1196 my ($class, %arg) = @_;
1110 1197
1111 my $self = $class->SUPER::new ( 1198 my $self = $class->SUPER::new (
1112 fg => [1, 1, 1], 1199 fg => [1, 1, 1],
1113 #font => default_font 1200 #font => default_font
1114 fontsize => 1, 1201 fontsize => 1,
1115 text => "", 1202 text => "",
1116 align => -1, 1203 align => -1,
1117 valign => -1, 1204 valign => -1,
1118 padding => 2, 1205 padding => 2,
1119 layout => new CFClient::Layout, 1206 layout => new CFClient::Layout,
1120 can_events => 0, 1207 can_events => 0,
1121 %arg 1208 %arg
1122 ); 1209 );
1123 1210
1124 if (exists $self->{template}) { 1211 if (exists $self->{template}) {
… …
1131 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1218 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1132 1219
1133 $self 1220 $self
1134} 1221}
1135 1222
1136sub escape_text { 1223sub escape {
1137 local $_ = $_[1]; 1224 local $_ = $_[1];
1138 1225
1139 s/&/&amp;/g; 1226 s/&/&amp;/g;
1140 s/>/&gt;/g; 1227 s/>/&gt;/g;
1141 s/</&lt;/g; 1228 s/</&lt;/g;
1142 1229
1143 $_[1] 1230 $_[1]
1144} 1231}
1145 1232
1233sub update {
1234 my ($self) = @_;
1235
1236 delete $self->{texture};
1237 $self->SUPER::update;
1238}
1239
1240sub reconfigure {
1241 my ($self) = @_;
1242
1243 delete $self->{texture};
1244}
1245
1146sub set_text { 1246sub set_text {
1147 my ($self, $text) = @_; 1247 my ($self, $text) = @_;
1148 1248
1249 return if $self->{text} eq "T$text";
1250 $self->{text} = "T$text";
1251
1149 $self->{layout}->set_text ($text); 1252 $self->{layout}->set_text ($text);
1150 1253
1151 delete $self->{texture}; 1254 delete $self->{texture};
1255 $self->update;
1152 $self->check_size; 1256 $self->check_size;
1153 $self->update;
1154} 1257}
1155 1258
1156sub set_markup { 1259sub set_markup {
1157 my ($self, $markup) = @_; 1260 my ($self, $markup) = @_;
1158 1261
1262 return if $self->{text} eq "M$markup";
1263 $self->{text} = "M$markup";
1264
1159 $self->{layout}->set_markup ($markup); 1265 $self->{layout}->set_markup ($markup);
1160 1266
1161 delete $self->{texture}; 1267 delete $self->{texture};
1268 $self->update;
1162 $self->check_size; 1269 $self->check_size;
1163 $self->update;
1164} 1270}
1165 1271
1166sub size_request { 1272sub size_request {
1167 my ($self) = @_; 1273 my ($self) = @_;
1168 1274
… …
1248 1354
1249sub new { 1355sub new {
1250 my $class = shift; 1356 my $class = shift;
1251 1357
1252 $class->SUPER::new ( 1358 $class->SUPER::new (
1253 fg => [1, 1, 1], 1359 fg => [1, 1, 1],
1254 bg => [0, 0, 0, 0.2], 1360 bg => [0, 0, 0, 0.2],
1255 active_bg => [1, 1, 1, 0.5], 1361 active_bg => [1, 1, 1, 0.5],
1256 active_fg => [0, 0, 0], 1362 active_fg => [0, 0, 0],
1257 can_hover => 1, 1363 can_hover => 1,
1258 can_focus => 1, 1364 can_focus => 1,
1259 valign => 0, 1365 valign => 0,
1260 can_events => 1, 1366 can_events => 1,
1261 @_ 1367 @_
1262 ) 1368 )
1263} 1369}
1264 1370
… …
1418 my ($self, $ev) = @_; 1524 my ($self, $ev) = @_;
1419 1525
1420 my $sym = $ev->{sym}; 1526 my $sym = $ev->{sym};
1421 1527
1422 if ($sym == 13) { 1528 if ($sym == 13) {
1529 unshift @{$self->{history}},
1530 my $txt = $self->get_text;
1531 $self->{history_pointer} = -1;
1532 $self->{history_saveback} = '';
1423 $self->emit (activate => $self->get_text); 1533 $self->emit (activate => $txt);
1424 $self->update; 1534 $self->update;
1535
1536 } elsif ($sym == CFClient::SDLK_UP) {
1537 if ($self->{history_pointer} < 0) {
1538 $self->{history_saveback} = $self->get_text;
1539 }
1540 if (@{$self->{history} || []} > 0) {
1541 $self->{history_pointer}++;
1542 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1543 $self->{history_pointer} = @{$self->{history} || []} - 1;
1544 }
1545 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1546 }
1547
1548 } elsif ($sym == CFClient::SDLK_DOWN) {
1549 $self->{history_pointer}--;
1550 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1551
1552 if ($self->{history_pointer} >= 0) {
1553 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1554 } else {
1555 $self->set_text ($self->{history_saveback});
1556 }
1425 1557
1426 } else { 1558 } else {
1427 $self->SUPER::key_down ($ev); 1559 $self->SUPER::key_down ($ev);
1428 } 1560 }
1429 1561
… …
1443 1575
1444sub new { 1576sub new {
1445 my $class = shift; 1577 my $class = shift;
1446 1578
1447 $class->SUPER::new ( 1579 $class->SUPER::new (
1448 padding => 4, 1580 padding => 4,
1449 fg => [1, 1, 1], 1581 fg => [1, 1, 1],
1450 bg => [1, 1, 1, 0.2], 1582 bg => [1, 1, 1, 0.2],
1451 active_fg => [0, 0, 1], 1583 active_fg => [0, 0, 1],
1452 can_hover => 1, 1584 can_hover => 1,
1453 align => 0, 1585 align => 0,
1454 valign => 0, 1586 valign => 0,
1455 can_events => 1, 1587 can_events => 1,
1456 @_ 1588 @_
1457 ) 1589 )
1458} 1590}
1459 1591
… …
1666} 1798}
1667 1799
1668sub set_max { 1800sub set_max {
1669 my ($self, $max) = @_; 1801 my ($self, $max) = @_;
1670 1802
1803 return if $self->{max_val} == $max;
1804
1671 $self->{max_val} = $max; 1805 $self->{max_val} = $max;
1806 $self->update;
1672} 1807}
1673 1808
1674sub set_value { 1809sub set_value {
1675 my ($self, $val, $max) = @_; 1810 my ($self, $val, $max) = @_;
1676 1811
1677 $self->set_max ($max) 1812 $self->set_max ($max)
1678 if defined $max; 1813 if defined $max;
1679 1814
1680 $max = $self->{max_val}; 1815 return if $self->{val} == $val;
1816
1681 $self->{val} = $val; 1817 $self->{val} = $val;
1682
1683 $self->update; 1818 $self->update;
1684} 1819}
1685 1820
1686sub _draw { 1821sub _draw {
1687 my ($self) = @_; 1822 my ($self) = @_;
… …
1750 1885
1751sub new { 1886sub new {
1752 my ($class, %arg) = @_; 1887 my ($class, %arg) = @_;
1753 1888
1754 my $self = $class->SUPER::new ( 1889 my $self = $class->SUPER::new (
1755 tooltip => $arg{type}, 1890 tooltip => $arg{type},
1891 can_hover => 1,
1756 can_events => 1, 1892 can_events => 1,
1757 can_hover => 1,
1758 %arg, 1893 %arg,
1759 ); 1894 );
1760 1895
1761 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1896 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1762 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1897 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1770 1905
1771 $self->{value}->set_fontsize ($fsize); 1906 $self->{value}->set_fontsize ($fsize);
1772 $self->{max} ->set_fontsize ($fsize); 1907 $self->{max} ->set_fontsize ($fsize);
1773} 1908}
1774 1909
1910sub set_max {
1911 my ($self, $max) = @_;
1912
1913 $self->{gauge}->set_max ($max);
1914 $self->{max}->set_text ($max);
1915}
1916
1775sub set_value { 1917sub set_value {
1776 my ($self, $val, $max) = @_; 1918 my ($self, $val, $max) = @_;
1777 1919
1778 $self->set_max ($max) 1920 $self->set_max ($max)
1779 if defined $max; 1921 if defined $max;
1780 1922
1781 $self->{gauge}->set_value ($val, $max); 1923 $self->{gauge}->set_value ($val, $max);
1782 $self->{value}->set_text ($val); 1924 $self->{value}->set_text ($val);
1783}
1784
1785sub set_max {
1786 my ($self, $max) = @_;
1787
1788 $self->{gauge}->set_max ($max);
1789 $self->{max}->set_text ($max);
1790} 1925}
1791 1926
1792############################################################################# 1927#############################################################################
1793 1928
1794package CFClient::UI::Slider; 1929package CFClient::UI::Slider;
… …
1934 2069
1935sub new { 2070sub new {
1936 my $class = shift; 2071 my $class = shift;
1937 2072
1938 my $self = $class->SUPER::new ( 2073 my $self = $class->SUPER::new (
1939 fontsize => 1, 2074 fontsize => 1,
2075 can_events => 0,
1940 #font => default_font 2076 #font => default_font
1941 @_, 2077 @_,
1942 2078
1943 layout => (new CFClient::Layout), 2079 layout => (new CFClient::Layout),
1944 par => [], 2080 par => [],
1945 height => 0, 2081 height => 0,
1946 children => [ 2082 children => [
1947 (new CFClient::UI::Empty expand => 1), 2083 (new CFClient::UI::Empty expand => 1),
1948 (new CFClient::UI::Slider vertical => 1), 2084 (new CFClient::UI::Slider vertical => 1),
1949 ], 2085 ],
1950 ); 2086 );
1951 2087
… …
2031 2167
2032 delete $self->{texture}; 2168 delete $self->{texture};
2033 } 2169 }
2034 2170
2035 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2171 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
2036 glClearColor 0, 0, 0, 1; 2172 glClearColor 0, 0, 0, 0;
2037 glClear GL_COLOR_BUFFER_BIT; 2173 glClear GL_COLOR_BUFFER_BIT;
2038 2174
2039 glEnable GL_BLEND; 2175 glEnable GL_BLEND;
2040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2176 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2041 glEnable GL_TEXTURE_2D; 2177 glEnable GL_TEXTURE_2D;
… …
2074 2210
2075sub _draw { 2211sub _draw {
2076 my ($self) = @_; 2212 my ($self) = @_;
2077 2213
2078 if ($self->{texture}) { 2214 if ($self->{texture}) {
2215 glEnable GL_BLEND;
2216 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2079 glEnable GL_TEXTURE_2D; 2217 glEnable GL_TEXTURE_2D;
2080 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2219 glColor 1, 1, 1, 1;
2081 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2220 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
2082 glDisable GL_TEXTURE_2D; 2221 glDisable GL_TEXTURE_2D;
2222 glDisable GL_BLEND;
2083 } 2223 }
2084 2224
2085 $self->{children}[1]->draw; 2225 $self->{children}[1]->draw;
2086 2226
2087} 2227}
… …
2136 2276
2137sub new { 2277sub new {
2138 my $class = shift; 2278 my $class = shift;
2139 2279
2140 my $self = $class->SUPER::new ( 2280 my $self = $class->SUPER::new (
2141 state => 0, 2281 state => 0,
2142 connect_activate => \&toggle_flopper, 2282 connect_activate => \&toggle_flopper,
2143 can_events => 1,
2144 @_ 2283 @_
2145 ); 2284 );
2146 2285
2147 if ($self->{state}) { 2286 if ($self->{state}) {
2148 $self->{state} = 0; 2287 $self->{state} = 0;
… …
2183 @_, 2322 @_,
2184 can_events => 0, 2323 can_events => 0,
2185 ) 2324 )
2186} 2325}
2187 2326
2188sub set_text { 2327sub set_markup {
2189 my ($self, $text) = @_; 2328 my ($self, $text) = @_;
2190 2329
2191 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2330 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2192 $self->{label}->set_text ($text); 2331 $self->{label}->set_markup ($text);
2193 $self->add ($self->{label}); 2332 $self->add ($self->{label});
2194} 2333}
2195 2334
2196sub size_request { 2335sub size_request {
2197 my ($self) = @_; 2336 my ($self) = @_;
… …
2199 $self->child->set_max_size ($::WIDTH * 0.3); 2338 $self->child->set_max_size ($::WIDTH * 0.3);
2200 2339
2201 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2340 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2202 2341
2203 ($w + 4, $h + 4) 2342 ($w + 4, $h + 4)
2343}
2344
2345sub size_allocate {
2346 my ($self, $w, $h) = @_;
2347
2348 $self->SUPER::size_allocate ($w - 4, $h - 4);
2204} 2349}
2205 2350
2206sub _draw { 2351sub _draw {
2207 my ($self) = @_; 2352 my ($self) = @_;
2208 2353
… …
2233 $self->SUPER::_draw; 2378 $self->SUPER::_draw;
2234} 2379}
2235 2380
2236############################################################################# 2381#############################################################################
2237 2382
2383package CFClient::UI::Face;
2384
2385our @ISA = CFClient::UI::Base::;
2386
2387use CFClient::OpenGL;
2388
2389sub new {
2390 my $class = shift;
2391
2392 $class->SUPER::new (
2393 aspect => 1,
2394 @_,
2395 )
2396}
2397
2398sub size_request {
2399 (32, 8)
2400}
2401
2402sub draw {
2403 my ($self) = @_;
2404
2405 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2406
2407 if ($tex) {
2408 glEnable GL_BLEND;
2409 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2410 glEnable GL_TEXTURE_2D;
2411 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2412 glColor 1, 1, 1, 1;
2413 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2414 glDisable GL_TEXTURE_2D;
2415 glDisable GL_BLEND;
2416 }
2417}
2418
2419#############################################################################
2420
2238package CFClient::UI::Root; 2421package CFClient::UI::Root;
2239 2422
2240our @ISA = CFClient::UI::Container::; 2423our @ISA = CFClient::UI::Container::;
2241 2424
2242use CFClient::OpenGL; 2425use CFClient::OpenGL;

Diff Legend

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