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.173 by root, Tue Apr 25 10:30:48 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";
… …
211 236
212sub size_allocate { 237sub size_allocate {
213 # nothing to be done 238 # nothing to be done
214} 239}
215 240
241sub children {
242}
243
244# call when resoltuion changes etc.
245sub reconfigure {
246 my ($self) = @_;
247
248 $_->reconfigure
249 for $self->children;
250
251 $_->check_size;
252}
253
216sub set_max_size { 254sub set_max_size {
217 my ($self, $w, $h) = @_; 255 my ($self, $w, $h) = @_;
218 256
219 delete $self->{max_w}; $self->{max_w} = $w if $w; 257 delete $self->{max_w}; $self->{max_w} = $w if $w;
220 delete $self->{max_h}; $self->{max_h} = $h if $h; 258 delete $self->{max_h}; $self->{max_h} = $h if $h;
221} 259}
222 260
223# return top left coordinates 261# return top left coordinates
224sub _topleft { 262sub _topleft {
225 my ($self, $x, $y) = @_; 263 my ($self, $x, $y) = @_;
264
265 $self->{parent}
266 or Carp::confess "no parent widget in _topleft\n";#d#
226 267
227 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 268 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
228} 269}
229 270
230# translate global coordinates to local coordinate system 271# translate global coordinates to local coordinate system
… …
308 glVertex $x + $self->{w}, $y + $self->{h}; 349 glVertex $x + $self->{w}, $y + $self->{h};
309 glVertex $x , $y + $self->{h}; 350 glVertex $x , $y + $self->{h};
310 glEnd; 351 glEnd;
311 glDisable GL_BLEND; 352 glDisable GL_BLEND;
312 } 353 }
354
355 if ($ENV{PCLIENT_DEBUG}) {
356 glPushMatrix;
357 glColor 1, 1, 0, 1;
358 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
359 glBegin GL_LINE_LOOP;
360 glVertex 0 , 0;
361 glVertex $self->{w}, 0;
362 glVertex $self->{w}, $self->{h};
363 glVertex 0 , $self->{h};
364 glEnd;
365 glPopMatrix;
366 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
367 }
313} 368}
314 369
315sub _draw { 370sub _draw {
316 my ($self) = @_; 371 my ($self) = @_;
317 372
… …
337} 392}
338 393
339sub check_size { 394sub check_size {
340 my ($self) = @_; 395 my ($self) = @_;
341 396
342 return unless $self->{parent}; 397 $self->{parent}
398 or return 1;
343 399
344 my ($w, $h) = $self->size_request; 400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
345 403
346 if ($w != $self->{req_w} || $h != $self->{req_h}) { 404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
347 $self->{req_w} = $w; 405 $self->{req_w} = $w;
348 $self->{req_h} = $h; 406 $self->{req_h} = $h;
349 407
350 $self->{parent}->check_size; 408 $self->{parent}->check_size
409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
351 } 417 }
352} 418}
353 419
354sub update { 420sub update {
355 my ($self) = @_; 421 my ($self) = @_;
… …
365} 431}
366 432
367sub emit { 433sub emit {
368 my ($self, $signal, @args) = @_; 434 my ($self, $signal, @args) = @_;
369 435
370 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
371 $cb->($self, @args);
372 }
373} 437}
374 438
375sub DESTROY { 439sub DESTROY {
376 my ($self) = @_; 440 my ($self) = @_;
377 441
… …
444sub new { 508sub new {
445 my ($class, %arg) = @_; 509 my ($class, %arg) = @_;
446 510
447 my $children = delete $arg{children} || []; 511 my $children = delete $arg{children} || [];
448 512
449 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 513 my $self = $class->SUPER::new (
514 children => [],
515 can_events => 0,
516 %arg,
517 );
450 $self->add ($_) for @$children; 518 $self->add ($_) for @$children;
451 519
452 $self 520 $self
453} 521}
454 522
… …
465 ]; 533 ];
466 534
467 $child->check_size; 535 $child->check_size;
468} 536}
469 537
538sub children {
539 @{ $_[0]{children} }
540}
541
470sub remove { 542sub remove {
471 my ($self, $child) = @_; 543 my ($self, $child) = @_;
472 544
473 delete $child->{parent}; 545 delete $child->{parent};
546 $child->hide;
474 547
475 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 548 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
476 549
477 $self->check_size; 550 $self->check_size;
478 $self->update; 551 $self->update;
552}
553
554sub clear {
555 my ($self) = @_;
556
557 my $children = delete $self->{children};
558 $self->{children} = [];
559
560 for (@$children) {
561 delete $_->{parent};
562 $_->hide;
563 }
479} 564}
480 565
481sub find_widget { 566sub find_widget {
482 my ($self, $x, $y) = @_; 567 my ($self, $x, $y) = @_;
483 568
… …
643 border => 0.8, 728 border => 0.8,
644 @_ 729 @_
645 ); 730 );
646 731
647 $self 732 $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} 733}
668 734
669sub _draw { 735sub _draw {
670 my ($self) = @_; 736 my ($self) = @_;
671 737
… …
706 my $class = shift; 772 my $class = shift;
707 773
708 # TODO: user_x, user_y, overwrite moveto? 774 # TODO: user_x, user_y, overwrite moveto?
709 775
710 my $self = $class->SUPER::new ( 776 my $self = $class->SUPER::new (
711 bg => [1, 1, 1, 1], 777 bg => [1, 1, 1, 1],
712 border_bg => [1, 1, 1, 1], 778 border_bg => [1, 1, 1, 1],
713 border => 0.8, 779 border => 0.8,
714 can_events => 1, 780 can_events => 1,
715 @_ 781 @_
716 ); 782 );
717 783
718 $self->{title} &&= new CFClient::UI::Label 784 $self->{title} &&= new CFClient::UI::Label
… …
729} 795}
730 796
731sub size_request { 797sub size_request {
732 my ($self) = @_; 798 my ($self) = @_;
733 799
734 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
735
736 my ($w, $h) = $self->SUPER::size_request; 800 my ($w, $h) = $self->SUPER::size_request;
737 801
738 ( 802 (
739 $w + $self->border * 2, 803 $w + $self->border * 2,
740 $h + $self->border * 2, 804 $h + $self->border * 2,
… …
868 $self->{children}[$y][$x] = $child; 932 $self->{children}[$y][$x] = $child;
869 933
870 $child->check_size; 934 $child->check_size;
871} 935}
872 936
937sub children {
938 grep $_, map @$_, grep $_, @{ $_[0]{children} }
939}
940
873# TODO: move to container class maybe? send childs a signal on removal? 941# TODO: move to container class maybe? send childs a signal on removal?
874sub clear { 942sub clear {
875 my ($self) = @_; 943 my ($self) = @_;
876 944
945 my @children = $self->children;
877 delete $self->{children}; 946 delete $self->{children};
947
948 for (@children) {
949 delete $_->{parent};
950 $_->hide;
951 }
952
878 $self->update; 953 $self->update;
879} 954}
880 955
881sub get_wh { 956sub get_wh {
882 my ($self) = @_; 957 my ($self) = @_;
… …
1105 1180
1106sub new { 1181sub new {
1107 my ($class, %arg) = @_; 1182 my ($class, %arg) = @_;
1108 1183
1109 my $self = $class->SUPER::new ( 1184 my $self = $class->SUPER::new (
1110 fg => [1, 1, 1], 1185 fg => [1, 1, 1],
1111 #font => default_font 1186 #font => default_font
1112 fontsize => 1, 1187 fontsize => 1,
1113 text => "", 1188 text => "",
1114 align => -1, 1189 align => -1,
1115 valign => -1, 1190 valign => -1,
1116 padding => 2, 1191 padding => 2,
1117 layout => new CFClient::Layout, 1192 layout => new CFClient::Layout,
1118 can_events => 0, 1193 can_events => 0,
1119 %arg 1194 %arg
1120 ); 1195 );
1121 1196
1122 if (exists $self->{template}) { 1197 if (exists $self->{template}) {
… …
1129 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1204 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1130 1205
1131 $self 1206 $self
1132} 1207}
1133 1208
1134sub escape_text { 1209sub escape {
1135 local $_ = $_[1]; 1210 local $_ = $_[1];
1136 1211
1137 s/&/&amp;/g; 1212 s/&/&amp;/g;
1138 s/>/&gt;/g; 1213 s/>/&gt;/g;
1139 s/</&lt;/g; 1214 s/</&lt;/g;
1140 1215
1141 $_[1] 1216 $_[1]
1142} 1217}
1143 1218
1219sub update {
1220 my ($self) = @_;
1221
1222 delete $self->{texture};
1223 $self->SUPER::update;
1224}
1225
1226sub reconfigure {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230}
1231
1144sub set_text { 1232sub set_text {
1145 my ($self, $text) = @_; 1233 my ($self, $text) = @_;
1146 1234
1235 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text";
1237
1147 $self->{layout}->set_text ($text); 1238 $self->{layout}->set_text ($text);
1148 1239
1149 delete $self->{texture}; 1240 delete $self->{texture};
1241 $self->update;
1150 $self->check_size; 1242 $self->check_size;
1151 $self->update;
1152} 1243}
1153 1244
1154sub set_markup { 1245sub set_markup {
1155 my ($self, $markup) = @_; 1246 my ($self, $markup) = @_;
1156 1247
1248 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup";
1250
1157 $self->{layout}->set_markup ($markup); 1251 $self->{layout}->set_markup ($markup);
1158 1252
1159 delete $self->{texture}; 1253 delete $self->{texture};
1254 $self->update;
1160 $self->check_size; 1255 $self->check_size;
1161 $self->update;
1162} 1256}
1163 1257
1164sub size_request { 1258sub size_request {
1165 my ($self) = @_; 1259 my ($self) = @_;
1166 1260
… …
1246 1340
1247sub new { 1341sub new {
1248 my $class = shift; 1342 my $class = shift;
1249 1343
1250 $class->SUPER::new ( 1344 $class->SUPER::new (
1251 fg => [1, 1, 1], 1345 fg => [1, 1, 1],
1252 bg => [0, 0, 0, 0.2], 1346 bg => [0, 0, 0, 0.2],
1253 active_bg => [1, 1, 1, 0.5], 1347 active_bg => [1, 1, 1, 0.5],
1254 active_fg => [0, 0, 0], 1348 active_fg => [0, 0, 0],
1255 can_hover => 1, 1349 can_hover => 1,
1256 can_focus => 1, 1350 can_focus => 1,
1257 valign => 0, 1351 valign => 0,
1258 can_events => 1, 1352 can_events => 1,
1259 @_ 1353 @_
1260 ) 1354 )
1261} 1355}
1262 1356
… …
1416 my ($self, $ev) = @_; 1510 my ($self, $ev) = @_;
1417 1511
1418 my $sym = $ev->{sym}; 1512 my $sym = $ev->{sym};
1419 1513
1420 if ($sym == 13) { 1514 if ($sym == 13) {
1515 unshift @{$self->{history}},
1516 my $txt = $self->get_text;
1517 $self->{history_pointer} = -1;
1518 $self->{history_saveback} = '';
1421 $self->emit (activate => $self->get_text); 1519 $self->emit (activate => $txt);
1422 $self->update; 1520 $self->update;
1521
1522 } elsif ($sym == CFClient::SDLK_UP) {
1523 if ($self->{history_pointer} < 0) {
1524 $self->{history_saveback} = $self->get_text;
1525 }
1526 if (@{$self->{history} || []} > 0) {
1527 $self->{history_pointer}++;
1528 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1529 $self->{history_pointer} = @{$self->{history} || []} - 1;
1530 }
1531 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1532 }
1533
1534 } elsif ($sym == CFClient::SDLK_DOWN) {
1535 $self->{history_pointer}--;
1536 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1537
1538 if ($self->{history_pointer} >= 0) {
1539 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1540 } else {
1541 $self->set_text ($self->{history_saveback});
1542 }
1423 1543
1424 } else { 1544 } else {
1425 $self->SUPER::key_down ($ev); 1545 $self->SUPER::key_down ($ev);
1426 } 1546 }
1427 1547
… …
1441 1561
1442sub new { 1562sub new {
1443 my $class = shift; 1563 my $class = shift;
1444 1564
1445 $class->SUPER::new ( 1565 $class->SUPER::new (
1446 padding => 4, 1566 padding => 4,
1447 fg => [1, 1, 1], 1567 fg => [1, 1, 1],
1448 bg => [1, 1, 1, 0.2], 1568 bg => [1, 1, 1, 0.2],
1449 active_fg => [0, 0, 1], 1569 active_fg => [0, 0, 1],
1450 can_hover => 1, 1570 can_hover => 1,
1451 align => 0, 1571 align => 0,
1452 valign => 0, 1572 valign => 0,
1453 can_events => 1, 1573 can_events => 1,
1454 @_ 1574 @_
1455 ) 1575 )
1456} 1576}
1457 1577
… …
1616 1736
1617package CFClient::UI::VGauge; 1737package CFClient::UI::VGauge;
1618 1738
1619our @ISA = CFClient::UI::Base::; 1739our @ISA = CFClient::UI::Base::;
1620 1740
1741use List::Util qw(min max);
1742
1621use CFClient::OpenGL; 1743use CFClient::OpenGL;
1622 1744
1623my %tex = ( 1745my %tex = (
1624 food => [ 1746 food => [
1625 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1747 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1626 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1748 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1627 ], 1749 ],
1628 grace => [ 1750 grace => [
1629 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1751 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1630 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1752 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1631 ], 1753 ],
1632 hp => [ 1754 hp => [
1633 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1755 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1634 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1756 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1635 ], 1757 ],
1636 mana => [ 1758 mana => [
1637 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1759 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1638 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1760 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1639 ], 1761 ],
1640); 1762);
1641 1763
1642# eg. VGauge->new (gauge => 'food'), default gauge: food 1764# eg. VGauge->new (gauge => 'food'), default gauge: food
1643sub new { 1765sub new {
… …
1662} 1784}
1663 1785
1664sub set_max { 1786sub set_max {
1665 my ($self, $max) = @_; 1787 my ($self, $max) = @_;
1666 1788
1789 return if $self->{max_val} == $max;
1790
1667 $self->{max_val} = $max; 1791 $self->{max_val} = $max;
1792 $self->update;
1668} 1793}
1669 1794
1670sub set_value { 1795sub set_value {
1671 my ($self, $val, $max) = @_; 1796 my ($self, $val, $max) = @_;
1672 1797
1673 $self->set_max ($max) 1798 $self->set_max ($max)
1674 if defined $max; 1799 if defined $max;
1675 1800
1676 $max = $self->{max_val}; 1801 return if $self->{val} == $val;
1802
1677 $self->{val} = $val; 1803 $self->{val} = $val;
1678
1679 $self->update; 1804 $self->update;
1680} 1805}
1681 1806
1682sub _draw { 1807sub _draw {
1683 my ($self) = @_; 1808 my ($self) = @_;
1684 1809
1685 my $tex = $tex{$self->{type}}; 1810 my $tex = $tex{$self->{type}};
1811 my ($t1, $t2, $t3) = @$tex;
1686 1812
1687 my ($w, $h) = ($self->{w}, $self->{h}); 1813 my ($w, $h) = ($self->{w}, $self->{h});
1688 1814
1689 if ($self->{vertical}) { 1815 if ($self->{vertical}) {
1690 glRotate 90, 0, 0, 1; 1816 glRotate 90, 0, 0, 1;
… …
1692 1818
1693 ($w, $h) = ($h, $w); 1819 ($w, $h) = ($h, $w);
1694 } 1820 }
1695 1821
1696 my $ycut = $self->{val} / ($self->{max_val} || 1); 1822 my $ycut = $self->{val} / ($self->{max_val} || 1);
1697 $ycut = 1 if $self->{val} > $self->{max_val};
1698 1823
1699 my $t1 = $tex->[0]; 1824 my $ycut1 = max 0, min 1, $ycut;
1700 my $t2 = $tex->[1]; 1825 my $ycut2 = max 0, min 1, $ycut - 1;
1826
1827 my $h1 = $self->{h} * (1 - $ycut1);
1828 my $h2 = $self->{h} * (1 - $ycut2);
1701 1829
1702 glEnable GL_BLEND; 1830 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1831 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1704 glEnable GL_TEXTURE_2D; 1832 glEnable GL_TEXTURE_2D;
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1706 1834
1707 my $h1 = $self->{h} - $ycut * $self->{h};
1708 my $h2 = $ycut * $self->{h};
1709
1710 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1835 glBindTexture GL_TEXTURE_2D, $t1->{name};
1711 glBegin GL_QUADS; 1836 glBegin GL_QUADS;
1712 glTexCoord 0 , 0; glVertex 0 , 0; 1837 glTexCoord 0 , 0; glVertex 0 , 0;
1713 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1838 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1714 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1839 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1715 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1840 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1716 glEnd; 1841 glEnd;
1717 1842
1843 my $ycut1 = List::Util::min 1, $ycut;
1718 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1844 glBindTexture GL_TEXTURE_2D, $t2->{name};
1719 glBegin GL_QUADS; 1845 glBegin GL_QUADS;
1720 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1846 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1721 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1847 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1722 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1848 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1723 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1849 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1724 glEnd; 1850 glEnd;
1851
1852 if ($t3) {
1853 glBindTexture GL_TEXTURE_2D, $t3->{name};
1854 glBegin GL_QUADS;
1855 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1856 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1857 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1858 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1859 glEnd;
1860 }
1725 1861
1726 glDisable GL_BLEND; 1862 glDisable GL_BLEND;
1727 glDisable GL_TEXTURE_2D; 1863 glDisable GL_TEXTURE_2D;
1728} 1864}
1729 1865
… …
1735 1871
1736sub new { 1872sub new {
1737 my ($class, %arg) = @_; 1873 my ($class, %arg) = @_;
1738 1874
1739 my $self = $class->SUPER::new ( 1875 my $self = $class->SUPER::new (
1740 tooltip => $arg{type}, 1876 tooltip => $arg{type},
1877 can_hover => 1,
1878 can_events => 1,
1741 %arg, 1879 %arg,
1742 ); 1880 );
1743 1881
1744 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1882 $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); 1883 $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); 1884 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1747 1885
1748 $self 1886 $self
1749} 1887}
1750 1888
1751sub set_fontsize { 1889sub set_fontsize {
… …
1753 1891
1754 $self->{value}->set_fontsize ($fsize); 1892 $self->{value}->set_fontsize ($fsize);
1755 $self->{max} ->set_fontsize ($fsize); 1893 $self->{max} ->set_fontsize ($fsize);
1756} 1894}
1757 1895
1896sub set_max {
1897 my ($self, $max) = @_;
1898
1899 $self->{gauge}->set_max ($max);
1900 $self->{max}->set_text ($max);
1901}
1902
1758sub set_value { 1903sub set_value {
1759 my ($self, $val, $max) = @_; 1904 my ($self, $val, $max) = @_;
1760 1905
1761 $self->set_max ($max) 1906 $self->set_max ($max)
1762 if defined $max; 1907 if defined $max;
1763 1908
1764 $self->{gauge}->set_value ($val, $max); 1909 $self->{gauge}->set_value ($val, $max);
1765 $self->{value}->set_text ($val); 1910 $self->{value}->set_text ($val);
1766}
1767
1768sub set_max {
1769 my ($self, $max) = @_;
1770
1771 $self->{gauge}->set_max ($max);
1772 $self->{max}->set_text ($max);
1773} 1911}
1774 1912
1775############################################################################# 1913#############################################################################
1776 1914
1777package CFClient::UI::Slider; 1915package CFClient::UI::Slider;
… …
1917 2055
1918sub new { 2056sub new {
1919 my $class = shift; 2057 my $class = shift;
1920 2058
1921 my $self = $class->SUPER::new ( 2059 my $self = $class->SUPER::new (
1922 fontsize => 1, 2060 fontsize => 1,
2061 can_events => 0,
1923 #font => default_font 2062 #font => default_font
1924 @_, 2063 @_,
1925 2064
1926 layout => (new CFClient::Layout), 2065 layout => (new CFClient::Layout),
1927 par => [], 2066 par => [],
1928 height => 0, 2067 height => 0,
1929 children => [ 2068 children => [
1930 (new CFClient::UI::Empty expand => 1), 2069 (new CFClient::UI::Empty expand => 1),
1931 (new CFClient::UI::Slider vertical => 1), 2070 (new CFClient::UI::Slider vertical => 1),
1932 ], 2071 ],
1933 ); 2072 );
1934 2073
… …
2059 my ($self) = @_; 2198 my ($self) = @_;
2060 2199
2061 if ($self->{texture}) { 2200 if ($self->{texture}) {
2062 glEnable GL_TEXTURE_2D; 2201 glEnable GL_TEXTURE_2D;
2063 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1;
2064 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2204 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
2065 glDisable GL_TEXTURE_2D; 2205 glDisable GL_TEXTURE_2D;
2066 } 2206 }
2067 2207
2068 $self->{children}[1]->draw; 2208 $self->{children}[1]->draw;
… …
2119 2259
2120sub new { 2260sub new {
2121 my $class = shift; 2261 my $class = shift;
2122 2262
2123 my $self = $class->SUPER::new ( 2263 my $self = $class->SUPER::new (
2124 state => 0, 2264 state => 0,
2125 connect_activate => \&toggle_flopper, 2265 connect_activate => \&toggle_flopper,
2126 can_events => 1,
2127 @_ 2266 @_
2128 ); 2267 );
2129 2268
2130 if ($self->{state}) { 2269 if ($self->{state}) {
2131 $self->{state} = 0; 2270 $self->{state} = 0;
… …
2166 @_, 2305 @_,
2167 can_events => 0, 2306 can_events => 0,
2168 ) 2307 )
2169} 2308}
2170 2309
2171sub set_text { 2310sub set_markup {
2172 my ($self, $text) = @_; 2311 my ($self, $text) = @_;
2173 2312
2174 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2175 $self->{label}->set_text ($text); 2314 $self->{label}->set_markup ($text);
2176 $self->add ($self->{label}); 2315 $self->add ($self->{label});
2177} 2316}
2178 2317
2179sub size_request { 2318sub size_request {
2180 my ($self) = @_; 2319 my ($self) = @_;
2181 2320
2182 $self->child->set_max_size ($::WIDTH * 0.2); 2321 $self->child->set_max_size ($::WIDTH * 0.3);
2183 2322
2184 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2185 2324
2186 ($w + 4, $h + 4) 2325 ($w + 4, $h + 4)
2326}
2327
2328sub size_allocate {
2329 my ($self, $w, $h) = @_;
2330
2331 $self->SUPER::size_allocate ($w - 4, $h - 4);
2187} 2332}
2188 2333
2189sub _draw { 2334sub _draw {
2190 my ($self) = @_; 2335 my ($self) = @_;
2191 2336
… …
2216 $self->SUPER::_draw; 2361 $self->SUPER::_draw;
2217} 2362}
2218 2363
2219############################################################################# 2364#############################################################################
2220 2365
2366package CFClient::UI::Face;
2367
2368our @ISA = CFClient::UI::Base::;
2369
2370use CFClient::OpenGL;
2371
2372sub new {
2373 my $class = shift;
2374
2375 $class->SUPER::new (
2376 aspect => 1,
2377 @_,
2378 )
2379}
2380
2381sub size_request {
2382 (32, 8)
2383}
2384
2385sub draw {
2386 my ($self) = @_;
2387
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2389
2390 if ($tex) {
2391 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395 glColor 1, 1, 1, 1;
2396 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2397 glDisable GL_TEXTURE_2D;
2398 glDisable GL_BLEND;
2399 }
2400}
2401
2402#############################################################################
2403
2221package CFClient::UI::Root; 2404package CFClient::UI::Root;
2222 2405
2223our @ISA = CFClient::UI::Container::; 2406our @ISA = CFClient::UI::Container::;
2224 2407
2225use CFClient::OpenGL; 2408use CFClient::OpenGL;

Diff Legend

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