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.182 by root, Sun Apr 30 11:17:08 2006 UTC vs.
Revision 1.208 by root, Mon May 15 22:52:17 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
15 18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_markup ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 32 $TOOLTIP->show;
31 33
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 35
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
37 38
38 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
39 } 42 }
40 43
41 return; 44 return;
42 } 45 }
43 } 46 }
… …
130 133
131 for (@$vals) { 134 for (@$vals) {
132 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
133 $rem += $_ - $i; 136 $rem += $_ - $i;
134 $_ = $i; 137 $_ = $i;
138 }
139}
140
141# call when resolution changes etc.
142sub rescale_widgets {
143 my ($sx, $sy) = @_;
144
145 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155 }
156
157 $widget->reconfigure;
135 } 158 }
136} 159}
137 160
138############################################################################# 161#############################################################################
139 162
… …
158 if (/^connect_(.*)$/) { 181 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 182 $self->connect ($1 => delete $self->{$_});
160 } 183 }
161 } 184 }
162 185
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
163 $self 188 $self
164} 189}
165 190
166sub destroy { 191sub destroy {
167 my ($self) = @_; 192 my ($self) = @_;
… …
232 $self->{y} = $y; 257 $self->{y} = $y;
233 $self->update; 258 $self->update;
234 } 259 }
235 260
236 if ($self->{w} != $w || $self->{h} != $h) { 261 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 $self->emit (size_allocate => $w, $h);
243 } 263 }
244} 264}
245 265
246sub size_allocate { 266sub size_allocate {
247 # nothing to be done 267 # nothing to be done
248} 268}
249 269
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
250sub children { 277sub children {
251}
252
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $_->check_size;
261} 278}
262 279
263sub set_max_size { 280sub set_max_size {
264 my ($self, $w, $h) = @_; 281 my ($self, $w, $h) = @_;
265 282
266 delete $self->{max_w}; $self->{max_w} = $w if $w; 283 delete $self->{max_w}; $self->{max_w} = $w if $w;
267 delete $self->{max_h}; $self->{max_h} = $h if $h; 284 delete $self->{max_h}; $self->{max_h} = $h if $h;
268}
269
270# return top left coordinates
271sub _topleft {
272 my ($self, $x, $y) = @_;
273
274 $self->{parent}
275 or Carp::confess "no parent widget in _topleft\n";#d#
276
277 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
278} 285}
279 286
280# translate global coordinates to local coordinate system 287# translate global coordinates to local coordinate system
281sub coord2local { 288sub coord2local {
282 my ($self, $x, $y) = @_; 289 my ($self, $x, $y) = @_;
283 290
284 my ($X, $Y) = $self->_topleft; 291 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285 ($x - $X, $y - $Y)
286} 292}
287 293
288# translate local coordinates to global coordinate system 294# translate local coordinates to global coordinate system
289sub coord2global { 295sub coord2global {
290 my ($self, $x, $y) = @_; 296 my ($self, $x, $y) = @_;
291 297
292 my ($X, $Y) = $self->_topleft; 298 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293 ($x + $X, $y + $Y)
294} 299}
295 300
296sub focus_in { 301sub focus_in {
297 my ($self) = @_; 302 my ($self) = @_;
298 303
… …
370 glVertex $self->{w}, 0; 375 glVertex $self->{w}, 0;
371 glVertex $self->{w}, $self->{h}; 376 glVertex $self->{w}, $self->{h};
372 glVertex 0 , $self->{h}; 377 glVertex 0 , $self->{h};
373 glEnd; 378 glEnd;
374 glPopMatrix; 379 glPopMatrix;
375 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 380 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
376 } 381 }
377} 382}
378 383
379sub _draw { 384sub _draw {
380 my ($self) = @_; 385 my ($self) = @_;
… …
396 401
397sub set_parent { 402sub set_parent {
398 my ($self, $parent) = @_; 403 my ($self, $parent) = @_;
399 404
400 Scalar::Util::weaken ($self->{parent} = $parent); 405 Scalar::Util::weaken ($self->{parent} = $parent);
406
407 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size
409 unless exists $self->{req_w};
401} 410}
402 411
403sub check_size { 412sub check_size {
404 my ($self) = @_; 413 my ($self, $forced) = @_;
405 414
406 $self->{parent} 415 $self->{force_alloc} = 1 if $forced;
407 or return 1; 416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
408
409 my ($w, $h) = $self->{user_w} && $self->{user_h}
410 ? @$self{qw(user_w user_h)}
411 : $self->size_request;
412
413 if ($w != $self->{req_w} || $h != $self->{req_h}) {
414 $self->{req_w} = $w;
415 $self->{req_h} = $h;
416
417 $self->{parent}->check_size
418 or $self->size_allocate (
419 (List::Util::max $self->{w}, $w),
420 (List::Util::max $self->{h}, $h),
421 );
422
423 1
424 } else {
425 0
426 }
427} 417}
428 418
429sub update { 419sub update {
430 my ($self) = @_; 420 my ($self) = @_;
431 421
… …
446} 436}
447 437
448sub DESTROY { 438sub DESTROY {
449 my ($self) = @_; 439 my ($self) = @_;
450 440
441 delete $WIDGET{$self+0};
451 #$self->deactivate; 442 #$self->deactivate;
452} 443}
453 444
454############################################################################# 445#############################################################################
455 446
… …
528 519
529 $self 520 $self
530} 521}
531 522
532sub add { 523sub add {
533 my ($self, $child) = @_; 524 my ($self, @widgets) = @_;
534 525
535 $child->set_parent ($self); 526 $_->set_parent ($self)
527 for @widgets;
536 528
537 use sort 'stable'; 529 use sort 'stable';
538 530
539 $self->{children} = [ 531 $self->{children} = [
540 sort { $a->{z} <=> $b->{z} } 532 sort { $a->{z} <=> $b->{z} }
541 @{$self->{children}}, $child 533 @{$self->{children}}, @widgets
542 ]; 534 ];
543 535
544 $child->check_size; 536 $self->check_size (1);
545 $self->update; 537 $self->update;
546} 538}
547 539
548sub children { 540sub children {
549 @{ $_[0]{children} } 541 @{ $_[0]{children} }
… …
656} 648}
657 649
658sub update { 650sub update {
659 my ($self) = @_; 651 my ($self) = @_;
660 652
661 $ROOT->on_refresh ($self => sub { $self->render_child }); 653 $ROOT->on_post_alloc ($self => sub { $self->render_child });
662 $self->SUPER::update; 654 $self->SUPER::update;
663} 655}
664 656
665sub size_allocate { 657sub size_allocate {
666 my ($self, $w, $h) = @_; 658 my ($self, $w, $h) = @_;
… …
697 my ($w, $h) = ($self->w, $self->h); 689 my ($w, $h) = ($self->w, $self->h);
698 690
699 my $tex = $self->{texture} 691 my $tex = $self->{texture}
700 or return; 692 or return;
701 693
702 glEnable GL_BLEND;
703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1; 696 glColor 0, 0, 0, 1;
707 697
708 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709 699
710 glDisable GL_BLEND;
711 glDisable GL_TEXTURE_2D; 700 glDisable GL_TEXTURE_2D;
712} 701}
713 702
714############################################################################# 703#############################################################################
715 704
… …
737 726
738 $self->{view_x} = int $x; 727 $self->{view_x} = int $x;
739 $self->{view_y} = int $y; 728 $self->{view_y} = int $y;
740 729
741 $self->update; 730 $self->update;
731}
732
733# hmm, this does not work for topleft of $self... but we should not ask for that
734sub coord2local {
735 my ($self, $x, $y) = @_;
736
737 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
738}
739
740sub coord2global {
741 my ($self, $x, $y) = @_;
742
743 $x = List::Util::min $self->{w}, $x - $self->{view_x};
744 $y = List::Util::min $self->{h}, $y - $self->{view_y};
745
746 $self->SUPER::coord2global ($x, $y)
747}
748
749sub find_widget {
750 my ($self, $x, $y) = @_;
751
752 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
753 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
754 ) {
755 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
756 } else {
757 $self->CFClient::UI::Base::find_widget ($x, $y)
758 }
742} 759}
743 760
744sub _render { 761sub _render {
745 my ($self) = @_; 762 my ($self) = @_;
746 763
… …
779 $self->add ($self->{slider}); 796 $self->add ($self->{slider});
780 797
781 $self 798 $self
782} 799}
783 800
784#TODO# update range on size_allocate depeneing on child 801#TODO# update range on size_allocate depending on child
785# update viewport offset on scroll 802# update viewport offset on scroll
786 803
787############################################################################# 804#############################################################################
788 805
789package CFClient::UI::Frame; 806package CFClient::UI::Frame;
… …
793use CFClient::OpenGL; 810use CFClient::OpenGL;
794 811
795sub new { 812sub new {
796 my $class = shift; 813 my $class = shift;
797 814
798 my $self = $class->SUPER::new ( 815 $class->SUPER::new (
799 bg => [1, 1, 1, 1], 816 bg => undef,
800 border_bg => [1, 1, 1, 1],
801 border => 0.8,
802 @_ 817 @_,
803 ); 818 )
804
805 $self
806} 819}
807 820
808sub _draw { 821sub _draw {
809 my ($self) = @_; 822 my ($self) = @_;
810 823
811 my ($w, $h) = ($self->{w}, $self->{h}); 824 if ($self->{bg}) {
825 my ($w, $h) = @$self{qw(w h)};
812 826
813 glEnable GL_BLEND; 827 glEnable GL_BLEND;
814 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
815 glEnable GL_TEXTURE_2D; 829 glColor @{ $self->{bg} };
816 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
817 830
818# glBegin GL_QUADS; 831 glBegin GL_QUADS;
819# glColor 0, 0, 0, 0;
820# glVertex 0 , 0; 832 glVertex 0 , 0;
821# glVertex 0 , $h; 833 glVertex 0 , $h;
822# glVertex $w, $h; 834 glVertex $w, $h;
823# glVertex $w, 0; 835 glVertex $w, 0;
824# glEnd; 836 glEnd;
825 837
826
827 $self->child->draw;
828 glDisable GL_BLEND; 838 glDisable GL_BLEND;
829 glDisable GL_TEXTURE_2D; 839 }
840
841 $self->SUPER::_draw;
830} 842}
831 843
832############################################################################# 844#############################################################################
833 845
834package CFClient::UI::FancyFrame; 846package CFClient::UI::FancyFrame;
… …
848 860
849 my $self = $class->SUPER::new ( 861 my $self = $class->SUPER::new (
850 bg => [1, 1, 1, 1], 862 bg => [1, 1, 1, 1],
851 border_bg => [1, 1, 1, 1], 863 border_bg => [1, 1, 1, 1],
852 border => 0.6, 864 border => 0.6,
865 toplevel => 1,
853 can_events => 1, 866 can_events => 1,
854 @_ 867 @_
855 ); 868 );
856 869
857 $self->{title} &&= new CFClient::UI::Label 870 $self->{title} &&= new CFClient::UI::Label
… …
882 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
883 896
884 $h -= List::Util::max 0, $self->border * 2; 897 $h -= List::Util::max 0, $self->border * 2;
885 $w -= List::Util::max 0, $self->border * 2; 898 $w -= List::Util::max 0, $self->border * 2;
886 899
887 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 900 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
888 if $self->{title}; 901 if $self->{title};
889 902
890 $self->child->configure ($self->border, $self->border, $w, $h); 903 $self->child->configure ($self->border, $self->border, $w, $h);
891} 904}
892 905
… …
950 my ($self) = @_; 963 my ($self) = @_;
951 964
952 my ($w, $h ) = ($self->{w}, $self->{h}); 965 my ($w, $h ) = ($self->{w}, $self->{h});
953 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
954 967
955 glEnable GL_BLEND;
956 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
957 glEnable GL_TEXTURE_2D; 968 glEnable GL_TEXTURE_2D;
958 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
959 970
960 my $border = $self->border; 971 my $border = $self->border;
961 972
962 glColor @{ $self->{border_bg} }; 973 glColor @{ $self->{border_bg} };
963 $tex[1]->draw_quad (0, 0, $w, $border); 974 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
964 $tex[3]->draw_quad (0, $border, $border, $ch); 975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
965 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
966 $tex[4]->draw_quad (0, $h - $border, $w, $border); 977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
967 978
968 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
969 my $bg = $tex[0]; 980 my $bg = $tex[0];
970 981
971 # TODO: repeat texture not scale 982 # TODO: repeat texture not scale
… …
975 glColor @{ $self->{bg} }; 986 glColor @{ $self->{bg} };
976 987
977 $bg->{s} = $rep_x; 988 $bg->{s} = $rep_x;
978 $bg->{t} = $rep_y; 989 $bg->{t} = $rep_y;
979 $bg->{wrap_mode} = 1; 990 $bg->{wrap_mode} = 1;
980 $bg->draw_quad ($border, $border, $cw, $ch); 991 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 }
981 993
982 glDisable GL_TEXTURE_2D; 994 glDisable GL_TEXTURE_2D;
983 glDisable GL_BLEND;
984 }
985 995
986 $self->{title}->draw if $self->{title}; 996 $self->{title}->draw if $self->{title};
987 997
988 $self->child->draw; 998 $self->child->draw;
989} 999}
… …
1216} 1226}
1217 1227
1218sub size_allocate { 1228sub size_allocate {
1219 my ($self, $w, $h) = @_; 1229 my ($self, $w, $h) = @_;
1220 1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1221 my $children = $self->{children}; 1233 my $children = $self->{children};
1222 1234
1223 my @h = map $_->{req_h}, @$children; 1235 my @h = map $_->{req_h}, @$children;
1224 1236
1225 my $req_h = List::Util::sum @h; 1237 my $req_h = List::Util::sum @h;
… …
1264 my ($class, %arg) = @_; 1276 my ($class, %arg) = @_;
1265 1277
1266 my $self = $class->SUPER::new ( 1278 my $self = $class->SUPER::new (
1267 fg => [1, 1, 1], 1279 fg => [1, 1, 1],
1268 #font => default_font 1280 #font => default_font
1281 #text => initial text
1282 #markup => initial narkup
1283 layout => (new CFClient::Layout),
1269 fontsize => 1, 1284 fontsize => 1,
1270 text => "",
1271 align => -1, 1285 align => -1,
1272 valign => -1, 1286 valign => -1,
1273 padding => 2, 1287 padding => 2,
1274 layout => new CFClient::Layout,
1275 can_events => 0, 1288 can_events => 0,
1276 %arg 1289 %arg
1277 ); 1290 );
1278 1291
1279 if (exists $self->{template}) { 1292 if (exists $self->{template}) {
1280 my $layout = new CFClient::Layout; 1293 my $layout = new CFClient::Layout;
1281 $layout->set_text (delete $self->{template}); 1294 $layout->set_text (delete $self->{template});
1282 $self->{template} = $layout; 1295 $self->{template} = $layout;
1283 } 1296 }
1284 1297
1285 $self->set_text (delete $self->{text}) if exists $self->{text}; 1298 if (exists $self->{markup}) {
1286 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1299 $self->set_markup (delete $self->{markup});
1300 } else {
1301 $self->set_text (delete $self->{text});
1302 }
1287 1303
1288 $self 1304 $self
1289} 1305}
1290 1306
1291sub escape { 1307sub escape {
… …
1303 1319
1304 delete $self->{texture}; 1320 delete $self->{texture};
1305 $self->SUPER::update; 1321 $self->SUPER::update;
1306} 1322}
1307 1323
1308sub reconfigure {
1309 my ($self) = @_;
1310
1311 delete $self->{texture};
1312}
1313
1314sub set_text { 1324sub set_text {
1315 my ($self, $text) = @_; 1325 my ($self, $text) = @_;
1316 1326
1317 return if $self->{text} eq "T$text"; 1327 return if $self->{text} eq "T$text";
1318 $self->{text} = "T$text"; 1328 $self->{text} = "T$text";
1319 1329
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1320 $self->{layout}->set_text ($text); 1331 $self->{layout}->set_text ($text);
1321 1332
1322 delete $self->{texture};
1323 $self->update; 1333 $self->update;
1324 $self->check_size; 1334 $self->check_size;
1325} 1335}
1326 1336
1327sub set_markup { 1337sub set_markup {
1328 my ($self, $markup) = @_; 1338 my ($self, $markup) = @_;
1329 1339
1330 return if $self->{text} eq "M$markup"; 1340 return if $self->{text} eq "M$markup";
1331 $self->{text} = "M$markup"; 1341 $self->{text} = "M$markup";
1332 1342
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344
1345 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1333 $self->{layout}->set_markup ($markup); 1346 $self->{layout}->set_markup ($markup);
1334 1347
1335 delete $self->{texture};
1336 $self->update; 1348 $self->update;
1337 $self->check_size; 1349 $self->check_size;
1338} 1350}
1339 1351
1340sub size_request { 1352sub size_request {
… …
1371sub set_fontsize { 1383sub set_fontsize {
1372 my ($self, $fontsize) = @_; 1384 my ($self, $fontsize) = @_;
1373 1385
1374 $self->{fontsize} = $fontsize; 1386 $self->{fontsize} = $fontsize;
1375 delete $self->{texture}; 1387 delete $self->{texture};
1388
1389 $self->update;
1376 $self->check_size; 1390 $self->check_size;
1377 $self->update;
1378} 1391}
1379 1392
1380sub _draw { 1393sub _draw {
1381 my ($self) = @_; 1394 my ($self) = @_;
1382 1395
1383 my $tex = $self->{texture} ||= do { 1396 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}});
1384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1398 $self->{layout}->set_font ($self->{font}) if $self->{font};
1385 $self->{layout}->set_width ($self->{w}); 1399 $self->{layout}->set_width ($self->{w});
1386 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1401
1387 new_from_layout CFClient::Texture $self->{layout} 1402 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403
1404 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406 : ($self->{w} - $tex->{w}) * 0.5);
1407
1408 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410 : ($self->{h} - $tex->{h}) * 0.5);
1411
1412 $tex
1388 }; 1413 };
1389 1414
1390 glEnable GL_BLEND;
1391 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1392 glEnable GL_TEXTURE_2D; 1415 glEnable GL_TEXTURE_2D;
1393 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1394 1417
1418 if ($tex->{format} == GL_ALPHA) {
1395 glColor @{$self->{fg}}; 1419 glColor @{$self->{fg}};
1396
1397 $self->{ox} = int (
1398 $self->{align} < 0 ? $self->{padding}
1399 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1400 : ($self->{w} - $tex->{w}) * 0.5
1401 );
1402
1403 $self->{oy} = int (
1404 $self->{valign} < 0 ? $self->{padding}
1405 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1406 : ($self->{h} - $tex->{h}) * 0.5
1407 );
1408
1409 $tex->draw_quad ($self->{ox}, $self->{oy}); 1420 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1421 } else {
1422 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1423 }
1410 1424
1411 glDisable GL_TEXTURE_2D; 1425 glDisable GL_TEXTURE_2D;
1412 glDisable GL_BLEND;
1413} 1426}
1414 1427
1415############################################################################# 1428#############################################################################
1416 1429
1417package CFClient::UI::EntryBase; 1430package CFClient::UI::EntryBase;
… …
1452 $self->{layout}->set_text ("$text "); 1465 $self->{layout}->set_text ("$text ");
1453 1466
1454 $self->emit (changed => $self->{text}); 1467 $self->emit (changed => $self->{text});
1455} 1468}
1456 1469
1457sub get_text {
1458 $_[0]{text}
1459}
1460
1461sub size_request {
1462 my ($self) = @_;
1463
1464 my ($w, $h) = $self->SUPER::size_request;
1465
1466 ($w + 1, $h) # add 1 for cursor
1467}
1468
1469sub size_allocate {
1470 my ($self, $w, $h) = @_;
1471
1472 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1473}
1474
1475sub set_text { 1470sub set_text {
1476 my ($self, $text) = @_; 1471 my ($self, $text) = @_;
1477 1472
1478 $self->{cursor} = length $text; 1473 $self->{cursor} = length $text;
1479 $self->_set_text ($text); 1474 $self->_set_text ($text);
1480 $self->update; 1475 $self->update;
1476 $self->check_size;
1477}
1478
1479sub get_text {
1480 $_[0]{text}
1481}
1482
1483sub size_request {
1484 my ($self) = @_;
1485
1486 my ($w, $h) = $self->SUPER::size_request;
1487
1488 ($w + 1, $h) # add 1 for cursor
1489}
1490
1491sub size_allocate {
1492 my ($self, $w, $h) = @_;
1493
1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1481} 1495}
1482 1496
1483sub key_down { 1497sub key_down {
1484 my ($self, $ev) = @_; 1498 my ($self, $ev) = @_;
1485 1499
… …
1487 my $sym = $ev->{sym}; 1501 my $sym = $ev->{sym};
1488 my $uni = $ev->{unicode}; 1502 my $uni = $ev->{unicode};
1489 1503
1490 my $text = $self->get_text; 1504 my $text = $self->get_text;
1491 1505
1492 if ($sym == 8) { 1506 if ($uni == 8) {
1493 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1507 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1494 } elsif ($sym == 127) { 1508 } elsif ($uni == 127) {
1495 substr $text, $self->{cursor}, 1, ""; 1509 substr $text, $self->{cursor}, 1, "";
1496 } elsif ($sym == CFClient::SDLK_LEFT) { 1510 } elsif ($sym == CFClient::SDLK_LEFT) {
1497 --$self->{cursor} if $self->{cursor}; 1511 --$self->{cursor} if $self->{cursor};
1498 } elsif ($sym == CFClient::SDLK_RIGHT) { 1512 } elsif ($sym == CFClient::SDLK_RIGHT) {
1499 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1513 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1500 } elsif ($sym == CFClient::SDLK_HOME) { 1514 } elsif ($sym == CFClient::SDLK_HOME) {
1501 $self->{cursor} = 0; 1515 $self->{cursor} = 0;
1502 } elsif ($sym == CFClient::SDLK_END) { 1516 } elsif ($sym == CFClient::SDLK_END) {
1503 $self->{cursor} = length $text; 1517 $self->{cursor} = length $text;
1504 } elsif ($sym == 27) { 1518 } elsif ($uni == 27) {
1505 $self->emit ('escape'); 1519 $self->emit ('escape');
1506 } elsif ($uni) { 1520 } elsif ($uni) {
1507 substr $text, $self->{cursor}++, 0, chr $uni; 1521 substr $text, $self->{cursor}++, 0, chr $uni;
1508 } 1522 }
1509 1523
1510 $self->_set_text ($text); 1524 $self->_set_text ($text);
1511 $self->update; 1525 $self->update;
1526 $self->check_size;
1512} 1527}
1513 1528
1514sub focus_in { 1529sub focus_in {
1515 my ($self) = @_; 1530 my ($self) = @_;
1516 1531
… …
1673 1688
1674 if ($GRAB == $self) { 1689 if ($GRAB == $self) {
1675 $self->{fg} = $self->{active_fg}; 1690 $self->{fg} = $self->{active_fg};
1676 } 1691 }
1677 1692
1678 glEnable GL_BLEND;
1679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1680 glEnable GL_TEXTURE_2D; 1693 glEnable GL_TEXTURE_2D;
1681 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1682 glColor 0, 0, 0, 1; 1695 glColor 0, 0, 0, 1;
1683 1696
1684 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1697 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1685 1698
1686 glDisable GL_TEXTURE_2D; 1699 glDisable GL_TEXTURE_2D;
1687 glDisable GL_BLEND;
1688 1700
1689 $self->SUPER::_draw; 1701 $self->SUPER::_draw;
1690} 1702}
1691 1703
1692############################################################################# 1704#############################################################################
… …
1739 1751
1740 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1752 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1741 1753
1742 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1743 1755
1744 glEnable GL_BLEND; 1756 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757
1745 glEnable GL_TEXTURE_2D; 1758 glEnable GL_TEXTURE_2D;
1746 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1747
1748 my $tex = $self->{state} ? $tex[1] : $tex[0];
1749
1750 $tex->draw_quad (0, 0, $s, $s); 1759 $tex->draw_quad_alpha (0, 0, $s, $s);
1751
1752 glDisable GL_TEXTURE_2D; 1760 glDisable GL_TEXTURE_2D;
1753 glDisable GL_BLEND;
1754} 1761}
1755 1762
1756############################################################################# 1763#############################################################################
1757 1764
1758package CFClient::UI::Image; 1765package CFClient::UI::Image;
… …
1801 glTranslate 0, -$self->{w}, 0; 1808 glTranslate 0, -$self->{w}, 0;
1802 1809
1803 ($w, $h) = ($h, $w); 1810 ($w, $h) = ($h, $w);
1804 } 1811 }
1805 1812
1806 glEnable GL_BLEND;
1807 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1808 glEnable GL_TEXTURE_2D; 1813 glEnable GL_TEXTURE_2D;
1809 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1810 1815
1811 $tex->draw_quad (0, 0, $w, $h); 1816 $tex->draw_quad_alpha (0, 0, $w, $h);
1812 1817
1813 glDisable GL_BLEND;
1814 glDisable GL_TEXTURE_2D; 1818 glDisable GL_TEXTURE_2D;
1815} 1819}
1816 1820
1817############################################################################# 1821#############################################################################
1818 1822
… …
2007 qw(s1_slider.png s1_slider_bg.png); 2011 qw(s1_slider.png s1_slider_bg.png);
2008 2012
2009sub new { 2013sub new {
2010 my $class = shift; 2014 my $class = shift;
2011 2015
2012 # range [value, low, high, page] 2016 # range [value, low, high, page, unit]
2013 2017
2014 # TODO: 0-width page 2018 # TODO: 0-width page
2015 # TODO: req_w/h are wrong with vertical 2019 # TODO: req_w/h are wrong with vertical
2016 # TODO: calculations are off 2020 # TODO: calculations are off
2017 my $self = $class->SUPER::new ( 2021 my $self = $class->SUPER::new (
… …
2020 range => [0, 0, 100, 10], 2024 range => [0, 0, 100, 10],
2021 req_w => $::WIDTH / 80, 2025 req_w => $::WIDTH / 80,
2022 req_h => $::WIDTH / 80, 2026 req_h => $::WIDTH / 80,
2023 vertical => 0, 2027 vertical => 0,
2024 can_hover => 1, 2028 can_hover => 1,
2025 inner_pad => 5, 2029 inner_pad => .05,
2026 @_ 2030 @_
2027 ); 2031 );
2028 2032
2033 $self->set_value ($self->{range}[0]);
2034 $self->update;
2035
2029 $self 2036 $self
2037}
2038
2039sub set_value {
2040 my ($self, $value) = @_;
2041
2042 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2043
2044 $hi = $lo + 1 if $hi <= $lo;
2045
2046 $value = $lo if $value < $lo;
2047 $value = $hi if $value > $hi;
2048
2049 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2050 if $unit;
2051
2052 $page = $hi - $lo if $page > $hi - $lo;
2053
2054 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2055
2056 if ($value != $old_value) {
2057 $self->emit (changed => $value);
2058 $self->update;
2059 }
2030} 2060}
2031 2061
2032sub size_request { 2062sub size_request {
2033 my ($self) = @_; 2063 my ($self) = @_;
2034 2064
… …
2047 2077
2048sub mouse_motion { 2078sub mouse_motion {
2049 my ($self, $ev, $x, $y) = @_; 2079 my ($self, $ev, $x, $y) = @_;
2050 2080
2051 if ($GRAB == $self) { 2081 if ($GRAB == $self) {
2082 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2083
2084 my (undef, $lo, $hi, $page) = @{$self->{range}};
2085
2086 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2087
2088 $self->set_value ($x * ($hi - $lo) + $lo);
2089 }
2090}
2091
2092sub update {
2093 my ($self) = @_;
2094
2095 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2096 $self->set_value ($self->{range}[0]);
2097
2052 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2098 my ($value, $lo, $hi, $page) = @{$self->{range}};
2053 2099
2054 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2100 my $inner_w = 1 - 2 * $self->{inner_pad};
2055 2101
2056 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2102 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2057 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2058 2103
2059 $x -= $inner_pad_px; # substract the padding 2104 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2060 $x = $x * ($hi - $lo) / $inner_w + $lo; 2105 $value = $self->{scale} * ($value - $lo);
2061 $x = $lo if $x < $lo;
2062 $x = $hi - $page if $x > $hi - $page;
2063 $self->{range}[0] = $x;
2064 2106
2065 $self->emit (changed => $x); 2107 $value = $self->{inner_pad} + ($value - $page * 0.5);
2066 $self->update; 2108
2109 $value = 0 if $value < 0;
2110 $page = 1 - $value if $value + $page > 1;
2111
2112 $self->{knob_x} = $value;
2113 $self->{knob_w} = $page;
2067 } 2114 });
2068}
2069 2115
2070# the inner_* stuff is for generating a padding for the slider handle, 2116 $self->SUPER::update;
2071# so that the handle doesn't leave the texture. This calculation isn't 100%
2072# correct propably, but it does the job for now
2073sub _calc_inner_pad_px {
2074 my ($self, $w) = @_;
2075 ($w / 100) * $self->{inner_pad} # % to pixels
2076} 2117}
2077 2118
2078sub _draw { 2119sub _draw {
2079 my ($self) = @_; 2120 my ($self) = @_;
2080 2121
2081 $self->SUPER::_draw (); 2122 $self->SUPER::_draw ();
2082 2123
2083 my ($w, $h) = @$self{qw(w h)}; 2124 glScale $self->{w}, $self->{h};
2084 2125
2085 if ($self->{vertical}) { 2126 if ($self->{vertical}) {
2086 # draw a vertical slider like a rotated horizontal slider 2127 # draw a vertical slider like a rotated horizontal slider
2087 2128
2088 glRotate 90, 0, 0, 1; 2129 glRotate 90, 0, 0, 1;
2089 glTranslate 0, -$self->{w}, 0; 2130 glTranslate 0, 1, 0;
2090
2091 ($w, $h) = ($h, $w);
2092 } 2131 }
2093 2132
2094 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2133 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2095 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2134 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2096 2135
2097 my ($value, $lo, $hi, $page) = @{$self->{range}};
2098
2099 $hi = $value + 1 if $lo == $hi;
2100
2101 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2102 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2103
2104 $page = int $page * $inner_w / ($hi - $lo);
2105 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2106
2107 $w -= $page;
2108 $page &= ~1;
2109 glTranslate $page * 0.5, 0, 0;
2110 $page ||= 2;
2111
2112 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2113 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2114
2115 glEnable GL_BLEND;
2116 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2117 glEnable GL_TEXTURE_2D; 2136 glEnable GL_TEXTURE_2D;
2118 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2119 2138
2120 # draw background 2139 # draw background
2121 $tex[1]->draw_quad (0, 0, $w, $h); 2140 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2122 2141
2123 # draw handle 2142 # draw handle
2124 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2143 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2125 2144
2126 glDisable GL_BLEND;
2127 glDisable GL_TEXTURE_2D; 2145 glDisable GL_TEXTURE_2D;
2128} 2146}
2129 2147
2130############################################################################# 2148#############################################################################
2131 2149
… …
2142 fontsize => 1, 2160 fontsize => 1,
2143 can_events => 0, 2161 can_events => 0,
2144 #font => default_font 2162 #font => default_font
2145 @_, 2163 @_,
2146 2164
2147 layout => (new CFClient::Layout), 2165 layout => (new CFClient::Layout 1),
2148 par => [], 2166 par => [],
2149 height => 0, 2167 height => 0,
2150 children => [ 2168 children => [
2151 (new CFClient::UI::Empty expand => 1), 2169 (new CFClient::UI::Empty expand => 1),
2152 (new CFClient::UI::Slider vertical => 1), 2170 (new CFClient::UI::Slider vertical => 1),
… …
2170 2188
2171 my $layout = $self->{layout}; 2189 my $layout = $self->{layout};
2172 2190
2173 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2191 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2174 $layout->set_width ($self->{children}[0]{w}); 2192 $layout->set_width ($self->{children}[0]{w});
2175 $layout->set_text ($text); 2193 $layout->set_markup ($text);
2176 2194
2177 ($layout->size)[1] 2195 ($layout->size)[1]
2178} 2196}
2179 2197
2180sub reflow { 2198sub reflow {
… …
2218 2236
2219 return unless $self->{h} > 0; 2237 return unless $self->{h} > 0;
2220 2238
2221 delete $self->{texture}; 2239 delete $self->{texture};
2222 2240
2223 $ROOT->on_refresh ($self, sub { 2241 $ROOT->on_post_alloc ($self, sub {
2224 if (delete $self->{need_reflow}) { 2242 if (delete $self->{need_reflow}) {
2225 my $height = 0; 2243 my $height = 0;
2226 2244
2227 $height += $_->[0] = $self->text_height ($_->[2]) 2245 $height += $_->[0] = $self->text_height ($_->[2])
2228 for @{$self->{par}}; 2246 for @{$self->{par}};
… …
2236 2254
2237 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2255 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2238 glClearColor 0, 0, 0, 0; 2256 glClearColor 0, 0, 0, 0;
2239 glClear GL_COLOR_BUFFER_BIT; 2257 glClear GL_COLOR_BUFFER_BIT;
2240 2258
2241 glEnable GL_BLEND;
2242 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2243 glEnable GL_TEXTURE_2D; 2259 glEnable GL_TEXTURE_2D;
2244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2245 2261
2246 my $top = int $self->{children}[1]{range}[0]; 2262 my $top = int $self->{children}[1]{range}[0];
2247 2263
… …
2256 2272
2257 for my $par (@{$self->{par}}) { 2273 for my $par (@{$self->{par}}) {
2258 my $h = $par->[0]; 2274 my $h = $par->[0];
2259 2275
2260 if ($y0 < $y + $h && $y < $y1) { 2276 if ($y0 < $y + $h && $y < $y1) {
2277 $layout->set_foreground (@{ $par->[1] });
2261 $layout->set_text ($par->[2]); 2278 $layout->set_markup ($par->[2]);
2262 2279
2263 glColor @{ $par->[1] };
2264 my ($W, $H) = $layout->size; 2280 my ($W, $H) = $layout->size;
2265 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2281 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2266 } 2282 }
2267 2283
2268 $y += $h; 2284 $y += $h;
2269 } 2285 }
2270 2286
2271 glDisable GL_TEXTURE_2D; 2287 glDisable GL_TEXTURE_2D;
2272 glDisable GL_BLEND;
2273 }; 2288 };
2274 }); 2289 });
2275} 2290}
2276 2291
2277sub _draw { 2292sub _draw {
2278 my ($self) = @_; 2293 my ($self) = @_;
2279 2294
2280 glEnable GL_BLEND;
2281 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2282 glEnable GL_TEXTURE_2D; 2295 glEnable GL_TEXTURE_2D;
2283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2284 glColor 1, 1, 1, 1; 2297 glColor 1, 1, 1, 1;
2285 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2298 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2286 glDisable GL_TEXTURE_2D; 2299 glDisable GL_TEXTURE_2D;
2287 glDisable GL_BLEND;
2288 2300
2289 $self->{children}[1]->draw; 2301 $self->{children}[1]->draw;
2290 2302
2291} 2303}
2292 2304
… …
2386 @_, 2398 @_,
2387 can_events => 0, 2399 can_events => 0,
2388 ) 2400 )
2389} 2401}
2390 2402
2391sub set_markup { 2403sub set_tooltip_from {
2392 my ($self, $text) = @_; 2404 my ($self, $widget) = @_;
2393 2405
2394 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2406 $self->add (new CFClient::UI::Label
2395 $self->{label}->set_markup ($text); 2407 markup => $widget->{tooltip},
2396 $self->add ($self->{label}); 2408 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2409 fontsize => 0.8,
2410 fg => [0, 0, 0, 1],
2411 font => ($widget->{tooltip_font} || $::FONT_PROP),
2412 );
2397} 2413}
2398 2414
2399sub size_request { 2415sub size_request {
2400 my ($self) = @_; 2416 my ($self) = @_;
2401
2402 $self->child->set_max_size ($::WIDTH * 0.3);
2403 2417
2404 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2418 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2405 2419
2406 ($w + 4, $h + 4) 2420 ($w + 4, $h + 4)
2407} 2421}
… …
2413} 2427}
2414 2428
2415sub _draw { 2429sub _draw {
2416 my ($self) = @_; 2430 my ($self) = @_;
2417 2431
2418 glPushMatrix;
2419 glTranslate 0.375, 0.375; 2432 glTranslate 0.375, 0.375;
2420 2433
2421 my ($w, $h) = @$self{qw(w h)}; 2434 my ($w, $h) = @$self{qw(w h)};
2422 2435
2423 glColor 1, 0.8, 0.4; 2436 glColor 1, 0.8, 0.4;
… …
2434 glVertex 0 , $h; 2447 glVertex 0 , $h;
2435 glVertex $w, $h; 2448 glVertex $w, $h;
2436 glVertex $w, 0; 2449 glVertex $w, 0;
2437 glEnd; 2450 glEnd;
2438 2451
2439 glPopMatrix; 2452 glTranslate 2 - 0.375, 2 - 0.375;
2440
2441 glTranslate 2, 2;
2442 $self->SUPER::_draw; 2453 $self->SUPER::_draw;
2443} 2454}
2444 2455
2445############################################################################# 2456#############################################################################
2446 2457
… …
2464} 2475}
2465 2476
2466sub _draw { 2477sub _draw {
2467 my ($self) = @_; 2478 my ($self) = @_;
2468 2479
2480 return unless $::CONN;#d# manage and cache textures differently
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2481 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2470 2482
2471 # TODO animation 2483 # TODO animation
2472 if ($tex) { 2484 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D; 2485 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1; 2487 glColor 1, 1, 1, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2488 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D; 2489 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND;
2481 } 2490 }
2491}
2492
2493#############################################################################
2494
2495package CFClient::UI::InventoryItem;
2496
2497our @ISA = CFClient::UI::HBox::;
2498
2499sub new {
2500 my $class = shift;
2501
2502 my %args = @_;
2503
2504 my $item = delete $args{item};
2505
2506 my $desc = $item->{nrof} < 2
2507 ? $item->{name}
2508 : "$item->{nrof} $item->{name_pl}";
2509
2510 $item->{flags} & Crossfire::Protocol::F_OPEN
2511 and $desc .= " (open)";
2512 $item->{flags} & Crossfire::Protocol::F_APPLIED
2513 and $desc .= " (applied)";
2514 $item->{flags} & Crossfire::Protocol::F_UNPAID
2515 and $desc .= " (unpaid)";
2516 $item->{flags} & Crossfire::Protocol::F_MAGIC
2517 and $desc .= " (magic)";
2518 $item->{flags} & Crossfire::Protocol::F_CURSED
2519 and $desc .= " (cursed)";
2520 $item->{flags} & Crossfire::Protocol::F_DAMNED
2521 and $desc .= " (damned)";
2522 $item->{flags} & Crossfire::Protocol::F_LOCKED
2523 and $desc .= " *";
2524
2525 my $self = $class->SUPER::new (
2526 can_hover => 1,
2527 can_events => 1,
2528 tooltip => (CFClient::UI::Label->escape ($desc)
2529 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2530 connect_button_down => sub {
2531 my ($self, $ev, $x, $y) = @_;
2532
2533 # todo: maybe put examine on 1? but should just be a tooltip :(
2534 if ($ev->{button} == 1) {
2535 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2536 } elsif ($ev->{button} == 2) {
2537 $::CONN->send ("apply $item->{tag}");
2538 } elsif ($ev->{button} == 3) {
2539 my @menu_items = (
2540 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2541 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2542 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2543 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2544 [
2545 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2546 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2547 ],
2548 );
2549
2550 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2551 }
2552
2553 1
2554 },
2555 %args
2556 );
2557
2558 $self->add (new CFClient::UI::Face
2559 can_events => 0,
2560 face => $item->{face},
2561 anim => $item->{anim},
2562 animspeed => $item->{animspeed},
2563 );
2564
2565 $self->add (new CFClient::UI::Label
2566 can_events => 0,
2567 text => $desc,
2568 );
2569
2570 $self
2571}
2572
2573#############################################################################
2574
2575package CFClient::UI::Inventory;
2576
2577our @ISA = CFClient::UI::ScrolledWindow::;
2578
2579sub new {
2580 my $class = shift;
2581
2582 my $self = $class->SUPER::new (
2583 scrolled => (new CFClient::UI::VBox),
2584 @_,
2585 );
2586
2587 $self
2588}
2589
2590sub set_items {
2591 my ($self, $items) = @_;
2592
2593 $self->{scrolled}->clear;
2594 return unless $items;
2595
2596 my @items = sort {
2597 ($a->{type} <=> $b->{type})
2598 or ($a->{name} cmp $b->{name})
2599 } @$items;
2600
2601 $self->{real_items} = \@items;
2602
2603 for my $item (@items) {
2604 my $desc = $item->{nrof} < 2
2605 ? $item->{name}
2606 : "$item->{nrof} $item->{name_pl}";
2607
2608 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2609 }
2610
2611 $self->{scrolled}->add (@items);
2612
2613# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2614}
2615
2616sub size_request {
2617 my ($self) = @_;
2618 ($self->{req_w}, $self->{req_h});
2482} 2619}
2483 2620
2484############################################################################# 2621#############################################################################
2485 2622
2486package CFClient::UI::Menu; 2623package CFClient::UI::Menu;
… …
2553 } 2690 }
2554} 2691}
2555 2692
2556############################################################################# 2693#############################################################################
2557 2694
2695package CFClient::UI::Statusbox;
2696
2697our @ISA = CFClient::UI::VBox::;
2698
2699sub reorder {
2700 my ($self) = @_;
2701 my $NOW = time;
2702
2703 while (my ($k, $v) = each %{ $self->{item} }) {
2704 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2705 }
2706
2707 my @widgets;
2708
2709 my @items = sort {
2710 $a->{pri} <=> $b->{pri}
2711 or $b->{id} <=> $a->{id}
2712 } values %{ $self->{item} };
2713
2714 my $count = 10 + 1;
2715 for my $item (@items) {
2716 last unless --$count;
2717
2718 push @widgets, $item->{label} ||= do {
2719 # TODO: doesn't handle markup well (read as: at all)
2720 my $short = $item->{count} > 1
2721 ? "<b>$item->{count} ×</b> $item->{text}"
2722 : $item->{text};
2723
2724 for ($short) {
2725 s/^\s+//;
2726 s/\s+/ /g;
2727 my $len = int 40 / $item->{fontsize};
2728 substr $_, $len, length, "…" if $len < length;
2729 }
2730
2731 new CFClient::UI::Label
2732 markup => $short,
2733 tooltip => $item->{tooltip},
2734 tooltip_font => $::FONT_PROP,
2735 tooltip_width => 0.67,
2736 fontsize => $item->{fontsize},
2737 fg => $item->{fg},
2738 can_events => 1,
2739 can_hover => 1
2740 };
2741 }
2742
2743 $self->clear;
2744 $self->SUPER::add (reverse @widgets);
2745}
2746
2747sub add {
2748 my ($self, $text, %arg) = @_;
2749
2750 $text =~ s/^\s+//;
2751 $text =~ s/\s+$//;
2752
2753 my $timeout = time + ((delete $arg{timeout}) || 60);
2754
2755 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2756
2757 if (my $item = $self->{item}{$group}) {
2758 if ($item->{text} eq $text) {
2759 $item->{count}++;
2760 } else {
2761 $item->{count} = 1;
2762 $item->{text} = $item->{tooltip} = $text;
2763 }
2764 $item->{id} = ++$self->{id};
2765 $item->{timeout} = $timeout;
2766 delete $item->{label};
2767 } else {
2768 $self->{item}{$group} = {
2769 id => ++$self->{id},
2770 text => $text,
2771 timeout => $timeout,
2772 tooltip => $text,
2773 fontsize => 0.8,
2774 fg => [0.8, 0.8, 0.8, 0.8],
2775 pri => 0,
2776 count => 1,
2777 %arg,
2778 };
2779 }
2780
2781 $self->reorder;
2782}
2783
2784#############################################################################
2785
2558package CFClient::UI::Root; 2786package CFClient::UI::Root;
2559 2787
2560our @ISA = CFClient::UI::Container::; 2788our @ISA = CFClient::UI::Container::;
2561 2789
2562use CFClient::OpenGL; 2790use CFClient::OpenGL;
2563 2791
2564sub check_size { 2792sub new {
2565 my ($self) = @_; 2793 my $class = shift;
2566 2794
2567 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2795 $class->SUPER::new (
2568} 2796 @_,
2569 2797 )
2570sub size_request {
2571 ($::WIDTH, $::HEIGHT)
2572} 2798}
2573 2799
2574sub configure { 2800sub configure {
2575 my ($self, $x, $y, $w, $h) = @_; 2801 my ($self, $x, $y, $w, $h) = @_;
2576 2802
2577 $self->SUPER::configure ($x, $y, $w, $h); 2803 $self->{w} = $w;
2804 $self->{h} = $h;
2805}
2578 2806
2807sub check_size {
2808 my ($self) = @_;
2809
2810 $self->size_allocate ($self->{w}, $self->{h})
2811 if $self->{w};
2812}
2813
2814sub size_request {
2815 my ($self) = @_;
2816
2817 ($self->{w}, $self->{h})
2818}
2819
2820sub size_allocate {
2821 my ($self, $w, $h) = @_;
2822
2823 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2824 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2825
2826 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2827 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2828
2579 for my $child (@{$self->{children}}) { 2829 for my $child ($self->children) {
2580 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2830 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2581 2831
2832 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2833 if exists $child->{req_x};
2834
2835 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2836 if exists $child->{req_y};
2837
2582 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2838 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2583 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2839 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2840
2584 $child->configure ($X, $Y, $W,$H); 2841 $child->configure ($X, $Y, $W, $H);
2585 } 2842 }
2586} 2843}
2587 2844
2588sub _topleft { 2845sub coord2local {
2589 my ($self, $x, $y) = @_; 2846 my ($self, $x, $y) = @_;
2590 2847
2591 ($x, $y) 2848 ($x, $y)
2592} 2849}
2593 2850
2851sub coord2global {
2852 my ($self, $x, $y) = @_;
2853
2854 ($x, $y)
2855}
2856
2594sub update { 2857sub update {
2595 my ($self) = @_; 2858 my ($self) = @_;
2596 2859
2597 $self->check_size; 2860 $self->check_size;
2598 ::refresh (); 2861 $::WANT_REFRESH++;
2599} 2862}
2600 2863
2601sub add { 2864sub add {
2602 my ($self, $child) = @_; 2865 my ($self, @children) = @_;
2603 2866
2867 for my $child (@children) {
2868 $child->{toplevel} = 1;
2869
2604 # integerize window positions 2870 # integerise window positions
2605 $child->{x} = int $child->{x}; 2871 $child->{x} = int $child->{x};
2606 $child->{y} = int $child->{y}; 2872 $child->{y} = int $child->{y};
2873 }
2607 2874
2608 $self->SUPER::add ($child); 2875 $self->SUPER::add (@children);
2609} 2876}
2610 2877
2611sub on_refresh { 2878sub on_refresh {
2612 my ($self, $id, $cb) = @_; 2879 my ($self, $id, $cb) = @_;
2613 2880
2614 $self->{refresh_hook}{$id} = $cb; 2881 $self->{refresh_hook}{$id} = $cb;
2615} 2882}
2616 2883
2884sub on_post_alloc {
2885 my ($self, $id, $cb) = @_;
2886
2887 $self->{post_alloc_hook}{$id} = $cb;
2888}
2889
2617sub draw { 2890sub draw {
2618 my ($self) = @_; 2891 my ($self) = @_;
2619 2892
2620 while (my $rcb = delete $self->{refresh_hook}) { 2893 while ($self->{refresh_hook}) {
2621 $_->() for values %$rcb; 2894 $_->()
2895 for values %{delete $self->{refresh_hook}};
2896 }
2897
2898 if ($self->{check_size}) {
2899 my @queue = ([], []);
2900
2901 for (;;) {
2902 if ($self->{check_size}) {
2903 # heuristic: check containers last
2904 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2905 for values %{delete $self->{check_size}}
2906 }
2907
2908 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2909
2910 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2911 ? @$widget{qw(user_w user_h)}
2912 : $widget->size_request;
2913
2914 if (delete $widget->{force_alloc}
2915 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2916 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2917
2918 $widget->{req_w} = $w;
2919 $widget->{req_h} = $h;
2920
2921 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2922
2923 $widget->{parent}->check_size
2924 if $widget->{parent};
2925 }
2926 }
2927 }
2928
2929 while ($self->{size_alloc}) {
2930 for (values %{delete $self->{size_alloc}}) {
2931 my ($widget, $w, $h) = @$_;
2932
2933 $w = 0 if $w < 0;
2934 $h = 0 if $h < 0;
2935
2936 $widget->{w} = $w;
2937 $widget->{h} = $h;
2938 $widget->size_allocate ($w, $h);
2939 $widget->emit (size_allocate => $w, $h);
2940 }
2941 }
2942
2943 while ($self->{post_alloc_hook}) {
2944 $_->()
2945 for values %{delete $self->{post_alloc_hook}};
2622 } 2946 }
2623 2947
2624 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2948 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2625 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2949 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2626 glClear GL_COLOR_BUFFER_BIT; 2950 glClear GL_COLOR_BUFFER_BIT;
… …
2634 $self->_draw; 2958 $self->_draw;
2635} 2959}
2636 2960
2637############################################################################# 2961#############################################################################
2638 2962
2639package CFClient::UI::Inventory;
2640
2641our @ISA = CFClient::UI::ScrolledWindow::;
2642
2643sub new {
2644 my $class = shift;
2645
2646 my $self = $class->SUPER::new (
2647 scrolled => (new CFClient::UI::VBox),
2648 @_,
2649 );
2650
2651 $self
2652}
2653
2654sub set_items {
2655 my ($self, $items) = @_;
2656
2657 $self->{scrolled}->clear;
2658 return unless $items;
2659
2660 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2661
2662 $self->{real_items} = \@items;
2663
2664 for my $item (@items) {
2665 my $desc = $item->{nrof} < 2
2666 ? $item->{name}
2667 : "$item->{nrof} $item->{name_pl}";
2668
2669 my $hb = new CFClient::UI::HBox;
2670
2671 $hb->add (my $f = new CFClient::UI::Face
2672 can_events => 0,
2673 face => $item->{face},
2674 anim => $item->{anim},
2675 animspeed => $item->{animspeed},
2676 expand => 1,
2677 );
2678 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2679 $self->{scrolled}->add ($hb);
2680 }
2681
2682# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2683}
2684
2685sub size_request {
2686 my ($self) = @_;
2687 (100, 200)
2688}
2689
2690#############################################################################
2691
2692package CFClient::UI; 2963package CFClient::UI;
2693 2964
2694$ROOT = new CFClient::UI::Root; 2965$ROOT = new CFClient::UI::Root;
2695$TOOLTIP = new CFClient::UI::Tooltip; 2966$TOOLTIP = new CFClient::UI::Tooltip;
2696 2967

Diff Legend

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