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.174 by root, Tue Apr 25 11:18:49 2006 UTC

… …
14our $BUTTON_STATE; 14our $BUTTON_STATE;
15 15
16sub check_tooltip { 16sub check_tooltip {
17 if (!$GRAB) { 17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 19 if (length $widget->{tooltip}) {
20 20
21 if ($TOOLTIP->{owner} != $widget) { 21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 22 $TOOLTIP->{owner} = $widget;
23 23
24 my $tip = $widget->{tooltip}; 24 my $tip = $widget->{tooltip};
25 25
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 27
28 $TOOLTIP->set_text ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
31 } 39 }
32 40
33 return; 41 return;
34 } 42 }
35 } 43 }
… …
39 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
40} 48}
41 49
42# class methods for events 50# class methods for events
43sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
45} 54}
46 55
47sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
49} 59}
50 60
51sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
52 my ($ev) = @_; 62 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 71 check_tooltip;
62 } 72 }
63 73
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 75
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 76 if ($GRAB) {
77 ($x, $y) = $GRAB->coord2local ($x, $y);
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
67} 80}
68 81
69sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
70 my ($ev) = @_; 83 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
72 85
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 87
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 89
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 90 if ($GRAB) {
91 ($x, $y) = $GRAB->coord2local ($x, $y);
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
78 94
79 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 97 $grab->update if $grab;
82 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 115
100 check_tooltip; 116 check_tooltip;
101 } 117 }
102 118
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
122 }
104} 123}
105 124
106# convert position array to integers 125# convert position array to integers
107sub harmonize { 126sub harmonize {
108 my ($vals) = @_; 127 my ($vals) = @_;
… …
126 145
127sub new { 146sub new {
128 my $class = shift; 147 my $class = shift;
129 148
130 my $self = bless { 149 my $self = bless {
131 x => 0, 150 x => 0,
132 y => 0, 151 y => 0,
133 z => 0, 152 z => 0,
134 can_events => 1, 153 can_events => 1,
135 @_ 154 @_
136 }, $class; 155 }, $class;
137 156
138 for (keys %$self) { 157 for (keys %$self) {
… …
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
… …
168 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
169 197
170 $self->update; 198 $self->update;
171} 199}
172 200
173sub needs_redraw { 201sub set_size {
174 0 202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
175} 208}
176 209
177sub size_request { 210sub size_request {
178 require Carp; 211 require Carp;
179 Carp::confess "size_request is abstract"; 212 Carp::confess "size_request is abstract";
… …
211 244
212sub size_allocate { 245sub size_allocate {
213 # nothing to be done 246 # nothing to be done
214} 247}
215 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
216sub set_max_size { 262sub set_max_size {
217 my ($self, $w, $h) = @_; 263 my ($self, $w, $h) = @_;
218 264
219 delete $self->{max_w}; $self->{max_w} = $w if $w; 265 delete $self->{max_w}; $self->{max_w} = $w if $w;
220 delete $self->{max_h}; $self->{max_h} = $h if $h; 266 delete $self->{max_h}; $self->{max_h} = $h if $h;
221} 267}
222 268
223# return top left coordinates 269# return top left coordinates
224sub _topleft { 270sub _topleft {
225 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
226 275
227 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
228} 277}
229 278
230# translate global coordinates to local coordinate system 279# translate global coordinates to local coordinate system
… …
308 glVertex $x + $self->{w}, $y + $self->{h}; 357 glVertex $x + $self->{w}, $y + $self->{h};
309 glVertex $x , $y + $self->{h}; 358 glVertex $x , $y + $self->{h};
310 glEnd; 359 glEnd;
311 glDisable GL_BLEND; 360 glDisable GL_BLEND;
312 } 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 }
313} 376}
314 377
315sub _draw { 378sub _draw {
316 my ($self) = @_; 379 my ($self) = @_;
317 380
… …
337} 400}
338 401
339sub check_size { 402sub check_size {
340 my ($self) = @_; 403 my ($self) = @_;
341 404
342 return unless $self->{parent}; 405 $self->{parent}
406 or return 1;
343 407
344 my ($w, $h) = $self->size_request; 408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
345 411
346 if ($w != $self->{req_w} || $h != $self->{req_h}) { 412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
347 $self->{req_w} = $w; 413 $self->{req_w} = $w;
348 $self->{req_h} = $h; 414 $self->{req_h} = $h;
349 415
350 $self->{parent}->check_size; 416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
351 } 425 }
352} 426}
353 427
354sub update { 428sub update {
355 my ($self) = @_; 429 my ($self) = @_;
… …
365} 439}
366 440
367sub emit { 441sub emit {
368 my ($self, $signal, @args) = @_; 442 my ($self, $signal, @args) = @_;
369 443
370 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
371 $cb->($self, @args);
372 }
373} 445}
374 446
375sub DESTROY { 447sub DESTROY {
376 my ($self) = @_; 448 my ($self) = @_;
377 449
… …
444sub new { 516sub new {
445 my ($class, %arg) = @_; 517 my ($class, %arg) = @_;
446 518
447 my $children = delete $arg{children} || []; 519 my $children = delete $arg{children} || [];
448 520
449 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 );
450 $self->add ($_) for @$children; 526 $self->add ($_) for @$children;
451 527
452 $self 528 $self
453} 529}
454 530
… …
465 ]; 541 ];
466 542
467 $child->check_size; 543 $child->check_size;
468} 544}
469 545
546sub children {
547 @{ $_[0]{children} }
548}
549
470sub remove { 550sub remove {
471 my ($self, $child) = @_; 551 my ($self, $child) = @_;
472 552
473 delete $child->{parent}; 553 delete $child->{parent};
554 $child->hide;
474 555
475 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
476 557
477 $self->check_size; 558 $self->check_size;
478 $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 }
479} 572}
480 573
481sub find_widget { 574sub find_widget {
482 my ($self, $x, $y) = @_; 575 my ($self, $x, $y) = @_;
483 576
… …
558} 651}
559 652
560sub update { 653sub update {
561 my ($self) = @_; 654 my ($self) = @_;
562 655
563 # we want to do this delayed... 656 $ROOT->on_refresh ($self => sub { $self->render_child });
564 $self->render_chld;
565 $self->SUPER::update; 657 $self->SUPER::update;
566} 658}
567 659
660sub size_allocate {
661 my ($self, $w, $h) = @_;
662
663 $self->SUPER::size_allocate ($w, $h);
664 $self->update;
665}
666
568sub render_chld { 667sub render_child {
569 my ($self) = @_; 668 my ($self) = @_;
570 669
571 $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 {
572 glClearColor 0, 0, 0, 1; 671 glClearColor 0, 0, 0, 0;
573 glClear GL_COLOR_BUFFER_BIT; 672 glClear GL_COLOR_BUFFER_BIT;
574 $self->child->draw; 673 $self->child->draw;
575 }; 674 };
576} 675}
577 676
578sub size_allocate {
579 my ($self, $w, $h) = @_;
580
581 $self->child->configure (0, 0, $w, $h);
582
583 $self->render_chld;
584}
585
586sub _draw { 677sub _draw {
587 my ($self) = @_; 678 my ($self) = @_;
588 679
589 my ($w, $h) = ($self->w, $self->h); 680 my ($w, $h) = ($self->w, $self->h);
590 681
591 my $tex = $self->{texture} 682 my $tex = $self->{texture}
592 or return; 683 or return;
593 684
594 glEnable GL_BLEND; 685 glEnable GL_BLEND;
595 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
596 glEnable GL_TEXTURE_2D; 687 glEnable GL_TEXTURE_2D;
597 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 688 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
689 glColor 0, 0, 0, 1;
598 690
599 $tex->draw_quad (0, 0, $w, $h); 691 $tex->draw_quad (0, 0, $w, $h);
600 692
601 glDisable GL_BLEND; 693 glDisable GL_BLEND;
602 glDisable GL_TEXTURE_2D; 694 glDisable GL_TEXTURE_2D;
… …
643 border => 0.8, 735 border => 0.8,
644 @_ 736 @_
645 ); 737 );
646 738
647 $self 739 $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} 740}
668 741
669sub _draw { 742sub _draw {
670 my ($self) = @_; 743 my ($self) = @_;
671 744
… …
706 my $class = shift; 779 my $class = shift;
707 780
708 # TODO: user_x, user_y, overwrite moveto? 781 # TODO: user_x, user_y, overwrite moveto?
709 782
710 my $self = $class->SUPER::new ( 783 my $self = $class->SUPER::new (
711 bg => [1, 1, 1, 1], 784 bg => [1, 1, 1, 1],
712 border_bg => [1, 1, 1, 1], 785 border_bg => [1, 1, 1, 1],
713 border => 0.8, 786 border => 0.8,
714 can_events => 1, 787 can_events => 1,
715 @_ 788 @_
716 ); 789 );
717 790
718 $self->{title} &&= new CFClient::UI::Label 791 $self->{title} &&= new CFClient::UI::Label
… …
729} 802}
730 803
731sub size_request { 804sub size_request {
732 my ($self) = @_; 805 my ($self) = @_;
733 806
734 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
735
736 my ($w, $h) = $self->SUPER::size_request; 807 my ($w, $h) = $self->SUPER::size_request;
737 808
738 ( 809 (
739 $w + $self->border * 2, 810 $w + $self->border * 2,
740 $h + $self->border * 2, 811 $h + $self->border * 2,
… …
868 $self->{children}[$y][$x] = $child; 939 $self->{children}[$y][$x] = $child;
869 940
870 $child->check_size; 941 $child->check_size;
871} 942}
872 943
944sub children {
945 grep $_, map @$_, grep $_, @{ $_[0]{children} }
946}
947
873# TODO: move to container class maybe? send childs a signal on removal? 948# TODO: move to container class maybe? send childs a signal on removal?
874sub clear { 949sub clear {
875 my ($self) = @_; 950 my ($self) = @_;
876 951
952 my @children = $self->children;
877 delete $self->{children}; 953 delete $self->{children};
954
955 for (@children) {
956 delete $_->{parent};
957 $_->hide;
958 }
959
878 $self->update; 960 $self->update;
879} 961}
880 962
881sub get_wh { 963sub get_wh {
882 my ($self) = @_; 964 my ($self) = @_;
… …
1105 1187
1106sub new { 1188sub new {
1107 my ($class, %arg) = @_; 1189 my ($class, %arg) = @_;
1108 1190
1109 my $self = $class->SUPER::new ( 1191 my $self = $class->SUPER::new (
1110 fg => [1, 1, 1], 1192 fg => [1, 1, 1],
1111 #font => default_font 1193 #font => default_font
1112 fontsize => 1, 1194 fontsize => 1,
1113 text => "", 1195 text => "",
1114 align => -1, 1196 align => -1,
1115 valign => -1, 1197 valign => -1,
1116 padding => 2, 1198 padding => 2,
1117 layout => new CFClient::Layout, 1199 layout => new CFClient::Layout,
1118 can_events => 0, 1200 can_events => 0,
1119 %arg 1201 %arg
1120 ); 1202 );
1121 1203
1122 if (exists $self->{template}) { 1204 if (exists $self->{template}) {
… …
1129 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1211 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1130 1212
1131 $self 1213 $self
1132} 1214}
1133 1215
1134sub escape_text { 1216sub escape {
1135 local $_ = $_[1]; 1217 local $_ = $_[1];
1136 1218
1137 s/&/&amp;/g; 1219 s/&/&amp;/g;
1138 s/>/&gt;/g; 1220 s/>/&gt;/g;
1139 s/</&lt;/g; 1221 s/</&lt;/g;
1140 1222
1141 $_[1] 1223 $_[1]
1142} 1224}
1143 1225
1226sub update {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230 $self->SUPER::update;
1231}
1232
1233sub reconfigure {
1234 my ($self) = @_;
1235
1236 delete $self->{texture};
1237}
1238
1144sub set_text { 1239sub set_text {
1145 my ($self, $text) = @_; 1240 my ($self, $text) = @_;
1146 1241
1242 return if $self->{text} eq "T$text";
1243 $self->{text} = "T$text";
1244
1147 $self->{layout}->set_text ($text); 1245 $self->{layout}->set_text ($text);
1148 1246
1149 delete $self->{texture}; 1247 delete $self->{texture};
1248 $self->update;
1150 $self->check_size; 1249 $self->check_size;
1151 $self->update;
1152} 1250}
1153 1251
1154sub set_markup { 1252sub set_markup {
1155 my ($self, $markup) = @_; 1253 my ($self, $markup) = @_;
1156 1254
1255 return if $self->{text} eq "M$markup";
1256 $self->{text} = "M$markup";
1257
1157 $self->{layout}->set_markup ($markup); 1258 $self->{layout}->set_markup ($markup);
1158 1259
1159 delete $self->{texture}; 1260 delete $self->{texture};
1261 $self->update;
1160 $self->check_size; 1262 $self->check_size;
1161 $self->update;
1162} 1263}
1163 1264
1164sub size_request { 1265sub size_request {
1165 my ($self) = @_; 1266 my ($self) = @_;
1166 1267
… …
1246 1347
1247sub new { 1348sub new {
1248 my $class = shift; 1349 my $class = shift;
1249 1350
1250 $class->SUPER::new ( 1351 $class->SUPER::new (
1251 fg => [1, 1, 1], 1352 fg => [1, 1, 1],
1252 bg => [0, 0, 0, 0.2], 1353 bg => [0, 0, 0, 0.2],
1253 active_bg => [1, 1, 1, 0.5], 1354 active_bg => [1, 1, 1, 0.5],
1254 active_fg => [0, 0, 0], 1355 active_fg => [0, 0, 0],
1255 can_hover => 1, 1356 can_hover => 1,
1256 can_focus => 1, 1357 can_focus => 1,
1257 valign => 0, 1358 valign => 0,
1258 can_events => 1, 1359 can_events => 1,
1259 @_ 1360 @_
1260 ) 1361 )
1261} 1362}
1262 1363
… …
1416 my ($self, $ev) = @_; 1517 my ($self, $ev) = @_;
1417 1518
1418 my $sym = $ev->{sym}; 1519 my $sym = $ev->{sym};
1419 1520
1420 if ($sym == 13) { 1521 if ($sym == 13) {
1522 unshift @{$self->{history}},
1523 my $txt = $self->get_text;
1524 $self->{history_pointer} = -1;
1525 $self->{history_saveback} = '';
1421 $self->emit (activate => $self->get_text); 1526 $self->emit (activate => $txt);
1422 $self->update; 1527 $self->update;
1528
1529 } elsif ($sym == CFClient::SDLK_UP) {
1530 if ($self->{history_pointer} < 0) {
1531 $self->{history_saveback} = $self->get_text;
1532 }
1533 if (@{$self->{history} || []} > 0) {
1534 $self->{history_pointer}++;
1535 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1536 $self->{history_pointer} = @{$self->{history} || []} - 1;
1537 }
1538 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1539 }
1540
1541 } elsif ($sym == CFClient::SDLK_DOWN) {
1542 $self->{history_pointer}--;
1543 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1544
1545 if ($self->{history_pointer} >= 0) {
1546 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1547 } else {
1548 $self->set_text ($self->{history_saveback});
1549 }
1423 1550
1424 } else { 1551 } else {
1425 $self->SUPER::key_down ($ev); 1552 $self->SUPER::key_down ($ev);
1426 } 1553 }
1427 1554
… …
1441 1568
1442sub new { 1569sub new {
1443 my $class = shift; 1570 my $class = shift;
1444 1571
1445 $class->SUPER::new ( 1572 $class->SUPER::new (
1446 padding => 4, 1573 padding => 4,
1447 fg => [1, 1, 1], 1574 fg => [1, 1, 1],
1448 bg => [1, 1, 1, 0.2], 1575 bg => [1, 1, 1, 0.2],
1449 active_fg => [0, 0, 1], 1576 active_fg => [0, 0, 1],
1450 can_hover => 1, 1577 can_hover => 1,
1451 align => 0, 1578 align => 0,
1452 valign => 0, 1579 valign => 0,
1453 can_events => 1, 1580 can_events => 1,
1454 @_ 1581 @_
1455 ) 1582 )
1456} 1583}
1457 1584
… …
1616 1743
1617package CFClient::UI::VGauge; 1744package CFClient::UI::VGauge;
1618 1745
1619our @ISA = CFClient::UI::Base::; 1746our @ISA = CFClient::UI::Base::;
1620 1747
1748use List::Util qw(min max);
1749
1621use CFClient::OpenGL; 1750use CFClient::OpenGL;
1622 1751
1623my %tex = ( 1752my %tex = (
1624 food => [ 1753 food => [
1625 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1754 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1626 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1755 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1627 ], 1756 ],
1628 grace => [ 1757 grace => [
1629 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1758 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1630 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1759 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1631 ], 1760 ],
1632 hp => [ 1761 hp => [
1633 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1762 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1634 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1763 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1635 ], 1764 ],
1636 mana => [ 1765 mana => [
1637 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1766 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1638 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1767 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1639 ], 1768 ],
1640); 1769);
1641 1770
1642# eg. VGauge->new (gauge => 'food'), default gauge: food 1771# eg. VGauge->new (gauge => 'food'), default gauge: food
1643sub new { 1772sub new {
… …
1662} 1791}
1663 1792
1664sub set_max { 1793sub set_max {
1665 my ($self, $max) = @_; 1794 my ($self, $max) = @_;
1666 1795
1796 return if $self->{max_val} == $max;
1797
1667 $self->{max_val} = $max; 1798 $self->{max_val} = $max;
1799 $self->update;
1668} 1800}
1669 1801
1670sub set_value { 1802sub set_value {
1671 my ($self, $val, $max) = @_; 1803 my ($self, $val, $max) = @_;
1672 1804
1673 $self->set_max ($max) 1805 $self->set_max ($max)
1674 if defined $max; 1806 if defined $max;
1675 1807
1676 $max = $self->{max_val}; 1808 return if $self->{val} == $val;
1809
1677 $self->{val} = $val; 1810 $self->{val} = $val;
1678
1679 $self->update; 1811 $self->update;
1680} 1812}
1681 1813
1682sub _draw { 1814sub _draw {
1683 my ($self) = @_; 1815 my ($self) = @_;
1684 1816
1685 my $tex = $tex{$self->{type}}; 1817 my $tex = $tex{$self->{type}};
1818 my ($t1, $t2, $t3) = @$tex;
1686 1819
1687 my ($w, $h) = ($self->{w}, $self->{h}); 1820 my ($w, $h) = ($self->{w}, $self->{h});
1688 1821
1689 if ($self->{vertical}) { 1822 if ($self->{vertical}) {
1690 glRotate 90, 0, 0, 1; 1823 glRotate 90, 0, 0, 1;
… …
1692 1825
1693 ($w, $h) = ($h, $w); 1826 ($w, $h) = ($h, $w);
1694 } 1827 }
1695 1828
1696 my $ycut = $self->{val} / ($self->{max_val} || 1); 1829 my $ycut = $self->{val} / ($self->{max_val} || 1);
1697 $ycut = 1 if $self->{val} > $self->{max_val};
1698 1830
1699 my $t1 = $tex->[0]; 1831 my $ycut1 = max 0, min 1, $ycut;
1700 my $t2 = $tex->[1]; 1832 my $ycut2 = max 0, min 1, $ycut - 1;
1833
1834 my $h1 = $self->{h} * (1 - $ycut1);
1835 my $h2 = $self->{h} * (1 - $ycut2);
1701 1836
1702 glEnable GL_BLEND; 1837 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1704 glEnable GL_TEXTURE_2D; 1839 glEnable GL_TEXTURE_2D;
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1706 1841
1707 my $h1 = $self->{h} - $ycut * $self->{h};
1708 my $h2 = $ycut * $self->{h};
1709
1710 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1842 glBindTexture GL_TEXTURE_2D, $t1->{name};
1711 glBegin GL_QUADS; 1843 glBegin GL_QUADS;
1712 glTexCoord 0 , 0; glVertex 0 , 0; 1844 glTexCoord 0 , 0; glVertex 0 , 0;
1713 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1845 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1714 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1846 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1715 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1847 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1716 glEnd; 1848 glEnd;
1717 1849
1850 my $ycut1 = List::Util::min 1, $ycut;
1718 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1851 glBindTexture GL_TEXTURE_2D, $t2->{name};
1719 glBegin GL_QUADS; 1852 glBegin GL_QUADS;
1720 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1853 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1721 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1854 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1722 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1855 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1723 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1856 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1724 glEnd; 1857 glEnd;
1858
1859 if ($t3) {
1860 glBindTexture GL_TEXTURE_2D, $t3->{name};
1861 glBegin GL_QUADS;
1862 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1863 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1864 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1865 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1866 glEnd;
1867 }
1725 1868
1726 glDisable GL_BLEND; 1869 glDisable GL_BLEND;
1727 glDisable GL_TEXTURE_2D; 1870 glDisable GL_TEXTURE_2D;
1728} 1871}
1729 1872
… …
1735 1878
1736sub new { 1879sub new {
1737 my ($class, %arg) = @_; 1880 my ($class, %arg) = @_;
1738 1881
1739 my $self = $class->SUPER::new ( 1882 my $self = $class->SUPER::new (
1740 tooltip => $arg{type}, 1883 tooltip => $arg{type},
1884 can_hover => 1,
1885 can_events => 1,
1741 %arg, 1886 %arg,
1742 ); 1887 );
1743 1888
1744 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1889 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1745 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 1890 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1746 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 1891 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1747 1892
1748 $self 1893 $self
1749} 1894}
1750 1895
1751sub set_fontsize { 1896sub set_fontsize {
… …
1753 1898
1754 $self->{value}->set_fontsize ($fsize); 1899 $self->{value}->set_fontsize ($fsize);
1755 $self->{max} ->set_fontsize ($fsize); 1900 $self->{max} ->set_fontsize ($fsize);
1756} 1901}
1757 1902
1903sub set_max {
1904 my ($self, $max) = @_;
1905
1906 $self->{gauge}->set_max ($max);
1907 $self->{max}->set_text ($max);
1908}
1909
1758sub set_value { 1910sub set_value {
1759 my ($self, $val, $max) = @_; 1911 my ($self, $val, $max) = @_;
1760 1912
1761 $self->set_max ($max) 1913 $self->set_max ($max)
1762 if defined $max; 1914 if defined $max;
1763 1915
1764 $self->{gauge}->set_value ($val, $max); 1916 $self->{gauge}->set_value ($val, $max);
1765 $self->{value}->set_text ($val); 1917 $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} 1918}
1774 1919
1775############################################################################# 1920#############################################################################
1776 1921
1777package CFClient::UI::Slider; 1922package CFClient::UI::Slider;
… …
1917 2062
1918sub new { 2063sub new {
1919 my $class = shift; 2064 my $class = shift;
1920 2065
1921 my $self = $class->SUPER::new ( 2066 my $self = $class->SUPER::new (
1922 fontsize => 1, 2067 fontsize => 1,
2068 can_events => 0,
1923 #font => default_font 2069 #font => default_font
1924 @_, 2070 @_,
1925 2071
1926 layout => (new CFClient::Layout), 2072 layout => (new CFClient::Layout),
1927 par => [], 2073 par => [],
1928 height => 0, 2074 height => 0,
1929 children => [ 2075 children => [
1930 (new CFClient::UI::Empty expand => 1), 2076 (new CFClient::UI::Empty expand => 1),
1931 (new CFClient::UI::Slider vertical => 1), 2077 (new CFClient::UI::Slider vertical => 1),
1932 ], 2078 ],
1933 ); 2079 );
1934 2080
… …
2059 my ($self) = @_; 2205 my ($self) = @_;
2060 2206
2061 if ($self->{texture}) { 2207 if ($self->{texture}) {
2062 glEnable GL_TEXTURE_2D; 2208 glEnable GL_TEXTURE_2D;
2063 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2209 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2210 glColor 1, 1, 1, 1;
2064 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2211 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
2065 glDisable GL_TEXTURE_2D; 2212 glDisable GL_TEXTURE_2D;
2066 } 2213 }
2067 2214
2068 $self->{children}[1]->draw; 2215 $self->{children}[1]->draw;
… …
2119 2266
2120sub new { 2267sub new {
2121 my $class = shift; 2268 my $class = shift;
2122 2269
2123 my $self = $class->SUPER::new ( 2270 my $self = $class->SUPER::new (
2124 state => 0, 2271 state => 0,
2125 connect_activate => \&toggle_flopper, 2272 connect_activate => \&toggle_flopper,
2126 can_events => 1,
2127 @_ 2273 @_
2128 ); 2274 );
2129 2275
2130 if ($self->{state}) { 2276 if ($self->{state}) {
2131 $self->{state} = 0; 2277 $self->{state} = 0;
… …
2166 @_, 2312 @_,
2167 can_events => 0, 2313 can_events => 0,
2168 ) 2314 )
2169} 2315}
2170 2316
2171sub set_text { 2317sub set_markup {
2172 my ($self, $text) = @_; 2318 my ($self, $text) = @_;
2173 2319
2174 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2320 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2175 $self->{label}->set_text ($text); 2321 $self->{label}->set_markup ($text);
2176 $self->add ($self->{label}); 2322 $self->add ($self->{label});
2177} 2323}
2178 2324
2179sub size_request { 2325sub size_request {
2180 my ($self) = @_; 2326 my ($self) = @_;
2181 2327
2182 $self->child->set_max_size ($::WIDTH * 0.2); 2328 $self->child->set_max_size ($::WIDTH * 0.3);
2183 2329
2184 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2330 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2185 2331
2186 ($w + 4, $h + 4) 2332 ($w + 4, $h + 4)
2333}
2334
2335sub size_allocate {
2336 my ($self, $w, $h) = @_;
2337
2338 $self->SUPER::size_allocate ($w - 4, $h - 4);
2187} 2339}
2188 2340
2189sub _draw { 2341sub _draw {
2190 my ($self) = @_; 2342 my ($self) = @_;
2191 2343
… …
2216 $self->SUPER::_draw; 2368 $self->SUPER::_draw;
2217} 2369}
2218 2370
2219############################################################################# 2371#############################################################################
2220 2372
2373package CFClient::UI::Face;
2374
2375our @ISA = CFClient::UI::Base::;
2376
2377use CFClient::OpenGL;
2378
2379sub new {
2380 my $class = shift;
2381
2382 $class->SUPER::new (
2383 aspect => 1,
2384 @_,
2385 )
2386}
2387
2388sub size_request {
2389 (32, 8)
2390}
2391
2392sub draw {
2393 my ($self) = @_;
2394
2395 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2396
2397 if ($tex) {
2398 glEnable GL_BLEND;
2399 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2400 glEnable GL_TEXTURE_2D;
2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2402 glColor 1, 1, 1, 1;
2403 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2404 glDisable GL_TEXTURE_2D;
2405 glDisable GL_BLEND;
2406 }
2407}
2408
2409#############################################################################
2410
2221package CFClient::UI::Root; 2411package CFClient::UI::Root;
2222 2412
2223our @ISA = CFClient::UI::Container::; 2413our @ISA = CFClient::UI::Container::;
2224 2414
2225use CFClient::OpenGL; 2415use CFClient::OpenGL;

Diff Legend

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