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.186 by root, Mon May 8 20:39:34 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 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
263} 278}
264 279
265sub set_max_size { 280sub set_max_size {
266 my ($self, $w, $h) = @_; 281 my ($self, $w, $h) = @_;
267 282
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 283 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 284 delete $self->{max_h}; $self->{max_h} = $h if $h;
270}
271
272# return top left coordinates
273sub _topleft {
274 my ($self, $x, $y) = @_;
275
276 $self->{parent}
277 or Carp::confess "no parent widget in _topleft\n";#d#
278
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
280} 285}
281 286
282# translate global coordinates to local coordinate system 287# translate global coordinates to local coordinate system
283sub coord2local { 288sub coord2local {
284 my ($self, $x, $y) = @_; 289 my ($self, $x, $y) = @_;
285 290
286 my ($X, $Y) = $self->_topleft; 291 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 292}
289 293
290# translate local coordinates to global coordinate system 294# translate local coordinates to global coordinate system
291sub coord2global { 295sub coord2global {
292 my ($self, $x, $y) = @_; 296 my ($self, $x, $y) = @_;
293 297
294 my ($X, $Y) = $self->_topleft; 298 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 299}
297 300
298sub focus_in { 301sub focus_in {
299 my ($self) = @_; 302 my ($self) = @_;
300 303
… …
372 glVertex $self->{w}, 0; 375 glVertex $self->{w}, 0;
373 glVertex $self->{w}, $self->{h}; 376 glVertex $self->{w}, $self->{h};
374 glVertex 0 , $self->{h}; 377 glVertex 0 , $self->{h};
375 glEnd; 378 glEnd;
376 glPopMatrix; 379 glPopMatrix;
377 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;
378 } 381 }
379} 382}
380 383
381sub _draw { 384sub _draw {
382 my ($self) = @_; 385 my ($self) = @_;
… …
398 401
399sub set_parent { 402sub set_parent {
400 my ($self, $parent) = @_; 403 my ($self, $parent) = @_;
401 404
402 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};
403} 410}
404 411
405sub check_size { 412sub check_size {
406 my ($self) = @_; 413 my ($self, $forced) = @_;
407 414
408 $self->{parent} 415 $self->{force_alloc} = 1 if $forced;
409 or return 1; 416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
410
411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
414
415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
416 $self->{req_w} = $w;
417 $self->{req_h} = $h;
418
419 $self->{parent}->check_size
420 or $self->size_allocate (
421 (List::Util::max $self->{w}, $w),
422 (List::Util::max $self->{h}, $h),
423 );
424
425 1
426 } else {
427 0
428 }
429} 417}
430 418
431sub update { 419sub update {
432 my ($self) = @_; 420 my ($self) = @_;
433 421
… …
448} 436}
449 437
450sub DESTROY { 438sub DESTROY {
451 my ($self) = @_; 439 my ($self) = @_;
452 440
441 delete $WIDGET{$self+0};
453 #$self->deactivate; 442 #$self->deactivate;
454} 443}
455 444
456############################################################################# 445#############################################################################
457 446
… …
530 519
531 $self 520 $self
532} 521}
533 522
534sub add { 523sub add {
535 my ($self, $child) = @_; 524 my ($self, @widgets) = @_;
536 525
537 $child->set_parent ($self); 526 $_->set_parent ($self)
527 for @widgets;
538 528
539 use sort 'stable'; 529 use sort 'stable';
540 530
541 $self->{children} = [ 531 $self->{children} = [
542 sort { $a->{z} <=> $b->{z} } 532 sort { $a->{z} <=> $b->{z} }
543 @{$self->{children}}, $child 533 @{$self->{children}}, @widgets
544 ]; 534 ];
545 535
546 $child->check_size; 536 $self->check_size (1);
547 $self->update; 537 $self->update;
548} 538}
549 539
550sub children { 540sub children {
551 @{ $_[0]{children} } 541 @{ $_[0]{children} }
… …
658} 648}
659 649
660sub update { 650sub update {
661 my ($self) = @_; 651 my ($self) = @_;
662 652
663 $ROOT->on_refresh ($self => sub { $self->render_child }); 653 $ROOT->on_post_alloc ($self => sub { $self->render_child });
664 $self->SUPER::update; 654 $self->SUPER::update;
665} 655}
666 656
667sub size_allocate { 657sub size_allocate {
668 my ($self, $w, $h) = @_; 658 my ($self, $w, $h) = @_;
… …
699 my ($w, $h) = ($self->w, $self->h); 689 my ($w, $h) = ($self->w, $self->h);
700 690
701 my $tex = $self->{texture} 691 my $tex = $self->{texture}
702 or return; 692 or return;
703 693
704 glEnable GL_BLEND;
705 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
706 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708 glColor 0, 0, 0, 1; 696 glColor 0, 0, 0, 1;
709 697
710 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
711 699
712 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 700 glDisable GL_TEXTURE_2D;
714} 701}
715 702
716############################################################################# 703#############################################################################
717 704
… …
741 $self->{view_y} = int $y; 728 $self->{view_y} = int $y;
742 729
743 $self->update; 730 $self->update;
744} 731}
745 732
746# hmm, this does not work for topleft of $self... but we should not aks for that 733# hmm, this does not work for topleft of $self... but we should not ask for that
747sub _topleft { 734sub coord2local {
748 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
749 736
750 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 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)
751} 747}
752 748
753sub find_widget { 749sub find_widget {
754 my ($self, $x, $y) = @_; 750 my ($self, $x, $y) = @_;
755 751
… …
800 $self->add ($self->{slider}); 796 $self->add ($self->{slider});
801 797
802 $self 798 $self
803} 799}
804 800
805#TODO# update range on size_allocate depeneing on child 801#TODO# update range on size_allocate depending on child
806# update viewport offset on scroll 802# update viewport offset on scroll
807 803
808############################################################################# 804#############################################################################
809 805
810package CFClient::UI::Frame; 806package CFClient::UI::Frame;
… …
814use CFClient::OpenGL; 810use CFClient::OpenGL;
815 811
816sub new { 812sub new {
817 my $class = shift; 813 my $class = shift;
818 814
819 my $self = $class->SUPER::new ( 815 $class->SUPER::new (
820 bg => [1, 1, 1, 1], 816 bg => undef,
821 border_bg => [1, 1, 1, 1],
822 border => 0.8,
823 @_ 817 @_,
824 ); 818 )
825
826 $self
827} 819}
828 820
829sub _draw { 821sub _draw {
830 my ($self) = @_; 822 my ($self) = @_;
831 823
832 my ($w, $h) = ($self->{w}, $self->{h}); 824 if ($self->{bg}) {
825 my ($w, $h) = @$self{qw(w h)};
833 826
834 glEnable GL_BLEND; 827 glEnable GL_BLEND;
835 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
836 glEnable GL_TEXTURE_2D; 829 glColor @{ $self->{bg} };
837 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
838 830
839# glBegin GL_QUADS; 831 glBegin GL_QUADS;
840# glColor 0, 0, 0, 0;
841# glVertex 0 , 0; 832 glVertex 0 , 0;
842# glVertex 0 , $h; 833 glVertex 0 , $h;
843# glVertex $w, $h; 834 glVertex $w, $h;
844# glVertex $w, 0; 835 glVertex $w, 0;
845# glEnd; 836 glEnd;
846 837
847
848 $self->child->draw;
849 glDisable GL_BLEND; 838 glDisable GL_BLEND;
850 glDisable GL_TEXTURE_2D; 839 }
840
841 $self->SUPER::_draw;
851} 842}
852 843
853############################################################################# 844#############################################################################
854 845
855package CFClient::UI::FancyFrame; 846package CFClient::UI::FancyFrame;
… …
869 860
870 my $self = $class->SUPER::new ( 861 my $self = $class->SUPER::new (
871 bg => [1, 1, 1, 1], 862 bg => [1, 1, 1, 1],
872 border_bg => [1, 1, 1, 1], 863 border_bg => [1, 1, 1, 1],
873 border => 0.6, 864 border => 0.6,
865 toplevel => 1,
874 can_events => 1, 866 can_events => 1,
875 @_ 867 @_
876 ); 868 );
877 869
878 $self->{title} &&= new CFClient::UI::Label 870 $self->{title} &&= new CFClient::UI::Label
… …
903 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
904 896
905 $h -= List::Util::max 0, $self->border * 2; 897 $h -= List::Util::max 0, $self->border * 2;
906 $w -= List::Util::max 0, $self->border * 2; 898 $w -= List::Util::max 0, $self->border * 2;
907 899
908 $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)
909 if $self->{title}; 901 if $self->{title};
910 902
911 $self->child->configure ($self->border, $self->border, $w, $h); 903 $self->child->configure ($self->border, $self->border, $w, $h);
912} 904}
913 905
… …
971 my ($self) = @_; 963 my ($self) = @_;
972 964
973 my ($w, $h ) = ($self->{w}, $self->{h}); 965 my ($w, $h ) = ($self->{w}, $self->{h});
974 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
975 967
976 glEnable GL_BLEND;
977 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
978 glEnable GL_TEXTURE_2D; 968 glEnable GL_TEXTURE_2D;
979 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
980 970
981 my $border = $self->border; 971 my $border = $self->border;
982 972
983 glColor @{ $self->{border_bg} }; 973 glColor @{ $self->{border_bg} };
984 $tex[1]->draw_quad (0, 0, $w, $border); 974 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
985 $tex[3]->draw_quad (0, $border, $border, $ch); 975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
986 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
987 $tex[4]->draw_quad (0, $h - $border, $w, $border); 977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
988 978
989 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
990 my $bg = $tex[0]; 980 my $bg = $tex[0];
991 981
992 # TODO: repeat texture not scale 982 # TODO: repeat texture not scale
… …
996 glColor @{ $self->{bg} }; 986 glColor @{ $self->{bg} };
997 987
998 $bg->{s} = $rep_x; 988 $bg->{s} = $rep_x;
999 $bg->{t} = $rep_y; 989 $bg->{t} = $rep_y;
1000 $bg->{wrap_mode} = 1; 990 $bg->{wrap_mode} = 1;
1001 $bg->draw_quad ($border, $border, $cw, $ch); 991 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 }
1002 993
1003 glDisable GL_TEXTURE_2D; 994 glDisable GL_TEXTURE_2D;
1004 glDisable GL_BLEND;
1005 }
1006 995
1007 $self->{title}->draw if $self->{title}; 996 $self->{title}->draw if $self->{title};
1008 997
1009 $self->child->draw; 998 $self->child->draw;
1010} 999}
… …
1237} 1226}
1238 1227
1239sub size_allocate { 1228sub size_allocate {
1240 my ($self, $w, $h) = @_; 1229 my ($self, $w, $h) = @_;
1241 1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1242 my $children = $self->{children}; 1233 my $children = $self->{children};
1243 1234
1244 my @h = map $_->{req_h}, @$children; 1235 my @h = map $_->{req_h}, @$children;
1245 1236
1246 my $req_h = List::Util::sum @h; 1237 my $req_h = List::Util::sum @h;
… …
1285 my ($class, %arg) = @_; 1276 my ($class, %arg) = @_;
1286 1277
1287 my $self = $class->SUPER::new ( 1278 my $self = $class->SUPER::new (
1288 fg => [1, 1, 1], 1279 fg => [1, 1, 1],
1289 #font => default_font 1280 #font => default_font
1281 #text => initial text
1282 #markup => initial narkup
1283 layout => (new CFClient::Layout),
1290 fontsize => 1, 1284 fontsize => 1,
1291 text => "",
1292 align => -1, 1285 align => -1,
1293 valign => -1, 1286 valign => -1,
1294 padding => 2, 1287 padding => 2,
1295 layout => new CFClient::Layout,
1296 can_events => 0, 1288 can_events => 0,
1297 %arg 1289 %arg
1298 ); 1290 );
1299 1291
1300 if (exists $self->{template}) { 1292 if (exists $self->{template}) {
1301 my $layout = new CFClient::Layout; 1293 my $layout = new CFClient::Layout;
1302 $layout->set_text (delete $self->{template}); 1294 $layout->set_text (delete $self->{template});
1303 $self->{template} = $layout; 1295 $self->{template} = $layout;
1304 } 1296 }
1305 1297
1306 $self->set_text (delete $self->{text}) if exists $self->{text}; 1298 if (exists $self->{markup}) {
1307 $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 }
1308 1303
1309 $self 1304 $self
1310} 1305}
1311 1306
1312sub escape { 1307sub escape {
… …
1330 my ($self, $text) = @_; 1325 my ($self, $text) = @_;
1331 1326
1332 return if $self->{text} eq "T$text"; 1327 return if $self->{text} eq "T$text";
1333 $self->{text} = "T$text"; 1328 $self->{text} = "T$text";
1334 1329
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1335 $self->{layout}->set_text ($text); 1331 $self->{layout}->set_text ($text);
1336 1332
1337 delete $self->{texture};
1338 $self->update; 1333 $self->update;
1339 $self->check_size; 1334 $self->check_size;
1340} 1335}
1341 1336
1342sub set_markup { 1337sub set_markup {
1343 my ($self, $markup) = @_; 1338 my ($self, $markup) = @_;
1344 1339
1345 return if $self->{text} eq "M$markup"; 1340 return if $self->{text} eq "M$markup";
1346 $self->{text} = "M$markup"; 1341 $self->{text} = "M$markup";
1347 1342
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344
1345 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348 $self->{layout}->set_markup ($markup); 1346 $self->{layout}->set_markup ($markup);
1349 1347
1350 delete $self->{texture};
1351 $self->update; 1348 $self->update;
1352 $self->check_size; 1349 $self->check_size;
1353} 1350}
1354 1351
1355sub size_request { 1352sub size_request {
… …
1395 1392
1396sub _draw { 1393sub _draw {
1397 my ($self) = @_; 1394 my ($self) = @_;
1398 1395
1399 my $tex = $self->{texture} ||= do { 1396 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1398 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $self->{layout}->set_width ($self->{w}); 1399 $self->{layout}->set_width ($self->{w});
1402 $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
1403 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
1404 }; 1413 };
1405 1414
1406 glEnable GL_BLEND;
1407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1408 glEnable GL_TEXTURE_2D; 1415 glEnable GL_TEXTURE_2D;
1409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1410 1417
1418 if ($tex->{format} == GL_ALPHA) {
1411 glColor @{$self->{fg}}; 1419 glColor @{$self->{fg}};
1412
1413 $self->{ox} = int (
1414 $self->{align} < 0 ? $self->{padding}
1415 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1416 : ($self->{w} - $tex->{w}) * 0.5
1417 );
1418
1419 $self->{oy} = int (
1420 $self->{valign} < 0 ? $self->{padding}
1421 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1422 : ($self->{h} - $tex->{h}) * 0.5
1423 );
1424
1425 $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 }
1426 1424
1427 glDisable GL_TEXTURE_2D; 1425 glDisable GL_TEXTURE_2D;
1428 glDisable GL_BLEND;
1429} 1426}
1430 1427
1431############################################################################# 1428#############################################################################
1432 1429
1433package CFClient::UI::EntryBase; 1430package CFClient::UI::EntryBase;
… …
1468 $self->{layout}->set_text ("$text "); 1465 $self->{layout}->set_text ("$text ");
1469 1466
1470 $self->emit (changed => $self->{text}); 1467 $self->emit (changed => $self->{text});
1471} 1468}
1472 1469
1473sub get_text {
1474 $_[0]{text}
1475}
1476
1477sub size_request {
1478 my ($self) = @_;
1479
1480 my ($w, $h) = $self->SUPER::size_request;
1481
1482 ($w + 1, $h) # add 1 for cursor
1483}
1484
1485sub size_allocate {
1486 my ($self, $w, $h) = @_;
1487
1488 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1489}
1490
1491sub set_text { 1470sub set_text {
1492 my ($self, $text) = @_; 1471 my ($self, $text) = @_;
1493 1472
1494 $self->{cursor} = length $text; 1473 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1474 $self->_set_text ($text);
1496 $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
1497} 1495}
1498 1496
1499sub key_down { 1497sub key_down {
1500 my ($self, $ev) = @_; 1498 my ($self, $ev) = @_;
1501 1499
… …
1503 my $sym = $ev->{sym}; 1501 my $sym = $ev->{sym};
1504 my $uni = $ev->{unicode}; 1502 my $uni = $ev->{unicode};
1505 1503
1506 my $text = $self->get_text; 1504 my $text = $self->get_text;
1507 1505
1508 if ($sym == 8) { 1506 if ($uni == 8) {
1509 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1507 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1510 } elsif ($sym == 127) { 1508 } elsif ($uni == 127) {
1511 substr $text, $self->{cursor}, 1, ""; 1509 substr $text, $self->{cursor}, 1, "";
1512 } elsif ($sym == CFClient::SDLK_LEFT) { 1510 } elsif ($sym == CFClient::SDLK_LEFT) {
1513 --$self->{cursor} if $self->{cursor}; 1511 --$self->{cursor} if $self->{cursor};
1514 } elsif ($sym == CFClient::SDLK_RIGHT) { 1512 } elsif ($sym == CFClient::SDLK_RIGHT) {
1515 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1513 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1516 } elsif ($sym == CFClient::SDLK_HOME) { 1514 } elsif ($sym == CFClient::SDLK_HOME) {
1517 $self->{cursor} = 0; 1515 $self->{cursor} = 0;
1518 } elsif ($sym == CFClient::SDLK_END) { 1516 } elsif ($sym == CFClient::SDLK_END) {
1519 $self->{cursor} = length $text; 1517 $self->{cursor} = length $text;
1520 } elsif ($sym == 27) { 1518 } elsif ($uni == 27) {
1521 $self->emit ('escape'); 1519 $self->emit ('escape');
1522 } elsif ($uni) { 1520 } elsif ($uni) {
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1521 substr $text, $self->{cursor}++, 0, chr $uni;
1524 } 1522 }
1525 1523
1526 $self->_set_text ($text); 1524 $self->_set_text ($text);
1527 $self->update; 1525 $self->update;
1526 $self->check_size;
1528} 1527}
1529 1528
1530sub focus_in { 1529sub focus_in {
1531 my ($self) = @_; 1530 my ($self) = @_;
1532 1531
… …
1689 1688
1690 if ($GRAB == $self) { 1689 if ($GRAB == $self) {
1691 $self->{fg} = $self->{active_fg}; 1690 $self->{fg} = $self->{active_fg};
1692 } 1691 }
1693 1692
1694 glEnable GL_BLEND;
1695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1696 glEnable GL_TEXTURE_2D; 1693 glEnable GL_TEXTURE_2D;
1697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1698 glColor 0, 0, 0, 1; 1695 glColor 0, 0, 0, 1;
1699 1696
1700 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1697 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1701 1698
1702 glDisable GL_TEXTURE_2D; 1699 glDisable GL_TEXTURE_2D;
1703 glDisable GL_BLEND;
1704 1700
1705 $self->SUPER::_draw; 1701 $self->SUPER::_draw;
1706} 1702}
1707 1703
1708############################################################################# 1704#############################################################################
… …
1755 1751
1756 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;
1757 1753
1758 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1759 1755
1760 glEnable GL_BLEND; 1756 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757
1761 glEnable GL_TEXTURE_2D; 1758 glEnable GL_TEXTURE_2D;
1762 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1763
1764 my $tex = $self->{state} ? $tex[1] : $tex[0];
1765
1766 $tex->draw_quad (0, 0, $s, $s); 1759 $tex->draw_quad_alpha (0, 0, $s, $s);
1767
1768 glDisable GL_TEXTURE_2D; 1760 glDisable GL_TEXTURE_2D;
1769 glDisable GL_BLEND;
1770} 1761}
1771 1762
1772############################################################################# 1763#############################################################################
1773 1764
1774package CFClient::UI::Image; 1765package CFClient::UI::Image;
… …
1817 glTranslate 0, -$self->{w}, 0; 1808 glTranslate 0, -$self->{w}, 0;
1818 1809
1819 ($w, $h) = ($h, $w); 1810 ($w, $h) = ($h, $w);
1820 } 1811 }
1821 1812
1822 glEnable GL_BLEND;
1823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1824 glEnable GL_TEXTURE_2D; 1813 glEnable GL_TEXTURE_2D;
1825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1826 1815
1827 $tex->draw_quad (0, 0, $w, $h); 1816 $tex->draw_quad_alpha (0, 0, $w, $h);
1828 1817
1829 glDisable GL_BLEND;
1830 glDisable GL_TEXTURE_2D; 1818 glDisable GL_TEXTURE_2D;
1831} 1819}
1832 1820
1833############################################################################# 1821#############################################################################
1834 1822
… …
2023 qw(s1_slider.png s1_slider_bg.png); 2011 qw(s1_slider.png s1_slider_bg.png);
2024 2012
2025sub new { 2013sub new {
2026 my $class = shift; 2014 my $class = shift;
2027 2015
2028 # range [value, low, high, page] 2016 # range [value, low, high, page, unit]
2029 2017
2030 # TODO: 0-width page 2018 # TODO: 0-width page
2031 # TODO: req_w/h are wrong with vertical 2019 # TODO: req_w/h are wrong with vertical
2032 # TODO: calculations are off 2020 # TODO: calculations are off
2033 my $self = $class->SUPER::new ( 2021 my $self = $class->SUPER::new (
… …
2036 range => [0, 0, 100, 10], 2024 range => [0, 0, 100, 10],
2037 req_w => $::WIDTH / 80, 2025 req_w => $::WIDTH / 80,
2038 req_h => $::WIDTH / 80, 2026 req_h => $::WIDTH / 80,
2039 vertical => 0, 2027 vertical => 0,
2040 can_hover => 1, 2028 can_hover => 1,
2041 inner_pad => 5, 2029 inner_pad => .05,
2042 @_ 2030 @_
2043 ); 2031 );
2044 2032
2033 $self->set_value ($self->{range}[0]);
2034 $self->update;
2035
2045 $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 }
2046} 2060}
2047 2061
2048sub size_request { 2062sub size_request {
2049 my ($self) = @_; 2063 my ($self) = @_;
2050 2064
… …
2063 2077
2064sub mouse_motion { 2078sub mouse_motion {
2065 my ($self, $ev, $x, $y) = @_; 2079 my ($self, $ev, $x, $y) = @_;
2066 2080
2067 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
2068 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2098 my ($value, $lo, $hi, $page) = @{$self->{range}};
2069 2099
2070 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2100 my $inner_w = 1 - 2 * $self->{inner_pad};
2071 2101
2072 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2102 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2073 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2074 2103
2075 $x -= $inner_pad_px; # substract the padding 2104 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2076 $x = $x * ($hi - $lo) / $inner_w + $lo; 2105 $value = $self->{scale} * ($value - $lo);
2077 $x = $lo if $x < $lo;
2078 $x = $hi - $page if $x > $hi - $page;
2079 $self->{range}[0] = $x;
2080 2106
2081 $self->emit (changed => $x); 2107 $value = $self->{inner_pad} + ($value - $page * 0.5);
2082 $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;
2083 } 2114 });
2084}
2085 2115
2086# the inner_* stuff is for generating a padding for the slider handle, 2116 $self->SUPER::update;
2087# so that the handle doesn't leave the texture. This calculation isn't 100%
2088# correct propably, but it does the job for now
2089sub _calc_inner_pad_px {
2090 my ($self, $w) = @_;
2091 ($w / 100) * $self->{inner_pad} # % to pixels
2092} 2117}
2093 2118
2094sub _draw { 2119sub _draw {
2095 my ($self) = @_; 2120 my ($self) = @_;
2096 2121
2097 $self->SUPER::_draw (); 2122 $self->SUPER::_draw ();
2098 2123
2099 my ($w, $h) = @$self{qw(w h)}; 2124 glScale $self->{w}, $self->{h};
2100 2125
2101 if ($self->{vertical}) { 2126 if ($self->{vertical}) {
2102 # draw a vertical slider like a rotated horizontal slider 2127 # draw a vertical slider like a rotated horizontal slider
2103 2128
2104 glRotate 90, 0, 0, 1; 2129 glRotate 90, 0, 0, 1;
2105 glTranslate 0, -$self->{w}, 0; 2130 glTranslate 0, 1, 0;
2106
2107 ($w, $h) = ($h, $w);
2108 } 2131 }
2109 2132
2110 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2133 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2111 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2134 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2112 2135
2113 my ($value, $lo, $hi, $page) = @{$self->{range}};
2114
2115 $hi = $value + 1 if $lo == $hi;
2116
2117 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2118 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2119
2120 $page = int $page * $inner_w / ($hi - $lo);
2121 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2122
2123 $w -= $page;
2124 $page &= ~1;
2125 glTranslate $page * 0.5, 0, 0;
2126 $page ||= 2;
2127
2128 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2129 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2130
2131 glEnable GL_BLEND;
2132 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2133 glEnable GL_TEXTURE_2D; 2136 glEnable GL_TEXTURE_2D;
2134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2135 2138
2136 # draw background 2139 # draw background
2137 $tex[1]->draw_quad (0, 0, $w, $h); 2140 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2138 2141
2139 # draw handle 2142 # draw handle
2140 $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);
2141 2144
2142 glDisable GL_BLEND;
2143 glDisable GL_TEXTURE_2D; 2145 glDisable GL_TEXTURE_2D;
2144} 2146}
2145 2147
2146############################################################################# 2148#############################################################################
2147 2149
… …
2158 fontsize => 1, 2160 fontsize => 1,
2159 can_events => 0, 2161 can_events => 0,
2160 #font => default_font 2162 #font => default_font
2161 @_, 2163 @_,
2162 2164
2163 layout => (new CFClient::Layout), 2165 layout => (new CFClient::Layout 1),
2164 par => [], 2166 par => [],
2165 height => 0, 2167 height => 0,
2166 children => [ 2168 children => [
2167 (new CFClient::UI::Empty expand => 1), 2169 (new CFClient::UI::Empty expand => 1),
2168 (new CFClient::UI::Slider vertical => 1), 2170 (new CFClient::UI::Slider vertical => 1),
… …
2186 2188
2187 my $layout = $self->{layout}; 2189 my $layout = $self->{layout};
2188 2190
2189 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2191 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2190 $layout->set_width ($self->{children}[0]{w}); 2192 $layout->set_width ($self->{children}[0]{w});
2191 $layout->set_text ($text); 2193 $layout->set_markup ($text);
2192 2194
2193 ($layout->size)[1] 2195 ($layout->size)[1]
2194} 2196}
2195 2197
2196sub reflow { 2198sub reflow {
… …
2234 2236
2235 return unless $self->{h} > 0; 2237 return unless $self->{h} > 0;
2236 2238
2237 delete $self->{texture}; 2239 delete $self->{texture};
2238 2240
2239 $ROOT->on_refresh ($self, sub { 2241 $ROOT->on_post_alloc ($self, sub {
2240 if (delete $self->{need_reflow}) { 2242 if (delete $self->{need_reflow}) {
2241 my $height = 0; 2243 my $height = 0;
2242 2244
2243 $height += $_->[0] = $self->text_height ($_->[2]) 2245 $height += $_->[0] = $self->text_height ($_->[2])
2244 for @{$self->{par}}; 2246 for @{$self->{par}};
… …
2252 2254
2253 $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 {
2254 glClearColor 0, 0, 0, 0; 2256 glClearColor 0, 0, 0, 0;
2255 glClear GL_COLOR_BUFFER_BIT; 2257 glClear GL_COLOR_BUFFER_BIT;
2256 2258
2257 glEnable GL_BLEND;
2258 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2259 glEnable GL_TEXTURE_2D; 2259 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261 2261
2262 my $top = int $self->{children}[1]{range}[0]; 2262 my $top = int $self->{children}[1]{range}[0];
2263 2263
… …
2272 2272
2273 for my $par (@{$self->{par}}) { 2273 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2274 my $h = $par->[0];
2275 2275
2276 if ($y0 < $y + $h && $y < $y1) { 2276 if ($y0 < $y + $h && $y < $y1) {
2277 $layout->set_foreground (@{ $par->[1] });
2277 $layout->set_text ($par->[2]); 2278 $layout->set_markup ($par->[2]);
2278 2279
2279 glColor @{ $par->[1] };
2280 my ($W, $H) = $layout->size; 2280 my ($W, $H) = $layout->size;
2281 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);
2282 } 2282 }
2283 2283
2284 $y += $h; 2284 $y += $h;
2285 } 2285 }
2286 2286
2287 glDisable GL_TEXTURE_2D; 2287 glDisable GL_TEXTURE_2D;
2288 glDisable GL_BLEND;
2289 }; 2288 };
2290 }); 2289 });
2291} 2290}
2292 2291
2293sub _draw { 2292sub _draw {
2294 my ($self) = @_; 2293 my ($self) = @_;
2295 2294
2296 glEnable GL_BLEND;
2297 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2298 glEnable GL_TEXTURE_2D; 2295 glEnable GL_TEXTURE_2D;
2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300 glColor 1, 1, 1, 1; 2297 glColor 1, 1, 1, 1;
2301 $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});
2302 glDisable GL_TEXTURE_2D; 2299 glDisable GL_TEXTURE_2D;
2303 glDisable GL_BLEND;
2304 2300
2305 $self->{children}[1]->draw; 2301 $self->{children}[1]->draw;
2306 2302
2307} 2303}
2308 2304
… …
2402 @_, 2398 @_,
2403 can_events => 0, 2399 can_events => 0,
2404 ) 2400 )
2405} 2401}
2406 2402
2407sub set_markup { 2403sub set_tooltip_from {
2408 my ($self, $text) = @_; 2404 my ($self, $widget) = @_;
2409 2405
2410 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2406 $self->add (new CFClient::UI::Label
2411 $self->{label}->set_markup ($text); 2407 markup => $widget->{tooltip},
2412 $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 );
2413} 2413}
2414 2414
2415sub size_request { 2415sub size_request {
2416 my ($self) = @_; 2416 my ($self) = @_;
2417
2418 $self->child->set_max_size ($::WIDTH * 0.3);
2419 2417
2420 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2418 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2421 2419
2422 ($w + 4, $h + 4) 2420 ($w + 4, $h + 4)
2423} 2421}
… …
2429} 2427}
2430 2428
2431sub _draw { 2429sub _draw {
2432 my ($self) = @_; 2430 my ($self) = @_;
2433 2431
2434 glPushMatrix;
2435 glTranslate 0.375, 0.375; 2432 glTranslate 0.375, 0.375;
2436 2433
2437 my ($w, $h) = @$self{qw(w h)}; 2434 my ($w, $h) = @$self{qw(w h)};
2438 2435
2439 glColor 1, 0.8, 0.4; 2436 glColor 1, 0.8, 0.4;
… …
2450 glVertex 0 , $h; 2447 glVertex 0 , $h;
2451 glVertex $w, $h; 2448 glVertex $w, $h;
2452 glVertex $w, 0; 2449 glVertex $w, 0;
2453 glEnd; 2450 glEnd;
2454 2451
2455 glPopMatrix; 2452 glTranslate 2 - 0.375, 2 - 0.375;
2456
2457 glTranslate 2, 2;
2458 $self->SUPER::_draw; 2453 $self->SUPER::_draw;
2459} 2454}
2460 2455
2461############################################################################# 2456#############################################################################
2462 2457
… …
2485 return unless $::CONN;#d# manage and cache textures differently 2480 return unless $::CONN;#d# manage and cache textures differently
2486 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2481 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2487 2482
2488 # TODO animation 2483 # TODO animation
2489 if ($tex) { 2484 if ($tex) {
2490 glEnable GL_BLEND;
2491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492 glEnable GL_TEXTURE_2D; 2485 glEnable GL_TEXTURE_2D;
2493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494 glColor 1, 1, 1, 1; 2487 glColor 1, 1, 1, 1;
2495 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2488 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2496 glDisable GL_TEXTURE_2D; 2489 glDisable GL_TEXTURE_2D;
2497 glDisable GL_BLEND;
2498 } 2490 }
2499} 2491}
2500 2492
2501############################################################################# 2493#############################################################################
2502 2494
… …
2507sub new { 2499sub new {
2508 my $class = shift; 2500 my $class = shift;
2509 2501
2510 my %args = @_; 2502 my %args = @_;
2511 2503
2512 my $item = $args{item}; 2504 my $item = delete $args{item};
2513 2505
2514 my $desc = $item->{nrof} < 2 2506 my $desc = $item->{nrof} < 2
2515 ? $item->{name} 2507 ? $item->{name}
2516 : "$item->{nrof} $item->{name_pl}"; 2508 : "$item->{nrof} $item->{name_pl}";
2517 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 .= " *";
2518 2524
2519 my $self = $class->SUPER::new ( 2525 my $self = $class->SUPER::new (
2520 can_hover => 1, 2526 can_hover => 1,
2521 can_events => 1, 2527 can_events => 1,
2522 tooltip => (CFClient::UI::Label->escape ($desc) 2528 tooltip => (CFClient::UI::Label->escape ($desc)
… …
2528 if ($ev->{button} == 1) { 2534 if ($ev->{button} == 1) {
2529 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2535 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2530 } elsif ($ev->{button} == 2) { 2536 } elsif ($ev->{button} == 2) {
2531 $::CONN->send ("apply $item->{tag}"); 2537 $::CONN->send ("apply $item->{tag}");
2532 } elsif ($ev->{button} == 3) { 2538 } elsif ($ev->{button} == 3) {
2533 CFClient::UI::Menu->new ( 2539 my @menu_items = (
2534 items => [
2535 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 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") }],
2536 [ 2544 [
2537 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2545 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2538 sub { $::CONN->send ("lock $item->{tag}") }, 2546 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2539 ],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2543 ], 2547 ],
2544 )->popup ($ev); 2548 );
2549
2550 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2545 } 2551 }
2546 2552
2547 1 2553 1
2548 }, 2554 },
2549 %args 2555 %args
2550 ); 2556 );
2557
2551 $self->add(new CFClient::UI::Face 2558 $self->add (new CFClient::UI::Face
2552 can_events => 0, 2559 can_events => 0,
2553 face => $item->{face}, 2560 face => $item->{face},
2554 anim => $item->{anim}, 2561 anim => $item->{anim},
2555 animspeed => $item->{animspeed}); 2562 animspeed => $item->{animspeed},
2563 );
2564
2556 $self->add(new CFClient::UI::Label 2565 $self->add (new CFClient::UI::Label
2557 can_events => 0, 2566 can_events => 0,
2558 text => $desc); 2567 text => $desc,
2568 );
2559 2569
2560 $self 2570 $self
2561} 2571}
2562 2572
2563############################################################################# 2573#############################################################################
… …
2581 my ($self, $items) = @_; 2591 my ($self, $items) = @_;
2582 2592
2583 $self->{scrolled}->clear; 2593 $self->{scrolled}->clear;
2584 return unless $items; 2594 return unless $items;
2585 2595
2586 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2596 my @items = sort {
2597 ($a->{type} <=> $b->{type})
2598 or ($a->{name} cmp $b->{name})
2599 } @$items;
2587 2600
2588 $self->{real_items} = \@items; 2601 $self->{real_items} = \@items;
2589 2602
2590 for my $item (@items) { 2603 for my $item (@items) {
2591 my $desc = $item->{nrof} < 2 2604 my $desc = $item->{nrof} < 2
2592 ? $item->{name} 2605 ? $item->{name}
2593 : "$item->{nrof} $item->{name_pl}"; 2606 : "$item->{nrof} $item->{name_pl}";
2594 2607
2595 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2608 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2596 } 2609 }
2610
2611 $self->{scrolled}->add (@items);
2597 2612
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2613# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2599} 2614}
2600 2615
2601sub size_request { 2616sub size_request {
… …
2675 } 2690 }
2676} 2691}
2677 2692
2678############################################################################# 2693#############################################################################
2679 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
2680package CFClient::UI::Root; 2786package CFClient::UI::Root;
2681 2787
2682our @ISA = CFClient::UI::Container::; 2788our @ISA = CFClient::UI::Container::;
2683 2789
2684use CFClient::OpenGL; 2790use CFClient::OpenGL;
2685 2791
2792sub new {
2793 my $class = shift;
2794
2795 $class->SUPER::new (
2796 @_,
2797 )
2798}
2799
2800sub configure {
2801 my ($self, $x, $y, $w, $h) = @_;
2802
2803 $self->{w} = $w;
2804 $self->{h} = $h;
2805}
2806
2686sub check_size { 2807sub check_size {
2687 my ($self) = @_; 2808 my ($self) = @_;
2688 2809
2689 $self->configure (0, 0, $self->{w}, $self->{h}); 2810 $self->size_allocate ($self->{w}, $self->{h})
2811 if $self->{w};
2690} 2812}
2691 2813
2692sub size_request { 2814sub size_request {
2693 my ($self) = @_; 2815 my ($self) = @_;
2694 2816
… …
2696} 2818}
2697 2819
2698sub size_allocate { 2820sub size_allocate {
2699 my ($self, $w, $h) = @_; 2821 my ($self, $w, $h) = @_;
2700 2822
2701 my $old_w = $self->{old_w}; 2823 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2702 my $old_h = $self->{old_h}; 2824 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2703 2825
2704 if ($old_w && $old_h) { 2826 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2705 for my $child ($self->children) { 2827 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2706 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2707 $child->{w} = int 0.5 + $child->{req_w} * $w / $old_w;
2708 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2709 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2710 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2711 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2712 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2713 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2714 }
2715 }
2716
2717 $self->{old_w} = $w;
2718 $self->{old_h} = $h;
2719}
2720
2721sub configure {
2722 my ($self, $x, $y, $w, $h) = @_;
2723
2724 $self->SUPER::configure ($x, $y, $w, $h);
2725 2828
2726 for my $child ($self->children) { 2829 for my $child ($self->children) {
2727 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)};
2728 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
2729 $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;
2730 $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
2731 $child->configure ($X, $Y, $W, $H); 2841 $child->configure ($X, $Y, $W, $H);
2732 } 2842 }
2733} 2843}
2734 2844
2735sub _topleft { 2845sub coord2local {
2736 my ($self, $x, $y) = @_; 2846 my ($self, $x, $y) = @_;
2737 2847
2738 ($x, $y) 2848 ($x, $y)
2739} 2849}
2740 2850
2851sub coord2global {
2852 my ($self, $x, $y) = @_;
2853
2854 ($x, $y)
2855}
2856
2741sub update { 2857sub update {
2742 my ($self) = @_; 2858 my ($self) = @_;
2743 2859
2744 $self->check_size; 2860 $self->check_size;
2745 ::refresh (); 2861 $::WANT_REFRESH++;
2746} 2862}
2747 2863
2748sub add { 2864sub add {
2749 my ($self, $child) = @_; 2865 my ($self, @children) = @_;
2750 2866
2867 for my $child (@children) {
2868 $child->{toplevel} = 1;
2869
2751 # integerize window positions 2870 # integerise window positions
2752 $child->{x} = int $child->{x}; 2871 $child->{x} = int $child->{x};
2753 $child->{y} = int $child->{y}; 2872 $child->{y} = int $child->{y};
2873 }
2754 2874
2755 $self->SUPER::add ($child); 2875 $self->SUPER::add (@children);
2756} 2876}
2757 2877
2758sub on_refresh { 2878sub on_refresh {
2759 my ($self, $id, $cb) = @_; 2879 my ($self, $id, $cb) = @_;
2760 2880
2761 $self->{refresh_hook}{$id} = $cb; 2881 $self->{refresh_hook}{$id} = $cb;
2762} 2882}
2763 2883
2884sub on_post_alloc {
2885 my ($self, $id, $cb) = @_;
2886
2887 $self->{post_alloc_hook}{$id} = $cb;
2888}
2889
2764sub draw { 2890sub draw {
2765 my ($self) = @_; 2891 my ($self) = @_;
2766 2892
2767 while (my $rcb = delete $self->{refresh_hook}) { 2893 while ($self->{refresh_hook}) {
2768 $_->() 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}};
2769 } 2946 }
2770 2947
2771 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2948 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2772 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2949 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2773 glClear GL_COLOR_BUFFER_BIT; 2950 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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