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.188 by root, Mon May 8 21:16:09 2006 UTC vs.
Revision 1.205 by root, Mon May 15 00:15:08 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
… …
542 $self->{children} = [ 531 $self->{children} = [
543 sort { $a->{z} <=> $b->{z} } 532 sort { $a->{z} <=> $b->{z} }
544 @{$self->{children}}, @widgets 533 @{$self->{children}}, @widgets
545 ]; 534 ];
546 535
547 $_->check_size 536 $self->check_size (1);
548 for @widgets;
549
550 $self->update; 537 $self->update;
551} 538}
552 539
553sub children { 540sub children {
554 @{ $_[0]{children} } 541 @{ $_[0]{children} }
… …
661} 648}
662 649
663sub update { 650sub update {
664 my ($self) = @_; 651 my ($self) = @_;
665 652
666 $ROOT->on_refresh ($self => sub { $self->render_child }); 653 $ROOT->on_post_alloc ($self => sub { $self->render_child });
667 $self->SUPER::update; 654 $self->SUPER::update;
668} 655}
669 656
670sub size_allocate { 657sub size_allocate {
671 my ($self, $w, $h) = @_; 658 my ($self, $w, $h) = @_;
… …
702 my ($w, $h) = ($self->w, $self->h); 689 my ($w, $h) = ($self->w, $self->h);
703 690
704 my $tex = $self->{texture} 691 my $tex = $self->{texture}
705 or return; 692 or return;
706 693
707 glEnable GL_BLEND;
708 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
709 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
710 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
711 glColor 0, 0, 0, 1; 696 glColor 0, 0, 0, 1;
712 697
713 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
714 699
715 glDisable GL_BLEND;
716 glDisable GL_TEXTURE_2D; 700 glDisable GL_TEXTURE_2D;
717} 701}
718 702
719############################################################################# 703#############################################################################
720 704
… …
744 $self->{view_y} = int $y; 728 $self->{view_y} = int $y;
745 729
746 $self->update; 730 $self->update;
747} 731}
748 732
749# 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
750sub _topleft { 734sub coord2local {
751 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
752 736
753 $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)
754} 747}
755 748
756sub find_widget { 749sub find_widget {
757 my ($self, $x, $y) = @_; 750 my ($self, $x, $y) = @_;
758 751
… …
803 $self->add ($self->{slider}); 796 $self->add ($self->{slider});
804 797
805 $self 798 $self
806} 799}
807 800
808#TODO# update range on size_allocate depeneing on child 801#TODO# update range on size_allocate depending on child
809# update viewport offset on scroll 802# update viewport offset on scroll
810 803
811############################################################################# 804#############################################################################
812 805
813package CFClient::UI::Frame; 806package CFClient::UI::Frame;
… …
817use CFClient::OpenGL; 810use CFClient::OpenGL;
818 811
819sub new { 812sub new {
820 my $class = shift; 813 my $class = shift;
821 814
822 my $self = $class->SUPER::new ( 815 $class->SUPER::new (
823 bg => [1, 1, 1, 1], 816 bg => undef,
824 border_bg => [1, 1, 1, 1],
825 border => 0.8,
826 @_ 817 @_,
827 ); 818 )
828
829 $self
830} 819}
831 820
832sub _draw { 821sub _draw {
833 my ($self) = @_; 822 my ($self) = @_;
834 823
835 my ($w, $h) = ($self->{w}, $self->{h}); 824 if ($self->{bg}) {
825 my ($w, $h) = @$self{qw(w h)};
836 826
837 glEnable GL_BLEND; 827 glEnable GL_BLEND;
838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839 glEnable GL_TEXTURE_2D; 829 glColor @{ $self->{bg} };
840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
841 830
842# glBegin GL_QUADS; 831 glBegin GL_QUADS;
843# glColor 0, 0, 0, 0;
844# glVertex 0 , 0; 832 glVertex 0 , 0;
845# glVertex 0 , $h; 833 glVertex 0 , $h;
846# glVertex $w, $h; 834 glVertex $w, $h;
847# glVertex $w, 0; 835 glVertex $w, 0;
848# glEnd; 836 glEnd;
849 837
850
851 $self->child->draw;
852 glDisable GL_BLEND; 838 glDisable GL_BLEND;
853 glDisable GL_TEXTURE_2D; 839 }
840
841 $self->SUPER::_draw;
854} 842}
855 843
856############################################################################# 844#############################################################################
857 845
858package CFClient::UI::FancyFrame; 846package CFClient::UI::FancyFrame;
… …
872 860
873 my $self = $class->SUPER::new ( 861 my $self = $class->SUPER::new (
874 bg => [1, 1, 1, 1], 862 bg => [1, 1, 1, 1],
875 border_bg => [1, 1, 1, 1], 863 border_bg => [1, 1, 1, 1],
876 border => 0.6, 864 border => 0.6,
865 toplevel => 1,
877 can_events => 1, 866 can_events => 1,
878 @_ 867 @_
879 ); 868 );
880 869
881 $self->{title} &&= new CFClient::UI::Label 870 $self->{title} &&= new CFClient::UI::Label
… …
974 my ($self) = @_; 963 my ($self) = @_;
975 964
976 my ($w, $h ) = ($self->{w}, $self->{h}); 965 my ($w, $h ) = ($self->{w}, $self->{h});
977 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
978 967
979 glEnable GL_BLEND;
980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
981 glEnable GL_TEXTURE_2D; 968 glEnable GL_TEXTURE_2D;
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 970
984 my $border = $self->border; 971 my $border = $self->border;
985 972
986 glColor @{ $self->{border_bg} }; 973 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad (0, 0, $w, $border); 974 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
988 $tex[3]->draw_quad (0, $border, $border, $ch); 975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
989 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad (0, $h - $border, $w, $border); 977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
991 978
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 980 my $bg = $tex[0];
994 981
995 # TODO: repeat texture not scale 982 # TODO: repeat texture not scale
… …
999 glColor @{ $self->{bg} }; 986 glColor @{ $self->{bg} };
1000 987
1001 $bg->{s} = $rep_x; 988 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y; 989 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1; 990 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad ($border, $border, $cw, $ch); 991 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 }
1005 993
1006 glDisable GL_TEXTURE_2D; 994 glDisable GL_TEXTURE_2D;
1007 glDisable GL_BLEND;
1008 }
1009 995
1010 $self->{title}->draw if $self->{title}; 996 $self->{title}->draw if $self->{title};
1011 997
1012 $self->child->draw; 998 $self->child->draw;
1013} 999}
… …
1240} 1226}
1241 1227
1242sub size_allocate { 1228sub size_allocate {
1243 my ($self, $w, $h) = @_; 1229 my ($self, $w, $h) = @_;
1244 1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1245 my $children = $self->{children}; 1233 my $children = $self->{children};
1246 1234
1247 my @h = map $_->{req_h}, @$children; 1235 my @h = map $_->{req_h}, @$children;
1248 1236
1249 my $req_h = List::Util::sum @h; 1237 my $req_h = List::Util::sum @h;
… …
1288 my ($class, %arg) = @_; 1276 my ($class, %arg) = @_;
1289 1277
1290 my $self = $class->SUPER::new ( 1278 my $self = $class->SUPER::new (
1291 fg => [1, 1, 1], 1279 fg => [1, 1, 1],
1292 #font => default_font 1280 #font => default_font
1281 #text => initial text
1282 #markup => initial narkup
1283 layout => (new CFClient::Layout),
1293 fontsize => 1, 1284 fontsize => 1,
1294 text => "",
1295 align => -1, 1285 align => -1,
1296 valign => -1, 1286 valign => -1,
1297 padding => 2, 1287 padding => 2,
1298 layout => new CFClient::Layout,
1299 can_events => 0, 1288 can_events => 0,
1300 %arg 1289 %arg
1301 ); 1290 );
1302 1291
1303 if (exists $self->{template}) { 1292 if (exists $self->{template}) {
1304 my $layout = new CFClient::Layout; 1293 my $layout = new CFClient::Layout;
1305 $layout->set_text (delete $self->{template}); 1294 $layout->set_text (delete $self->{template});
1306 $self->{template} = $layout; 1295 $self->{template} = $layout;
1307 } 1296 }
1308 1297
1309 $self->set_text (delete $self->{text}) if exists $self->{text}; 1298 if (exists $self->{markup}) {
1310 $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 }
1311 1303
1312 $self 1304 $self
1313} 1305}
1314 1306
1315sub escape { 1307sub escape {
… …
1333 my ($self, $text) = @_; 1325 my ($self, $text) = @_;
1334 1326
1335 return if $self->{text} eq "T$text"; 1327 return if $self->{text} eq "T$text";
1336 $self->{text} = "T$text"; 1328 $self->{text} = "T$text";
1337 1329
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1338 $self->{layout}->set_text ($text); 1331 $self->{layout}->set_text ($text);
1339 1332
1340 delete $self->{texture};
1341 $self->update; 1333 $self->update;
1342 $self->check_size; 1334 $self->check_size;
1343} 1335}
1344 1336
1345sub set_markup { 1337sub set_markup {
1346 my ($self, $markup) = @_; 1338 my ($self, $markup) = @_;
1347 1339
1348 return if $self->{text} eq "M$markup"; 1340 return if $self->{text} eq "M$markup";
1349 $self->{text} = "M$markup"; 1341 $self->{text} = "M$markup";
1350 1342
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344
1345 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1351 $self->{layout}->set_markup ($markup); 1346 $self->{layout}->set_markup ($markup);
1352 1347
1353 delete $self->{texture};
1354 $self->update; 1348 $self->update;
1355 $self->check_size; 1349 $self->check_size;
1356} 1350}
1357 1351
1358sub size_request { 1352sub size_request {
… …
1398 1392
1399sub _draw { 1393sub _draw {
1400 my ($self) = @_; 1394 my ($self) = @_;
1401 1395
1402 my $tex = $self->{texture} ||= do { 1396 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}});
1403 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1398 $self->{layout}->set_font ($self->{font}) if $self->{font};
1404 $self->{layout}->set_width ($self->{w}); 1399 $self->{layout}->set_width ($self->{w});
1405 $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
1406 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
1407 }; 1413 };
1408 1414
1409 glEnable GL_BLEND;
1410 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1411 glEnable GL_TEXTURE_2D; 1415 glEnable GL_TEXTURE_2D;
1412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1413 1417
1418 if ($tex->{format} == GL_ALPHA) {
1414 glColor @{$self->{fg}}; 1419 glColor @{$self->{fg}};
1415
1416 $self->{ox} = int (
1417 $self->{align} < 0 ? $self->{padding}
1418 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1419 : ($self->{w} - $tex->{w}) * 0.5
1420 );
1421
1422 $self->{oy} = int (
1423 $self->{valign} < 0 ? $self->{padding}
1424 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1425 : ($self->{h} - $tex->{h}) * 0.5
1426 );
1427
1428 $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 }
1429 1424
1430 glDisable GL_TEXTURE_2D; 1425 glDisable GL_TEXTURE_2D;
1431 glDisable GL_BLEND;
1432} 1426}
1433 1427
1434############################################################################# 1428#############################################################################
1435 1429
1436package CFClient::UI::EntryBase; 1430package CFClient::UI::EntryBase;
… …
1471 $self->{layout}->set_text ("$text "); 1465 $self->{layout}->set_text ("$text ");
1472 1466
1473 $self->emit (changed => $self->{text}); 1467 $self->emit (changed => $self->{text});
1474} 1468}
1475 1469
1470sub set_text {
1471 my ($self, $text) = @_;
1472
1473 $self->{cursor} = length $text;
1474 $self->_set_text ($text);
1475 $self->check_size;
1476 $self->update;
1477}
1478
1476sub get_text { 1479sub get_text {
1477 $_[0]{text} 1480 $_[0]{text}
1478} 1481}
1479 1482
1480sub size_request { 1483sub size_request {
… …
1487 1490
1488sub size_allocate { 1491sub size_allocate {
1489 my ($self, $w, $h) = @_; 1492 my ($self, $w, $h) = @_;
1490 1493
1491 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1492}
1493
1494sub set_text {
1495 my ($self, $text) = @_;
1496
1497 $self->{cursor} = length $text;
1498 $self->_set_text ($text);
1499 $self->update;
1500} 1495}
1501 1496
1502sub key_down { 1497sub key_down {
1503 my ($self, $ev) = @_; 1498 my ($self, $ev) = @_;
1504 1499
… …
1506 my $sym = $ev->{sym}; 1501 my $sym = $ev->{sym};
1507 my $uni = $ev->{unicode}; 1502 my $uni = $ev->{unicode};
1508 1503
1509 my $text = $self->get_text; 1504 my $text = $self->get_text;
1510 1505
1511 if ($sym == 8) { 1506 if ($uni == 8) {
1512 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1507 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1513 } elsif ($sym == 127) { 1508 } elsif ($uni == 127) {
1514 substr $text, $self->{cursor}, 1, ""; 1509 substr $text, $self->{cursor}, 1, "";
1515 } elsif ($sym == CFClient::SDLK_LEFT) { 1510 } elsif ($sym == CFClient::SDLK_LEFT) {
1516 --$self->{cursor} if $self->{cursor}; 1511 --$self->{cursor} if $self->{cursor};
1517 } elsif ($sym == CFClient::SDLK_RIGHT) { 1512 } elsif ($sym == CFClient::SDLK_RIGHT) {
1518 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1513 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1519 } elsif ($sym == CFClient::SDLK_HOME) { 1514 } elsif ($sym == CFClient::SDLK_HOME) {
1520 $self->{cursor} = 0; 1515 $self->{cursor} = 0;
1521 } elsif ($sym == CFClient::SDLK_END) { 1516 } elsif ($sym == CFClient::SDLK_END) {
1522 $self->{cursor} = length $text; 1517 $self->{cursor} = length $text;
1523 } elsif ($sym == 27) { 1518 } elsif ($uni == 27) {
1524 $self->emit ('escape'); 1519 $self->emit ('escape');
1525 } elsif ($uni) { 1520 } elsif ($uni) {
1526 substr $text, $self->{cursor}++, 0, chr $uni; 1521 substr $text, $self->{cursor}++, 0, chr $uni;
1527 } 1522 }
1528 1523
… …
1692 1687
1693 if ($GRAB == $self) { 1688 if ($GRAB == $self) {
1694 $self->{fg} = $self->{active_fg}; 1689 $self->{fg} = $self->{active_fg};
1695 } 1690 }
1696 1691
1697 glEnable GL_BLEND;
1698 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1699 glEnable GL_TEXTURE_2D; 1692 glEnable GL_TEXTURE_2D;
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1693 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 glColor 0, 0, 0, 1; 1694 glColor 0, 0, 0, 1;
1702 1695
1703 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1696 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1704 1697
1705 glDisable GL_TEXTURE_2D; 1698 glDisable GL_TEXTURE_2D;
1706 glDisable GL_BLEND;
1707 1699
1708 $self->SUPER::_draw; 1700 $self->SUPER::_draw;
1709} 1701}
1710 1702
1711############################################################################# 1703#############################################################################
… …
1758 1750
1759 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1751 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1760 1752
1761 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1753 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1762 1754
1763 glEnable GL_BLEND; 1755 my $tex = $self->{state} ? $tex[1] : $tex[0];
1756
1764 glEnable GL_TEXTURE_2D; 1757 glEnable GL_TEXTURE_2D;
1765 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1766
1767 my $tex = $self->{state} ? $tex[1] : $tex[0];
1768
1769 $tex->draw_quad (0, 0, $s, $s); 1758 $tex->draw_quad_alpha (0, 0, $s, $s);
1770
1771 glDisable GL_TEXTURE_2D; 1759 glDisable GL_TEXTURE_2D;
1772 glDisable GL_BLEND;
1773} 1760}
1774 1761
1775############################################################################# 1762#############################################################################
1776 1763
1777package CFClient::UI::Image; 1764package CFClient::UI::Image;
… …
1820 glTranslate 0, -$self->{w}, 0; 1807 glTranslate 0, -$self->{w}, 0;
1821 1808
1822 ($w, $h) = ($h, $w); 1809 ($w, $h) = ($h, $w);
1823 } 1810 }
1824 1811
1825 glEnable GL_BLEND;
1826 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827 glEnable GL_TEXTURE_2D; 1812 glEnable GL_TEXTURE_2D;
1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829 1814
1830 $tex->draw_quad (0, 0, $w, $h); 1815 $tex->draw_quad_alpha (0, 0, $w, $h);
1831 1816
1832 glDisable GL_BLEND;
1833 glDisable GL_TEXTURE_2D; 1817 glDisable GL_TEXTURE_2D;
1834} 1818}
1835 1819
1836############################################################################# 1820#############################################################################
1837 1821
… …
2129 $page ||= 2; 2113 $page ||= 2;
2130 2114
2131 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2115 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2132 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2116 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2133 2117
2134 glEnable GL_BLEND;
2135 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2136 glEnable GL_TEXTURE_2D; 2118 glEnable GL_TEXTURE_2D;
2137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2119 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2138 2120
2139 # draw background 2121 # draw background
2140 $tex[1]->draw_quad (0, 0, $w, $h); 2122 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
2141 2123
2142 # draw handle 2124 # draw handle
2143 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2125 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
2144 2126
2145 glDisable GL_BLEND;
2146 glDisable GL_TEXTURE_2D; 2127 glDisable GL_TEXTURE_2D;
2147} 2128}
2148 2129
2149############################################################################# 2130#############################################################################
2150 2131
… …
2161 fontsize => 1, 2142 fontsize => 1,
2162 can_events => 0, 2143 can_events => 0,
2163 #font => default_font 2144 #font => default_font
2164 @_, 2145 @_,
2165 2146
2166 layout => (new CFClient::Layout), 2147 layout => (new CFClient::Layout 1),
2167 par => [], 2148 par => [],
2168 height => 0, 2149 height => 0,
2169 children => [ 2150 children => [
2170 (new CFClient::UI::Empty expand => 1), 2151 (new CFClient::UI::Empty expand => 1),
2171 (new CFClient::UI::Slider vertical => 1), 2152 (new CFClient::UI::Slider vertical => 1),
… …
2189 2170
2190 my $layout = $self->{layout}; 2171 my $layout = $self->{layout};
2191 2172
2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2173 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2193 $layout->set_width ($self->{children}[0]{w}); 2174 $layout->set_width ($self->{children}[0]{w});
2194 $layout->set_text ($text); 2175 $layout->set_markup ($text);
2195 2176
2196 ($layout->size)[1] 2177 ($layout->size)[1]
2197} 2178}
2198 2179
2199sub reflow { 2180sub reflow {
… …
2237 2218
2238 return unless $self->{h} > 0; 2219 return unless $self->{h} > 0;
2239 2220
2240 delete $self->{texture}; 2221 delete $self->{texture};
2241 2222
2242 $ROOT->on_refresh ($self, sub { 2223 $ROOT->on_post_alloc ($self, sub {
2243 if (delete $self->{need_reflow}) { 2224 if (delete $self->{need_reflow}) {
2244 my $height = 0; 2225 my $height = 0;
2245 2226
2246 $height += $_->[0] = $self->text_height ($_->[2]) 2227 $height += $_->[0] = $self->text_height ($_->[2])
2247 for @{$self->{par}}; 2228 for @{$self->{par}};
… …
2255 2236
2256 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2237 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2257 glClearColor 0, 0, 0, 0; 2238 glClearColor 0, 0, 0, 0;
2258 glClear GL_COLOR_BUFFER_BIT; 2239 glClear GL_COLOR_BUFFER_BIT;
2259 2240
2260 glEnable GL_BLEND;
2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2262 glEnable GL_TEXTURE_2D; 2241 glEnable GL_TEXTURE_2D;
2263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2264 2243
2265 my $top = int $self->{children}[1]{range}[0]; 2244 my $top = int $self->{children}[1]{range}[0];
2266 2245
… …
2275 2254
2276 for my $par (@{$self->{par}}) { 2255 for my $par (@{$self->{par}}) {
2277 my $h = $par->[0]; 2256 my $h = $par->[0];
2278 2257
2279 if ($y0 < $y + $h && $y < $y1) { 2258 if ($y0 < $y + $h && $y < $y1) {
2259 $layout->set_foreground (@{ $par->[1] });
2280 $layout->set_text ($par->[2]); 2260 $layout->set_markup ($par->[2]);
2281 2261
2282 glColor @{ $par->[1] };
2283 my ($W, $H) = $layout->size; 2262 my ($W, $H) = $layout->size;
2284 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2263 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2285 } 2264 }
2286 2265
2287 $y += $h; 2266 $y += $h;
2288 } 2267 }
2289 2268
2290 glDisable GL_TEXTURE_2D; 2269 glDisable GL_TEXTURE_2D;
2291 glDisable GL_BLEND;
2292 }; 2270 };
2293 }); 2271 });
2294} 2272}
2295 2273
2296sub _draw { 2274sub _draw {
2297 my ($self) = @_; 2275 my ($self) = @_;
2298 2276
2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2301 glEnable GL_TEXTURE_2D; 2277 glEnable GL_TEXTURE_2D;
2302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2278 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303 glColor 1, 1, 1, 1; 2279 glColor 1, 1, 1, 1;
2304 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2280 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2305 glDisable GL_TEXTURE_2D; 2281 glDisable GL_TEXTURE_2D;
2306 glDisable GL_BLEND;
2307 2282
2308 $self->{children}[1]->draw; 2283 $self->{children}[1]->draw;
2309 2284
2310} 2285}
2311 2286
… …
2405 @_, 2380 @_,
2406 can_events => 0, 2381 can_events => 0,
2407 ) 2382 )
2408} 2383}
2409 2384
2410sub set_markup { 2385sub set_tooltip_from {
2411 my ($self, $text) = @_; 2386 my ($self, $widget) = @_;
2412 2387
2413 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2388 $self->add (new CFClient::UI::Label
2414 $self->{label}->set_markup ($text); 2389 markup => $widget->{tooltip},
2415 $self->add ($self->{label}); 2390 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2391 fontsize => 0.8,
2392 fg => [0, 0, 0, 1],
2393 font => ($widget->{tooltip_font} || $::FONT_PROP),
2394 );
2416} 2395}
2417 2396
2418sub size_request { 2397sub size_request {
2419 my ($self) = @_; 2398 my ($self) = @_;
2420
2421 $self->child->set_max_size ($::WIDTH * 0.3);
2422 2399
2423 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2400 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2424 2401
2425 ($w + 4, $h + 4) 2402 ($w + 4, $h + 4)
2426} 2403}
… …
2432} 2409}
2433 2410
2434sub _draw { 2411sub _draw {
2435 my ($self) = @_; 2412 my ($self) = @_;
2436 2413
2437 glPushMatrix;
2438 glTranslate 0.375, 0.375; 2414 glTranslate 0.375, 0.375;
2439 2415
2440 my ($w, $h) = @$self{qw(w h)}; 2416 my ($w, $h) = @$self{qw(w h)};
2441 2417
2442 glColor 1, 0.8, 0.4; 2418 glColor 1, 0.8, 0.4;
… …
2453 glVertex 0 , $h; 2429 glVertex 0 , $h;
2454 glVertex $w, $h; 2430 glVertex $w, $h;
2455 glVertex $w, 0; 2431 glVertex $w, 0;
2456 glEnd; 2432 glEnd;
2457 2433
2458 glPopMatrix; 2434 glTranslate 2 - 0.375, 2 - 0.375;
2459
2460 glTranslate 2, 2;
2461 $self->SUPER::_draw; 2435 $self->SUPER::_draw;
2462} 2436}
2463 2437
2464############################################################################# 2438#############################################################################
2465 2439
… …
2488 return unless $::CONN;#d# manage and cache textures differently 2462 return unless $::CONN;#d# manage and cache textures differently
2489 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2463 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2490 2464
2491 # TODO animation 2465 # TODO animation
2492 if ($tex) { 2466 if ($tex) {
2493 glEnable GL_BLEND;
2494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2495 glEnable GL_TEXTURE_2D; 2467 glEnable GL_TEXTURE_2D;
2496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2468 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2497 glColor 1, 1, 1, 1; 2469 glColor 1, 1, 1, 1;
2498 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2470 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2499 glDisable GL_TEXTURE_2D; 2471 glDisable GL_TEXTURE_2D;
2500 glDisable GL_BLEND;
2501 } 2472 }
2502} 2473}
2503 2474
2504############################################################################# 2475#############################################################################
2505 2476
… …
2510sub new { 2481sub new {
2511 my $class = shift; 2482 my $class = shift;
2512 2483
2513 my %args = @_; 2484 my %args = @_;
2514 2485
2515 my $item = $args{item}; 2486 my $item = delete $args{item};
2516 2487
2517 my $desc = $item->{nrof} < 2 2488 my $desc = $item->{nrof} < 2
2518 ? $item->{name} 2489 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}"; 2490 : "$item->{nrof} $item->{name_pl}";
2520 2491
… …
2549 2520
2550 1 2521 1
2551 }, 2522 },
2552 %args 2523 %args
2553 ); 2524 );
2525
2554 $self->add(new CFClient::UI::Face 2526 $self->add (new CFClient::UI::Face
2555 can_events => 0, 2527 can_events => 0,
2556 face => $item->{face}, 2528 face => $item->{face},
2557 anim => $item->{anim}, 2529 anim => $item->{anim},
2558 animspeed => $item->{animspeed}); 2530 animspeed => $item->{animspeed},
2531 );
2532
2559 $self->add(new CFClient::UI::Label 2533 $self->add (new CFClient::UI::Label
2560 can_events => 0, 2534 can_events => 0,
2561 text => $desc); 2535 text => $desc,
2536 );
2562 2537
2563 $self 2538 $self
2564} 2539}
2565 2540
2566############################################################################# 2541#############################################################################
… …
2584 my ($self, $items) = @_; 2559 my ($self, $items) = @_;
2585 2560
2586 $self->{scrolled}->clear; 2561 $self->{scrolled}->clear;
2587 return unless $items; 2562 return unless $items;
2588 2563
2589 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2564 my @items = sort {
2565 ($a->{type} <=> $b->{type})
2566 or ($a->{name} cmp $b->{name})
2567 } @$items;
2590 2568
2591 $self->{real_items} = \@items; 2569 $self->{real_items} = \@items;
2592 2570
2593 for my $item (@items) { 2571 for my $item (@items) {
2594 my $desc = $item->{nrof} < 2 2572 my $desc = $item->{nrof} < 2
2595 ? $item->{name} 2573 ? $item->{name}
2596 : "$item->{nrof} $item->{name_pl}"; 2574 : "$item->{nrof} $item->{name_pl}";
2597 2575
2598 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2576 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2599 } 2577 }
2578
2579 $self->{scrolled}->add (@items);
2600 2580
2601# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2581# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2602} 2582}
2603 2583
2604sub size_request { 2584sub size_request {
… …
2678 } 2658 }
2679} 2659}
2680 2660
2681############################################################################# 2661#############################################################################
2682 2662
2663package CFClient::UI::Statusbox;
2664
2665our @ISA = CFClient::UI::VBox::;
2666
2667sub reorder {
2668 my ($self) = @_;
2669 my $NOW = time;
2670
2671 while (my ($k, $v) = each %{ $self->{item} }) {
2672 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2673 }
2674
2675 my @widgets;
2676
2677 my @items = sort {
2678 $a->{pri} <=> $b->{pri}
2679 or $b->{id} <=> $a->{id}
2680 } values %{ $self->{item} };
2681
2682 my $count = 10 + 1;
2683 for my $item (@items) {
2684 last unless --$count;
2685
2686 push @widgets, $item->{label} ||= do {
2687 # TODO: doesn't handle markup well (read as: at all)
2688 my $short = $item->{count} > 1
2689 ? "<b>$item->{count} ×</b> $item->{text}"
2690 : $item->{text};
2691
2692 for ($short) {
2693 s/^\s+//;
2694 s/\s+/ /g;
2695 my $len = int 40 / $item->{fontsize};
2696 substr $_, $len, length, "…" if $len < length;
2697 }
2698
2699 new CFClient::UI::Label
2700 markup => $short,
2701 tooltip => $item->{tooltip},
2702 tooltip_font => $::FONT_PROP,
2703 tooltip_width => 0.67,
2704 fontsize => $item->{fontsize},
2705 fg => $item->{fg},
2706 can_events => 1,
2707 can_hover => 1
2708 };
2709 }
2710
2711 $self->clear;
2712 $self->SUPER::add (reverse @widgets);
2713}
2714
2715sub add {
2716 my ($self, $text, %arg) = @_;
2717
2718 $text =~ s/^\s+//;
2719 $text =~ s/\s+$//;
2720
2721 my $timeout = time + ((delete $arg{timeout}) || 60);
2722
2723 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2724
2725 if (my $item = $self->{item}{$group}) {
2726 if ($item->{text} eq $text) {
2727 $item->{count}++;
2728 } else {
2729 $item->{count} = 1;
2730 $item->{text} = $item->{tooltip} = $text;
2731 }
2732 $item->{id} = ++$self->{id};
2733 $item->{timeout} = $timeout;
2734 delete $item->{label};
2735 } else {
2736 $self->{item}{$group} = {
2737 id => ++$self->{id},
2738 text => $text,
2739 timeout => $timeout,
2740 tooltip => $text,
2741 fontsize => 0.8,
2742 fg => [0.8, 0.8, 0.8, 0.8],
2743 pri => 0,
2744 count => 1,
2745 %arg,
2746 };
2747 }
2748
2749 $self->reorder;
2750}
2751
2752#############################################################################
2753
2683package CFClient::UI::Root; 2754package CFClient::UI::Root;
2684 2755
2685our @ISA = CFClient::UI::Container::; 2756our @ISA = CFClient::UI::Container::;
2686 2757
2687use CFClient::OpenGL; 2758use CFClient::OpenGL;
2688 2759
2760sub new {
2761 my $class = shift;
2762
2763 $class->SUPER::new (
2764 @_,
2765 )
2766}
2767
2768sub configure {
2769 my ($self, $x, $y, $w, $h) = @_;
2770
2771 $self->{w} = $w;
2772 $self->{h} = $h;
2773}
2774
2689sub check_size { 2775sub check_size {
2690 my ($self) = @_; 2776 my ($self) = @_;
2691 2777
2692 $self->configure (0, 0, $self->{w}, $self->{h}); 2778 $self->size_allocate ($self->{w}, $self->{h})
2779 if $self->{w};
2693} 2780}
2694 2781
2695sub size_request { 2782sub size_request {
2696 my ($self) = @_; 2783 my ($self) = @_;
2697 2784
… …
2699} 2786}
2700 2787
2701sub size_allocate { 2788sub size_allocate {
2702 my ($self, $w, $h) = @_; 2789 my ($self, $w, $h) = @_;
2703 2790
2704 my $old_w = $self->{old_w}; 2791 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2705 my $old_h = $self->{old_h}; 2792 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2706 2793
2707 if ($old_w && $old_h) { 2794 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2708 for my $child ($self->children) { 2795 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2709 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2710 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2711 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2712 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2713 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2714 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2715 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2716 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2717 }
2718 }
2719
2720 $self->{old_w} = $w;
2721 $self->{old_h} = $h;
2722}
2723
2724sub configure {
2725 my ($self, $x, $y, $w, $h) = @_;
2726
2727 $self->SUPER::configure ($x, $y, $w, $h);
2728 2796
2729 for my $child ($self->children) { 2797 for my $child ($self->children) {
2730 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2798 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2731 2799
2800 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2801 if exists $child->{req_x};
2802
2803 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2804 if exists $child->{req_y};
2805
2732 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2806 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2733 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2807 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2808
2734 $child->configure ($X, $Y, $W, $H); 2809 $child->configure ($X, $Y, $W, $H);
2735 } 2810 }
2736} 2811}
2737 2812
2738sub _topleft { 2813sub coord2local {
2739 my ($self, $x, $y) = @_; 2814 my ($self, $x, $y) = @_;
2740 2815
2741 ($x, $y) 2816 ($x, $y)
2742} 2817}
2743 2818
2819sub coord2global {
2820 my ($self, $x, $y) = @_;
2821
2822 ($x, $y)
2823}
2824
2744sub update { 2825sub update {
2745 my ($self) = @_; 2826 my ($self) = @_;
2746 2827
2747 $self->check_size; 2828 $self->check_size;
2748 ::refresh (); 2829 $::WANT_REFRESH++;
2749} 2830}
2750 2831
2751sub add { 2832sub add {
2752 my ($self, $child) = @_; 2833 my ($self, @children) = @_;
2753 2834
2835 for my $child (@children) {
2836 $child->{toplevel} = 1;
2837
2754 # integerize window positions 2838 # integerise window positions
2755 $child->{x} = int $child->{x}; 2839 $child->{x} = int $child->{x};
2756 $child->{y} = int $child->{y}; 2840 $child->{y} = int $child->{y};
2841 }
2757 2842
2758 $self->SUPER::add ($child); 2843 $self->SUPER::add (@children);
2759} 2844}
2760 2845
2761sub on_refresh { 2846sub on_refresh {
2762 my ($self, $id, $cb) = @_; 2847 my ($self, $id, $cb) = @_;
2763 2848
2764 $self->{refresh_hook}{$id} = $cb; 2849 $self->{refresh_hook}{$id} = $cb;
2765} 2850}
2766 2851
2852sub on_post_alloc {
2853 my ($self, $id, $cb) = @_;
2854
2855 $self->{post_alloc_hook}{$id} = $cb;
2856}
2857
2767sub draw { 2858sub draw {
2768 my ($self) = @_; 2859 my ($self) = @_;
2769 2860
2770 while (my $rcb = delete $self->{refresh_hook}) { 2861 while ($self->{refresh_hook}) {
2771 $_->() for values %$rcb; 2862 $_->()
2863 for values %{delete $self->{refresh_hook}};
2864 }
2865
2866 if ($self->{check_size}) {
2867 my @queue = ([], []);
2868
2869 for (;;) {
2870 if ($self->{check_size}) {
2871 # heuristic: check containers last
2872 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2873 for values %{delete $self->{check_size}}
2874 }
2875
2876 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2877
2878 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2879 ? @$widget{qw(user_w user_h)}
2880 : $widget->size_request;
2881
2882 if (delete $widget->{force_alloc}
2883 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2884 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2885
2886 $widget->{req_w} = $w;
2887 $widget->{req_h} = $h;
2888
2889 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2890
2891 $widget->{parent}->check_size
2892 if $widget->{parent};
2893 }
2894 }
2895 }
2896
2897 while ($self->{size_alloc}) {
2898 for (values %{delete $self->{size_alloc}}) {
2899 my ($widget, $w, $h) = @$_;
2900
2901 $w = 0 if $w < 0;
2902 $h = 0 if $h < 0;
2903
2904 $widget->{w} = $w;
2905 $widget->{h} = $h;
2906 $widget->size_allocate ($w, $h);
2907 $widget->emit (size_allocate => $w, $h);
2908 }
2909 }
2910
2911 while ($self->{post_alloc_hook}) {
2912 $_->()
2913 for values %{delete $self->{post_alloc_hook}};
2772 } 2914 }
2773 2915
2774 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2916 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2775 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2917 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2776 glClear GL_COLOR_BUFFER_BIT; 2918 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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