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.158 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.175 by root, Tue Apr 25 11:48:31 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) {
… …
142 } 161 }
143 162
144 $self 163 $self
145} 164}
146 165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
147sub show { 173sub show {
148 my ($self) = @_; 174 my ($self) = @_;
149 175
150 return if $self->{parent}; 176 return if $self->{parent};
151 177
… …
153} 179}
154 180
155sub hide { 181sub hide {
156 my ($self) = @_; 182 my ($self) = @_;
157 183
158 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
159 186
160 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
161} 189}
162 190
163sub move { 191sub move {
164 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
165 193
… …
216 244
217sub size_allocate { 245sub size_allocate {
218 # nothing to be done 246 # nothing to be done
219} 247}
220 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
221sub set_max_size { 262sub set_max_size {
222 my ($self, $w, $h) = @_; 263 my ($self, $w, $h) = @_;
223 264
224 delete $self->{max_w}; $self->{max_w} = $w if $w; 265 delete $self->{max_w}; $self->{max_w} = $w if $w;
225 delete $self->{max_h}; $self->{max_h} = $h if $h; 266 delete $self->{max_h}; $self->{max_h} = $h if $h;
226} 267}
227 268
228# return top left coordinates 269# return top left coordinates
229sub _topleft { 270sub _topleft {
230 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
231 275
232 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
233} 277}
234 278
235# translate global coordinates to local coordinate system 279# translate global coordinates to local coordinate system
… …
313 glVertex $x + $self->{w}, $y + $self->{h}; 357 glVertex $x + $self->{w}, $y + $self->{h};
314 glVertex $x , $y + $self->{h}; 358 glVertex $x , $y + $self->{h};
315 glEnd; 359 glEnd;
316 glDisable GL_BLEND; 360 glDisable GL_BLEND;
317 } 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 }
318} 376}
319 377
320sub _draw { 378sub _draw {
321 my ($self) = @_; 379 my ($self) = @_;
322 380
… …
381} 439}
382 440
383sub emit { 441sub emit {
384 my ($self, $signal, @args) = @_; 442 my ($self, $signal, @args) = @_;
385 443
386 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
387 $cb->($self, @args);
388 }
389} 445}
390 446
391sub DESTROY { 447sub DESTROY {
392 my ($self) = @_; 448 my ($self) = @_;
393 449
… …
460sub new { 516sub new {
461 my ($class, %arg) = @_; 517 my ($class, %arg) = @_;
462 518
463 my $children = delete $arg{children} || []; 519 my $children = delete $arg{children} || [];
464 520
465 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 );
466 $self->add ($_) for @$children; 526 $self->add ($_) for @$children;
467 527
468 $self 528 $self
469} 529}
470 530
… …
481 ]; 541 ];
482 542
483 $child->check_size; 543 $child->check_size;
484} 544}
485 545
546sub children {
547 @{ $_[0]{children} }
548}
549
486sub remove { 550sub remove {
487 my ($self, $child) = @_; 551 my ($self, $child) = @_;
488 552
489 delete $child->{parent}; 553 delete $child->{parent};
554 $child->hide;
490 555
491 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
492 557
493 $self->check_size; 558 $self->check_size;
494 $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 }
495} 572}
496 573
497sub find_widget { 574sub find_widget {
498 my ($self, $x, $y) = @_; 575 my ($self, $x, $y) = @_;
499 576
… …
574} 651}
575 652
576sub update { 653sub update {
577 my ($self) = @_; 654 my ($self) = @_;
578 655
579 # we want to do this delayed... 656 $ROOT->on_refresh ($self => sub { $self->render_child });
580 $self->render_chld;
581 $self->SUPER::update; 657 $self->SUPER::update;
582} 658}
583 659
660sub size_allocate {
661 my ($self, $w, $h) = @_;
662
663 $self->SUPER::size_allocate ($w, $h);
664 $self->update;
665}
666
584sub render_chld { 667sub render_child {
585 my ($self) = @_; 668 my ($self) = @_;
586 669
587 $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 {
588 glClearColor 0, 0, 0, 1; 671 glClearColor 0, 0, 0, 0;
589 glClear GL_COLOR_BUFFER_BIT; 672 glClear GL_COLOR_BUFFER_BIT;
590 $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;
591 }; 681 };
592}
593
594sub size_allocate {
595 my ($self, $w, $h) = @_;
596
597 $self->child->configure (0, 0, $w, $h);
598
599 $self->render_chld;
600} 682}
601 683
602sub _draw { 684sub _draw {
603 my ($self) = @_; 685 my ($self) = @_;
604 686
… …
606 688
607 my $tex = $self->{texture} 689 my $tex = $self->{texture}
608 or return; 690 or return;
609 691
610 glEnable GL_BLEND; 692 glEnable GL_BLEND;
611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
613 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;
614 697
615 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad (0, 0, $w, $h);
616 699
617 glDisable GL_BLEND; 700 glDisable GL_BLEND;
618 glDisable GL_TEXTURE_2D; 701 glDisable GL_TEXTURE_2D;
… …
703 my $class = shift; 786 my $class = shift;
704 787
705 # TODO: user_x, user_y, overwrite moveto? 788 # TODO: user_x, user_y, overwrite moveto?
706 789
707 my $self = $class->SUPER::new ( 790 my $self = $class->SUPER::new (
708 bg => [1, 1, 1, 1], 791 bg => [1, 1, 1, 1],
709 border_bg => [1, 1, 1, 1], 792 border_bg => [1, 1, 1, 1],
710 border => 0.8, 793 border => 0.8,
711 can_events => 1, 794 can_events => 1,
712 @_ 795 @_
713 ); 796 );
714 797
715 $self->{title} &&= new CFClient::UI::Label 798 $self->{title} &&= new CFClient::UI::Label
… …
863 $self->{children}[$y][$x] = $child; 946 $self->{children}[$y][$x] = $child;
864 947
865 $child->check_size; 948 $child->check_size;
866} 949}
867 950
951sub children {
952 grep $_, map @$_, grep $_, @{ $_[0]{children} }
953}
954
868# 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?
869sub clear { 956sub clear {
870 my ($self) = @_; 957 my ($self) = @_;
871 958
959 my @children = $self->children;
872 delete $self->{children}; 960 delete $self->{children};
961
962 for (@children) {
963 delete $_->{parent};
964 $_->hide;
965 }
966
873 $self->update; 967 $self->update;
874} 968}
875 969
876sub get_wh { 970sub get_wh {
877 my ($self) = @_; 971 my ($self) = @_;
… …
1100 1194
1101sub new { 1195sub new {
1102 my ($class, %arg) = @_; 1196 my ($class, %arg) = @_;
1103 1197
1104 my $self = $class->SUPER::new ( 1198 my $self = $class->SUPER::new (
1105 fg => [1, 1, 1], 1199 fg => [1, 1, 1],
1106 #font => default_font 1200 #font => default_font
1107 fontsize => 1, 1201 fontsize => 1,
1108 text => "", 1202 text => "",
1109 align => -1, 1203 align => -1,
1110 valign => -1, 1204 valign => -1,
1111 padding => 2, 1205 padding => 2,
1112 layout => new CFClient::Layout, 1206 layout => new CFClient::Layout,
1113 can_events => 0, 1207 can_events => 0,
1114 %arg 1208 %arg
1115 ); 1209 );
1116 1210
1117 if (exists $self->{template}) { 1211 if (exists $self->{template}) {
… …
1124 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1218 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1125 1219
1126 $self 1220 $self
1127} 1221}
1128 1222
1129sub escape_text { 1223sub escape {
1130 local $_ = $_[1]; 1224 local $_ = $_[1];
1131 1225
1132 s/&/&amp;/g; 1226 s/&/&amp;/g;
1133 s/>/&gt;/g; 1227 s/>/&gt;/g;
1134 s/</&lt;/g; 1228 s/</&lt;/g;
1135 1229
1136 $_[1] 1230 $_[1]
1137} 1231}
1138 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
1139sub set_text { 1246sub set_text {
1140 my ($self, $text) = @_; 1247 my ($self, $text) = @_;
1141 1248
1249 return if $self->{text} eq "T$text";
1250 $self->{text} = "T$text";
1251
1142 $self->{layout}->set_text ($text); 1252 $self->{layout}->set_text ($text);
1143 1253
1144 delete $self->{texture}; 1254 delete $self->{texture};
1255 $self->update;
1145 $self->check_size; 1256 $self->check_size;
1146 $self->update;
1147} 1257}
1148 1258
1149sub set_markup { 1259sub set_markup {
1150 my ($self, $markup) = @_; 1260 my ($self, $markup) = @_;
1151 1261
1262 return if $self->{text} eq "M$markup";
1263 $self->{text} = "M$markup";
1264
1152 $self->{layout}->set_markup ($markup); 1265 $self->{layout}->set_markup ($markup);
1153 1266
1154 delete $self->{texture}; 1267 delete $self->{texture};
1268 $self->update;
1155 $self->check_size; 1269 $self->check_size;
1156 $self->update;
1157} 1270}
1158 1271
1159sub size_request { 1272sub size_request {
1160 my ($self) = @_; 1273 my ($self) = @_;
1161 1274
… …
1241 1354
1242sub new { 1355sub new {
1243 my $class = shift; 1356 my $class = shift;
1244 1357
1245 $class->SUPER::new ( 1358 $class->SUPER::new (
1246 fg => [1, 1, 1], 1359 fg => [1, 1, 1],
1247 bg => [0, 0, 0, 0.2], 1360 bg => [0, 0, 0, 0.2],
1248 active_bg => [1, 1, 1, 0.5], 1361 active_bg => [1, 1, 1, 0.5],
1249 active_fg => [0, 0, 0], 1362 active_fg => [0, 0, 0],
1250 can_hover => 1, 1363 can_hover => 1,
1251 can_focus => 1, 1364 can_focus => 1,
1252 valign => 0, 1365 valign => 0,
1253 can_events => 1, 1366 can_events => 1,
1254 @_ 1367 @_
1255 ) 1368 )
1256} 1369}
1257 1370
… …
1411 my ($self, $ev) = @_; 1524 my ($self, $ev) = @_;
1412 1525
1413 my $sym = $ev->{sym}; 1526 my $sym = $ev->{sym};
1414 1527
1415 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} = '';
1416 $self->emit (activate => $self->get_text); 1533 $self->emit (activate => $txt);
1417 $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 }
1418 1557
1419 } else { 1558 } else {
1420 $self->SUPER::key_down ($ev); 1559 $self->SUPER::key_down ($ev);
1421 } 1560 }
1422 1561
… …
1436 1575
1437sub new { 1576sub new {
1438 my $class = shift; 1577 my $class = shift;
1439 1578
1440 $class->SUPER::new ( 1579 $class->SUPER::new (
1441 padding => 4, 1580 padding => 4,
1442 fg => [1, 1, 1], 1581 fg => [1, 1, 1],
1443 bg => [1, 1, 1, 0.2], 1582 bg => [1, 1, 1, 0.2],
1444 active_fg => [0, 0, 1], 1583 active_fg => [0, 0, 1],
1445 can_hover => 1, 1584 can_hover => 1,
1446 align => 0, 1585 align => 0,
1447 valign => 0, 1586 valign => 0,
1448 can_events => 1, 1587 can_events => 1,
1449 @_ 1588 @_
1450 ) 1589 )
1451} 1590}
1452 1591
… …
1659} 1798}
1660 1799
1661sub set_max { 1800sub set_max {
1662 my ($self, $max) = @_; 1801 my ($self, $max) = @_;
1663 1802
1803 return if $self->{max_val} == $max;
1804
1664 $self->{max_val} = $max; 1805 $self->{max_val} = $max;
1806 $self->update;
1665} 1807}
1666 1808
1667sub set_value { 1809sub set_value {
1668 my ($self, $val, $max) = @_; 1810 my ($self, $val, $max) = @_;
1669 1811
1670 $self->set_max ($max) 1812 $self->set_max ($max)
1671 if defined $max; 1813 if defined $max;
1672 1814
1673 $max = $self->{max_val}; 1815 return if $self->{val} == $val;
1816
1674 $self->{val} = $val; 1817 $self->{val} = $val;
1675
1676 $self->update; 1818 $self->update;
1677} 1819}
1678 1820
1679sub _draw { 1821sub _draw {
1680 my ($self) = @_; 1822 my ($self) = @_;
… …
1743 1885
1744sub new { 1886sub new {
1745 my ($class, %arg) = @_; 1887 my ($class, %arg) = @_;
1746 1888
1747 my $self = $class->SUPER::new ( 1889 my $self = $class->SUPER::new (
1748 tooltip => $arg{type}, 1890 tooltip => $arg{type},
1891 can_hover => 1,
1892 can_events => 1,
1749 %arg, 1893 %arg,
1750 ); 1894 );
1751 1895
1752 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1896 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1753 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 1897 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1754 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 1898 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1755 1899
1756 $self 1900 $self
1757} 1901}
1758 1902
1759sub set_fontsize { 1903sub set_fontsize {
… …
1761 1905
1762 $self->{value}->set_fontsize ($fsize); 1906 $self->{value}->set_fontsize ($fsize);
1763 $self->{max} ->set_fontsize ($fsize); 1907 $self->{max} ->set_fontsize ($fsize);
1764} 1908}
1765 1909
1910sub set_max {
1911 my ($self, $max) = @_;
1912
1913 $self->{gauge}->set_max ($max);
1914 $self->{max}->set_text ($max);
1915}
1916
1766sub set_value { 1917sub set_value {
1767 my ($self, $val, $max) = @_; 1918 my ($self, $val, $max) = @_;
1768 1919
1769 $self->set_max ($max) 1920 $self->set_max ($max)
1770 if defined $max; 1921 if defined $max;
1771 1922
1772 $self->{gauge}->set_value ($val, $max); 1923 $self->{gauge}->set_value ($val, $max);
1773 $self->{value}->set_text ($val); 1924 $self->{value}->set_text ($val);
1774}
1775
1776sub set_max {
1777 my ($self, $max) = @_;
1778
1779 $self->{gauge}->set_max ($max);
1780 $self->{max}->set_text ($max);
1781} 1925}
1782 1926
1783############################################################################# 1927#############################################################################
1784 1928
1785package CFClient::UI::Slider; 1929package CFClient::UI::Slider;
… …
1925 2069
1926sub new { 2070sub new {
1927 my $class = shift; 2071 my $class = shift;
1928 2072
1929 my $self = $class->SUPER::new ( 2073 my $self = $class->SUPER::new (
1930 fontsize => 1, 2074 fontsize => 1,
2075 can_events => 0,
1931 #font => default_font 2076 #font => default_font
1932 @_, 2077 @_,
1933 2078
1934 layout => (new CFClient::Layout), 2079 layout => (new CFClient::Layout),
1935 par => [], 2080 par => [],
1936 height => 0, 2081 height => 0,
1937 children => [ 2082 children => [
1938 (new CFClient::UI::Empty expand => 1), 2083 (new CFClient::UI::Empty expand => 1),
1939 (new CFClient::UI::Slider vertical => 1), 2084 (new CFClient::UI::Slider vertical => 1),
1940 ], 2085 ],
1941 ); 2086 );
1942 2087
… …
2022 2167
2023 delete $self->{texture}; 2168 delete $self->{texture};
2024 } 2169 }
2025 2170
2026 $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 {
2027 glClearColor 0, 0, 0, 1; 2172 glClearColor 0, 0, 0, 0;
2028 glClear GL_COLOR_BUFFER_BIT; 2173 glClear GL_COLOR_BUFFER_BIT;
2029 2174
2030 glEnable GL_BLEND; 2175 glEnable GL_BLEND;
2031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2176 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2032 glEnable GL_TEXTURE_2D; 2177 glEnable GL_TEXTURE_2D;
… …
2065 2210
2066sub _draw { 2211sub _draw {
2067 my ($self) = @_; 2212 my ($self) = @_;
2068 2213
2069 if ($self->{texture}) { 2214 if ($self->{texture}) {
2215 glEnable GL_BLEND;
2216 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070 glEnable GL_TEXTURE_2D; 2217 glEnable GL_TEXTURE_2D;
2071 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;
2072 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2220 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
2073 glDisable GL_TEXTURE_2D; 2221 glDisable GL_TEXTURE_2D;
2222 glDisable GL_BLEND;
2074 } 2223 }
2075 2224
2076 $self->{children}[1]->draw; 2225 $self->{children}[1]->draw;
2077 2226
2078} 2227}
… …
2127 2276
2128sub new { 2277sub new {
2129 my $class = shift; 2278 my $class = shift;
2130 2279
2131 my $self = $class->SUPER::new ( 2280 my $self = $class->SUPER::new (
2132 state => 0, 2281 state => 0,
2133 connect_activate => \&toggle_flopper, 2282 connect_activate => \&toggle_flopper,
2134 can_events => 1,
2135 @_ 2283 @_
2136 ); 2284 );
2137 2285
2138 if ($self->{state}) { 2286 if ($self->{state}) {
2139 $self->{state} = 0; 2287 $self->{state} = 0;
… …
2174 @_, 2322 @_,
2175 can_events => 0, 2323 can_events => 0,
2176 ) 2324 )
2177} 2325}
2178 2326
2179sub set_text { 2327sub set_markup {
2180 my ($self, $text) = @_; 2328 my ($self, $text) = @_;
2181 2329
2182 $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];
2183 $self->{label}->set_text ($text); 2331 $self->{label}->set_markup ($text);
2184 $self->add ($self->{label}); 2332 $self->add ($self->{label});
2185} 2333}
2186 2334
2187sub size_request { 2335sub size_request {
2188 my ($self) = @_; 2336 my ($self) = @_;
2189 2337
2190 $self->child->set_max_size ($::WIDTH * 0.2); 2338 $self->child->set_max_size ($::WIDTH * 0.3);
2191 2339
2192 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2340 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2193 2341
2194 ($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);
2195} 2349}
2196 2350
2197sub _draw { 2351sub _draw {
2198 my ($self) = @_; 2352 my ($self) = @_;
2199 2353
… …
2224 $self->SUPER::_draw; 2378 $self->SUPER::_draw;
2225} 2379}
2226 2380
2227############################################################################# 2381#############################################################################
2228 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
2229package CFClient::UI::Root; 2421package CFClient::UI::Root;
2230 2422
2231our @ISA = CFClient::UI::Container::; 2423our @ISA = CFClient::UI::Container::;
2232 2424
2233use CFClient::OpenGL; 2425use CFClient::OpenGL;

Diff Legend

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