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.155 by root, Sun Apr 23 02:22:54 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
… …
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
262sub set_max_size {
263 my ($self, $w, $h) = @_;
264
265 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h;
267}
268
216# return top left coordinates 269# return top left coordinates
217sub _topleft { 270sub _topleft {
218 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
219 275
220 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
221} 277}
222 278
223# translate global coordinates to local coordinate system 279# translate global coordinates to local coordinate system
… …
301 glVertex $x + $self->{w}, $y + $self->{h}; 357 glVertex $x + $self->{w}, $y + $self->{h};
302 glVertex $x , $y + $self->{h}; 358 glVertex $x , $y + $self->{h};
303 glEnd; 359 glEnd;
304 glDisable GL_BLEND; 360 glDisable GL_BLEND;
305 } 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 }
306} 376}
307 377
308sub _draw { 378sub _draw {
309 my ($self) = @_; 379 my ($self) = @_;
310 380
… …
330} 400}
331 401
332sub check_size { 402sub check_size {
333 my ($self) = @_; 403 my ($self) = @_;
334 404
335 return unless $self->{parent}; 405 $self->{parent}
406 or return 1;
336 407
337 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;
338 411
339 if ($w != $self->{req_w} || $h != $self->{req_h}) { 412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
340 $self->{req_w} = $w; 413 $self->{req_w} = $w;
341 $self->{req_h} = $h; 414 $self->{req_h} = $h;
342 415
343 $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
344 } 425 }
345} 426}
346 427
347sub update { 428sub update {
348 my ($self) = @_; 429 my ($self) = @_;
… …
358} 439}
359 440
360sub emit { 441sub emit {
361 my ($self, $signal, @args) = @_; 442 my ($self, $signal, @args) = @_;
362 443
363 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
364 $cb->($self, @args);
365 }
366} 445}
367 446
368sub DESTROY { 447sub DESTROY {
369 my ($self) = @_; 448 my ($self) = @_;
370 449
… …
437sub new { 516sub new {
438 my ($class, %arg) = @_; 517 my ($class, %arg) = @_;
439 518
440 my $children = delete $arg{children} || []; 519 my $children = delete $arg{children} || [];
441 520
442 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 );
443 $self->add ($_) for @$children; 526 $self->add ($_) for @$children;
444 527
445 $self 528 $self
446} 529}
447 530
… …
458 ]; 541 ];
459 542
460 $child->check_size; 543 $child->check_size;
461} 544}
462 545
546sub children {
547 @{ $_[0]{children} }
548}
549
463sub remove { 550sub remove {
464 my ($self, $child) = @_; 551 my ($self, $child) = @_;
465 552
466 delete $child->{parent}; 553 delete $child->{parent};
554 $child->hide;
467 555
468 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
469 557
470 $self->check_size; 558 $self->check_size;
471 $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 }
472} 572}
473 573
474sub find_widget { 574sub find_widget {
475 my ($self, $x, $y) = @_; 575 my ($self, $x, $y) = @_;
476 576
… …
551} 651}
552 652
553sub update { 653sub update {
554 my ($self) = @_; 654 my ($self) = @_;
555 655
556 # we want to do this delayed... 656 $ROOT->on_refresh ($self => sub { $self->render_child });
557 $self->render_chld;
558 $self->SUPER::update; 657 $self->SUPER::update;
559} 658}
560 659
660sub size_allocate {
661 my ($self, $w, $h) = @_;
662
663 $self->SUPER::size_allocate ($w, $h);
664 $self->update;
665}
666
561sub render_chld { 667sub render_child {
562 my ($self) = @_; 668 my ($self) = @_;
563 669
564 $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 {
565 glClearColor 0, 0, 0, 1; 671 glClearColor 0, 0, 0, 0;
566 glClear GL_COLOR_BUFFER_BIT; 672 glClear GL_COLOR_BUFFER_BIT;
567 $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;
568 }; 681 };
569}
570
571sub size_allocate {
572 my ($self, $w, $h) = @_;
573
574 $self->child->configure (0, 0, $w, $h);
575
576 $self->render_chld;
577} 682}
578 683
579sub _draw { 684sub _draw {
580 my ($self) = @_; 685 my ($self) = @_;
581 686
… …
583 688
584 my $tex = $self->{texture} 689 my $tex = $self->{texture}
585 or return; 690 or return;
586 691
587 glEnable GL_BLEND; 692 glEnable GL_BLEND;
588 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
589 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
590 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;
591 697
592 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad (0, 0, $w, $h);
593 699
594 glDisable GL_BLEND; 700 glDisable GL_BLEND;
595 glDisable GL_TEXTURE_2D; 701 glDisable GL_TEXTURE_2D;
… …
636 border => 0.8, 742 border => 0.8,
637 @_ 743 @_
638 ); 744 );
639 745
640 $self 746 $self
641}
642
643sub set_size {
644 my ($self, $w, $h) = @_;
645 $self->{req_w} = $w;
646 $self->{req_h} = $h;
647 $self->check_size;
648}
649
650sub size_request {
651 my ($self) = @_;
652 ($self->{req_w}, $self->{req_h})
653}
654
655sub size_allocate {
656 my ($self, $w, $h) = @_;
657 $self->{w} = $w;
658 $self->{h} = $h;
659 $self->child->configure (0, 0, $w, $h);
660} 747}
661 748
662sub _draw { 749sub _draw {
663 my ($self) = @_; 750 my ($self) = @_;
664 751
… …
699 my $class = shift; 786 my $class = shift;
700 787
701 # TODO: user_x, user_y, overwrite moveto? 788 # TODO: user_x, user_y, overwrite moveto?
702 789
703 my $self = $class->SUPER::new ( 790 my $self = $class->SUPER::new (
704 bg => [1, 1, 1, 1], 791 bg => [1, 1, 1, 1],
705 border_bg => [1, 1, 1, 1], 792 border_bg => [1, 1, 1, 1],
706 border => 0.8, 793 border => 0.8,
707 can_events => 1, 794 can_events => 1,
708 @_ 795 @_
709 ); 796 );
710 797
711 $self->{title} &&= new CFClient::UI::Label 798 $self->{title} &&= new CFClient::UI::Label
… …
722} 809}
723 810
724sub size_request { 811sub size_request {
725 my ($self) = @_; 812 my ($self) = @_;
726 813
727 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
728
729 my ($w, $h) = $self->SUPER::size_request; 814 my ($w, $h) = $self->SUPER::size_request;
730 815
731 ( 816 (
732 $w + $self->border * 2, 817 $w + $self->border * 2,
733 $h + $self->border * 2, 818 $h + $self->border * 2,
… …
861 $self->{children}[$y][$x] = $child; 946 $self->{children}[$y][$x] = $child;
862 947
863 $child->check_size; 948 $child->check_size;
864} 949}
865 950
951sub children {
952 grep $_, map @$_, grep $_, @{ $_[0]{children} }
953}
954
866# 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?
867sub clear { 956sub clear {
868 my ($self) = @_; 957 my ($self) = @_;
869 958
959 my @children = $self->children;
870 delete $self->{children}; 960 delete $self->{children};
961
962 for (@children) {
963 delete $_->{parent};
964 $_->hide;
965 }
966
871 $self->update; 967 $self->update;
872} 968}
873 969
874sub get_wh { 970sub get_wh {
875 my ($self) = @_; 971 my ($self) = @_;
… …
1098 1194
1099sub new { 1195sub new {
1100 my ($class, %arg) = @_; 1196 my ($class, %arg) = @_;
1101 1197
1102 my $self = $class->SUPER::new ( 1198 my $self = $class->SUPER::new (
1103 fg => [1, 1, 1], 1199 fg => [1, 1, 1],
1200 #font => default_font
1104 fontsize => 1, 1201 fontsize => 1,
1105 text => "", 1202 text => "",
1106 align => -1, 1203 align => -1,
1107 valign => -1, 1204 valign => -1,
1108 padding => 2, 1205 padding => 2,
1109 layout => new CFClient::Layout, 1206 layout => new CFClient::Layout,
1110 can_events => 0, 1207 can_events => 0,
1111 %arg 1208 %arg
1112 ); 1209 );
1113 1210
1114 if (exists $self->{template}) { 1211 if (exists $self->{template}) {
… …
1121 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1218 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1122 1219
1123 $self 1220 $self
1124} 1221}
1125 1222
1126sub escape_text { 1223sub escape {
1127 local $_ = $_[1]; 1224 local $_ = $_[1];
1128 1225
1129 s/&/&amp;/g; 1226 s/&/&amp;/g;
1130 s/>/&gt;/g; 1227 s/>/&gt;/g;
1131 s/</&lt;/g; 1228 s/</&lt;/g;
1132 1229
1133 $_[1] 1230 $_[1]
1134} 1231}
1135 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
1136sub set_text { 1246sub set_text {
1137 my ($self, $text) = @_; 1247 my ($self, $text) = @_;
1138 1248
1249 return if $self->{text} eq "T$text";
1250 $self->{text} = "T$text";
1251
1139 $self->{layout}->set_text ($text); 1252 $self->{layout}->set_text ($text);
1140 1253
1141 delete $self->{texture}; 1254 delete $self->{texture};
1255 $self->update;
1142 $self->check_size; 1256 $self->check_size;
1143 $self->update;
1144} 1257}
1145 1258
1146sub set_markup { 1259sub set_markup {
1147 my ($self, $markup) = @_; 1260 my ($self, $markup) = @_;
1148 1261
1262 return if $self->{text} eq "M$markup";
1263 $self->{text} = "M$markup";
1264
1149 $self->{layout}->set_markup ($markup); 1265 $self->{layout}->set_markup ($markup);
1150 1266
1151 delete $self->{texture}; 1267 delete $self->{texture};
1268 $self->update;
1152 $self->check_size; 1269 $self->check_size;
1153 $self->update;
1154} 1270}
1155 1271
1156sub size_request { 1272sub size_request {
1157 my ($self) = @_; 1273 my ($self) = @_;
1158 1274
1159 $self->{layout}->set_width; 1275 $self->{layout}->set_font ($self->{font}) if $self->{font};
1276 $self->{layout}->set_width ($self->{max_w} || -1);
1160 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1277 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1278
1162 my ($w, $h) = $self->{layout}->size; 1279 my ($w, $h) = $self->{layout}->size;
1163 1280
1164 if (exists $self->{template}) { 1281 if (exists $self->{template}) {
1282 $self->{template}->set_font ($self->{font}) if $self->{font};
1165 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1283 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1166 1284
1167 my ($w2, $h2) = $self->{template}->size; 1285 my ($w2, $h2) = $self->{template}->size;
1168 1286
1169 $w = List::Util::max $w, $w2; 1287 $w = List::Util::max $w, $w2;
… …
1193 1311
1194sub _draw { 1312sub _draw {
1195 my ($self) = @_; 1313 my ($self) = @_;
1196 1314
1197 my $tex = $self->{texture} ||= do { 1315 my $tex = $self->{texture} ||= do {
1316 $self->{layout}->set_font ($self->{font}) if $self->{font};
1198 $self->{layout}->set_width ($self->{w}); 1317 $self->{layout}->set_width ($self->{w});
1199 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1318 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1200 new_from_layout CFClient::Texture $self->{layout} 1319 new_from_layout CFClient::Texture $self->{layout}
1201 }; 1320 };
1202 1321
… …
1235 1354
1236sub new { 1355sub new {
1237 my $class = shift; 1356 my $class = shift;
1238 1357
1239 $class->SUPER::new ( 1358 $class->SUPER::new (
1240 fg => [1, 1, 1], 1359 fg => [1, 1, 1],
1241 bg => [0, 0, 0, 0.2], 1360 bg => [0, 0, 0, 0.2],
1242 active_bg => [1, 1, 1, 0.5], 1361 active_bg => [1, 1, 1, 0.5],
1243 active_fg => [0, 0, 0], 1362 active_fg => [0, 0, 0],
1244 can_hover => 1, 1363 can_hover => 1,
1245 can_focus => 1, 1364 can_focus => 1,
1246 valign => 0, 1365 valign => 0,
1247 can_events => 1, 1366 can_events => 1,
1248 @_ 1367 @_
1249 ) 1368 )
1250} 1369}
1251 1370
… …
1405 my ($self, $ev) = @_; 1524 my ($self, $ev) = @_;
1406 1525
1407 my $sym = $ev->{sym}; 1526 my $sym = $ev->{sym};
1408 1527
1409 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} = '';
1410 $self->emit (activate => $self->get_text); 1533 $self->emit (activate => $txt);
1411 $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 }
1412 1557
1413 } else { 1558 } else {
1414 $self->SUPER::key_down ($ev); 1559 $self->SUPER::key_down ($ev);
1415 } 1560 }
1416 1561
… …
1430 1575
1431sub new { 1576sub new {
1432 my $class = shift; 1577 my $class = shift;
1433 1578
1434 $class->SUPER::new ( 1579 $class->SUPER::new (
1435 padding => 4, 1580 padding => 4,
1436 fg => [1, 1, 1], 1581 fg => [1, 1, 1],
1437 bg => [1, 1, 1, 0.2], 1582 bg => [1, 1, 1, 0.2],
1438 active_fg => [0, 0, 1], 1583 active_fg => [0, 0, 1],
1439 can_hover => 1, 1584 can_hover => 1,
1440 align => 0, 1585 align => 0,
1441 valign => 0, 1586 valign => 0,
1442 can_events => 1, 1587 can_events => 1,
1443 @_ 1588 @_
1444 ) 1589 )
1445} 1590}
1446 1591
… …
1605 1750
1606package CFClient::UI::VGauge; 1751package CFClient::UI::VGauge;
1607 1752
1608our @ISA = CFClient::UI::Base::; 1753our @ISA = CFClient::UI::Base::;
1609 1754
1755use List::Util qw(min max);
1756
1610use CFClient::OpenGL; 1757use CFClient::OpenGL;
1611 1758
1612my %tex = ( 1759my %tex = (
1613 food => [ 1760 food => [
1614 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1761 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1615 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1762 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1616 ], 1763 ],
1617 grace => [ 1764 grace => [
1618 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1765 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1619 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1766 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1620 ], 1767 ],
1621 hp => [ 1768 hp => [
1622 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1769 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1623 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1770 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1624 ], 1771 ],
1625 mana => [ 1772 mana => [
1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1773 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1627 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1774 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1628 ], 1775 ],
1629); 1776);
1630 1777
1631# eg. VGauge->new (gauge => 'food'), default gauge: food 1778# eg. VGauge->new (gauge => 'food'), default gauge: food
1632sub new { 1779sub new {
… …
1651} 1798}
1652 1799
1653sub set_max { 1800sub set_max {
1654 my ($self, $max) = @_; 1801 my ($self, $max) = @_;
1655 1802
1803 return if $self->{max_val} == $max;
1804
1656 $self->{max_val} = $max; 1805 $self->{max_val} = $max;
1806 $self->update;
1657} 1807}
1658 1808
1659sub set_value { 1809sub set_value {
1660 my ($self, $val, $max) = @_; 1810 my ($self, $val, $max) = @_;
1661 1811
1662 $self->set_max ($max) 1812 $self->set_max ($max)
1663 if defined $max; 1813 if defined $max;
1664 1814
1665 $max = $self->{max_val}; 1815 return if $self->{val} == $val;
1816
1666 $self->{val} = $val; 1817 $self->{val} = $val;
1667
1668 $self->update; 1818 $self->update;
1669} 1819}
1670 1820
1671sub _draw { 1821sub _draw {
1672 my ($self) = @_; 1822 my ($self) = @_;
1673 1823
1674 my $tex = $tex{$self->{type}}; 1824 my $tex = $tex{$self->{type}};
1825 my ($t1, $t2, $t3) = @$tex;
1675 1826
1676 my ($w, $h) = ($self->{w}, $self->{h}); 1827 my ($w, $h) = ($self->{w}, $self->{h});
1677 1828
1678 if ($self->{vertical}) { 1829 if ($self->{vertical}) {
1679 glRotate 90, 0, 0, 1; 1830 glRotate 90, 0, 0, 1;
… …
1681 1832
1682 ($w, $h) = ($h, $w); 1833 ($w, $h) = ($h, $w);
1683 } 1834 }
1684 1835
1685 my $ycut = $self->{val} / ($self->{max_val} || 1); 1836 my $ycut = $self->{val} / ($self->{max_val} || 1);
1686 $ycut = 1 if $self->{val} > $self->{max_val};
1687 1837
1688 my $t1 = $tex->[0]; 1838 my $ycut1 = max 0, min 1, $ycut;
1689 my $t2 = $tex->[1]; 1839 my $ycut2 = max 0, min 1, $ycut - 1;
1840
1841 my $h1 = $self->{h} * (1 - $ycut1);
1842 my $h2 = $self->{h} * (1 - $ycut2);
1690 1843
1691 glEnable GL_BLEND; 1844 glEnable GL_BLEND;
1692 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1693 glEnable GL_TEXTURE_2D; 1846 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 1848
1696 my $h1 = $self->{h} - $ycut * $self->{h};
1697 my $h2 = $ycut * $self->{h};
1698
1699 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1849 glBindTexture GL_TEXTURE_2D, $t1->{name};
1700 glBegin GL_QUADS; 1850 glBegin GL_QUADS;
1701 glTexCoord 0 , 0; glVertex 0 , 0; 1851 glTexCoord 0 , 0; glVertex 0 , 0;
1702 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1852 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1853 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1704 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1854 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1705 glEnd; 1855 glEnd;
1706 1856
1857 my $ycut1 = List::Util::min 1, $ycut;
1707 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1858 glBindTexture GL_TEXTURE_2D, $t2->{name};
1708 glBegin GL_QUADS; 1859 glBegin GL_QUADS;
1709 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1860 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1710 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1861 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1711 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1862 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1712 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1863 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1713 glEnd; 1864 glEnd;
1865
1866 if ($t3) {
1867 glBindTexture GL_TEXTURE_2D, $t3->{name};
1868 glBegin GL_QUADS;
1869 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1870 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1871 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1872 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1873 glEnd;
1874 }
1714 1875
1715 glDisable GL_BLEND; 1876 glDisable GL_BLEND;
1716 glDisable GL_TEXTURE_2D; 1877 glDisable GL_TEXTURE_2D;
1717} 1878}
1718 1879
… …
1724 1885
1725sub new { 1886sub new {
1726 my ($class, %arg) = @_; 1887 my ($class, %arg) = @_;
1727 1888
1728 my $self = $class->SUPER::new ( 1889 my $self = $class->SUPER::new (
1729 tooltip => $arg{type}, 1890 tooltip => $arg{type},
1891 can_hover => 1,
1892 can_events => 1,
1730 %arg, 1893 %arg,
1731 ); 1894 );
1732 1895
1733 $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");
1734 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1897 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1735 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 1898 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1736 1899
1737 $self 1900 $self
1738} 1901}
1739 1902
… …
1742 1905
1743 $self->{value}->set_fontsize ($fsize); 1906 $self->{value}->set_fontsize ($fsize);
1744 $self->{max} ->set_fontsize ($fsize); 1907 $self->{max} ->set_fontsize ($fsize);
1745} 1908}
1746 1909
1910sub set_max {
1911 my ($self, $max) = @_;
1912
1913 $self->{gauge}->set_max ($max);
1914 $self->{max}->set_text ($max);
1915}
1916
1747sub set_value { 1917sub set_value {
1748 my ($self, $val, $max) = @_; 1918 my ($self, $val, $max) = @_;
1749 1919
1750 $self->set_max ($max) 1920 $self->set_max ($max)
1751 if defined $max; 1921 if defined $max;
1752 1922
1753 $self->{gauge}->set_value ($val, $max); 1923 $self->{gauge}->set_value ($val, $max);
1754 $self->{value}->set_text ($val); 1924 $self->{value}->set_text ($val);
1755}
1756
1757sub set_max {
1758 my ($self, $max) = @_;
1759
1760 $self->{gauge}->set_max ($max);
1761 $self->{max}->set_text ($max);
1762} 1925}
1763 1926
1764############################################################################# 1927#############################################################################
1765 1928
1766package CFClient::UI::Slider; 1929package CFClient::UI::Slider;
… …
1906 2069
1907sub new { 2070sub new {
1908 my $class = shift; 2071 my $class = shift;
1909 2072
1910 my $self = $class->SUPER::new ( 2073 my $self = $class->SUPER::new (
1911 fontsize => 1, 2074 fontsize => 1,
2075 can_events => 0,
2076 #font => default_font
1912 @_, 2077 @_,
1913 2078
1914 layout => (new CFClient::Layout), 2079 layout => (new CFClient::Layout),
1915 par => [], 2080 par => [],
1916 height => 0, 2081 height => 0,
1917 children => [ 2082 children => [
1918 (new CFClient::UI::Empty expand => 1), 2083 (new CFClient::UI::Empty expand => 1),
1919 (new CFClient::UI::Slider vertical => 1), 2084 (new CFClient::UI::Slider vertical => 1),
1920 ], 2085 ],
1921 ); 2086 );
1922 2087
… …
1956sub size_allocate { 2121sub size_allocate {
1957 my ($self, $w, $h) = @_; 2122 my ($self, $w, $h) = @_;
1958 2123
1959 $self->SUPER::size_allocate ($w, $h); 2124 $self->SUPER::size_allocate ($w, $h);
1960 2125
2126 $self->{layout}->set_font ($self->{font}) if $self->{font};
1961 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2127 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1962 $self->{layout}->set_width ($self->{children}[0]{w}); 2128 $self->{layout}->set_width ($self->{children}[0]{w});
1963 2129
1964 $self->reflow; 2130 $self->reflow;
1965} 2131}
… …
2001 2167
2002 delete $self->{texture}; 2168 delete $self->{texture};
2003 } 2169 }
2004 2170
2005 $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 {
2006 glClearColor 0, 0, 0, 1; 2172 glClearColor 0, 0, 0, 0;
2007 glClear GL_COLOR_BUFFER_BIT; 2173 glClear GL_COLOR_BUFFER_BIT;
2008 2174
2009 glEnable GL_BLEND; 2175 glEnable GL_BLEND;
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2176 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2011 glEnable GL_TEXTURE_2D; 2177 glEnable GL_TEXTURE_2D;
… …
2018 2184
2019 my $y = 0; 2185 my $y = 0;
2020 2186
2021 my $layout = $self->{layout}; 2187 my $layout = $self->{layout};
2022 2188
2189 $layout->set_font ($self->{font}) if $self->{font};
2190
2023 for my $par (@{$self->{par}}) { 2191 for my $par (@{$self->{par}}) {
2024 my $h = $par->[0]; 2192 my $h = $par->[0];
2025 2193
2026 if ($y0 < $y + $h && $y < $y1) { 2194 if ($y0 < $y + $h && $y < $y1) {
2027 $layout->set_text ($par->[2]); 2195 $layout->set_text ($par->[2]);
… …
2042 2210
2043sub _draw { 2211sub _draw {
2044 my ($self) = @_; 2212 my ($self) = @_;
2045 2213
2046 if ($self->{texture}) { 2214 if ($self->{texture}) {
2215 glEnable GL_BLEND;
2216 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2047 glEnable GL_TEXTURE_2D; 2217 glEnable GL_TEXTURE_2D;
2048 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;
2049 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2220 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
2050 glDisable GL_TEXTURE_2D; 2221 glDisable GL_TEXTURE_2D;
2222 glDisable GL_BLEND;
2051 } 2223 }
2052 2224
2053 $self->{children}[1]->draw; 2225 $self->{children}[1]->draw;
2054 2226
2055} 2227}
… …
2104 2276
2105sub new { 2277sub new {
2106 my $class = shift; 2278 my $class = shift;
2107 2279
2108 my $self = $class->SUPER::new ( 2280 my $self = $class->SUPER::new (
2109 state => 0, 2281 state => 0,
2110 connect_activate => \&toggle_flopper, 2282 connect_activate => \&toggle_flopper,
2111 can_events => 1,
2112 @_ 2283 @_
2113 ); 2284 );
2114 2285
2115 if ($self->{state}) { 2286 if ($self->{state}) {
2116 $self->{state} = 0; 2287 $self->{state} = 0;
… …
2151 @_, 2322 @_,
2152 can_events => 0, 2323 can_events => 0,
2153 ) 2324 )
2154} 2325}
2155 2326
2156sub set_text { 2327sub set_markup {
2157 my ($self, $text) = @_; 2328 my ($self, $text) = @_;
2158 2329
2159 $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];
2160 $self->{label}->set_text ($text); 2331 $self->{label}->set_markup ($text);
2161 $self->add ($self->{label}); 2332 $self->add ($self->{label});
2162} 2333}
2163 2334
2164sub size_request { 2335sub size_request {
2165 my ($self) = @_; 2336 my ($self) = @_;
2166 2337
2338 $self->child->set_max_size ($::WIDTH * 0.3);
2339
2167 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2340 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2168 2341
2169 $w = List::Util::min $::WIDTH * 0.2, $w;
2170 $h = List::Util::max $::HEIGHT * 0.2, $h;
2171
2172 ($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);
2173} 2349}
2174 2350
2175sub _draw { 2351sub _draw {
2176 my ($self) = @_; 2352 my ($self) = @_;
2177 2353
… …
2202 $self->SUPER::_draw; 2378 $self->SUPER::_draw;
2203} 2379}
2204 2380
2205############################################################################# 2381#############################################################################
2206 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
2207package CFClient::UI::Root; 2421package CFClient::UI::Root;
2208 2422
2209our @ISA = CFClient::UI::Container::; 2423our @ISA = CFClient::UI::Container::;
2210 2424
2211use CFClient::OpenGL; 2425use CFClient::OpenGL;

Diff Legend

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