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.189 by root, Mon May 8 22:17:24 2006 UTC vs.
Revision 1.204 by root, Sun May 14 22:24:16 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
… …
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->_check_size; 415 $self->{force_alloc} = 1 if $forced;
409 return;
410 my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
411
412 $check_size->{$self} = $self;
413
414 $CFClient::UI::ROOT->on_refresh (_check_size => sub {
415 while (%$check_size) {
416 my @widgets = values %$check_size;
417 $_->_check_size
418 for @widgets;
419 }
420 });
421}
422
423sub _check_size {
424 my ($self) = @_;
425
426 delete $CFClient::UI::ROOT->{_check_size}{$self}; 416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
427
428 $self->{parent}
429 or return 1;
430
431 my ($w, $h) = $self->{user_w} && $self->{user_h}
432 ? @$self{qw(user_w user_h)}
433 : $self->size_request;
434
435 if ($w != $self->{req_w} || $h != $self->{req_h}) {
436 $self->{req_w} = $w;
437 $self->{req_h} = $h;
438
439 $self->{parent}->_check_size
440 or $self->size_allocate (
441 (List::Util::max $self->{w}, $w),
442 (List::Util::max $self->{h}, $h),
443 );
444
445 1
446 } else {
447 0
448 }
449} 417}
450 418
451sub update { 419sub update {
452 my ($self) = @_; 420 my ($self) = @_;
453 421
454 my $update = $CFClient::UI::ROOT->{_update} ||= {}; 422 $self->{parent}->update
455 423 if $self->{parent};
456 $update->{$self} = $self;
457
458 $CFClient::UI::ROOT->on_refresh (_update => sub {
459 while (%$update) {
460 my @widgets = values %$update;
461 %$update = ();
462
463 $_->{parent} && $_->{parent}->update
464 for @widgets;
465 }
466 });
467} 424}
468 425
469sub connect { 426sub connect {
470 my ($self, $signal, $cb) = @_; 427 my ($self, $signal, $cb) = @_;
471 428
… …
479} 436}
480 437
481sub DESTROY { 438sub DESTROY {
482 my ($self) = @_; 439 my ($self) = @_;
483 440
441 delete $WIDGET{$self+0};
484 #$self->deactivate; 442 #$self->deactivate;
485} 443}
486 444
487############################################################################# 445#############################################################################
488 446
… …
573 $self->{children} = [ 531 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 532 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 533 @{$self->{children}}, @widgets
576 ]; 534 ];
577 535
578 $_->check_size 536 $self->check_size (1);
579 for @widgets;
580
581 $self->update; 537 $self->update;
582} 538}
583 539
584sub children { 540sub children {
585 @{ $_[0]{children} } 541 @{ $_[0]{children} }
… …
692} 648}
693 649
694sub update { 650sub update {
695 my ($self) = @_; 651 my ($self) = @_;
696 652
697 $ROOT->on_refresh ($self => sub { $self->render_child }); 653 $ROOT->on_post_alloc ($self => sub { $self->render_child });
698 $self->SUPER::update; 654 $self->SUPER::update;
699} 655}
700 656
701sub size_allocate { 657sub size_allocate {
702 my ($self, $w, $h) = @_; 658 my ($self, $w, $h) = @_;
… …
733 my ($w, $h) = ($self->w, $self->h); 689 my ($w, $h) = ($self->w, $self->h);
734 690
735 my $tex = $self->{texture} 691 my $tex = $self->{texture}
736 or return; 692 or return;
737 693
738 glEnable GL_BLEND;
739 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
740 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
742 glColor 0, 0, 0, 1; 696 glColor 0, 0, 0, 1;
743 697
744 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
745 699
746 glDisable GL_BLEND;
747 glDisable GL_TEXTURE_2D; 700 glDisable GL_TEXTURE_2D;
748} 701}
749 702
750############################################################################# 703#############################################################################
751 704
… …
775 $self->{view_y} = int $y; 728 $self->{view_y} = int $y;
776 729
777 $self->update; 730 $self->update;
778} 731}
779 732
780# 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
781sub _topleft { 734sub coord2local {
782 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
783 736
784 $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)
785} 747}
786 748
787sub find_widget { 749sub find_widget {
788 my ($self, $x, $y) = @_; 750 my ($self, $x, $y) = @_;
789 751
… …
834 $self->add ($self->{slider}); 796 $self->add ($self->{slider});
835 797
836 $self 798 $self
837} 799}
838 800
839#TODO# update range on size_allocate depeneing on child 801#TODO# update range on size_allocate depending on child
840# update viewport offset on scroll 802# update viewport offset on scroll
841 803
842############################################################################# 804#############################################################################
843 805
844package CFClient::UI::Frame; 806package CFClient::UI::Frame;
… …
848use CFClient::OpenGL; 810use CFClient::OpenGL;
849 811
850sub new { 812sub new {
851 my $class = shift; 813 my $class = shift;
852 814
853 my $self = $class->SUPER::new ( 815 $class->SUPER::new (
854 bg => [1, 1, 1, 1], 816 bg => undef,
855 border_bg => [1, 1, 1, 1],
856 border => 0.8,
857 @_ 817 @_,
858 ); 818 )
859
860 $self
861} 819}
862 820
863sub _draw { 821sub _draw {
864 my ($self) = @_; 822 my ($self) = @_;
865 823
866 my ($w, $h) = ($self->{w}, $self->{h}); 824 if ($self->{bg}) {
825 my ($w, $h) = @$self{qw(w h)};
867 826
868 glEnable GL_BLEND; 827 glEnable GL_BLEND;
869 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
870 glEnable GL_TEXTURE_2D; 829 glColor @{ $self->{bg} };
871 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
872 830
873# glBegin GL_QUADS; 831 glBegin GL_QUADS;
874# glColor 0, 0, 0, 0;
875# glVertex 0 , 0; 832 glVertex 0 , 0;
876# glVertex 0 , $h; 833 glVertex 0 , $h;
877# glVertex $w, $h; 834 glVertex $w, $h;
878# glVertex $w, 0; 835 glVertex $w, 0;
879# glEnd; 836 glEnd;
880 837
881
882 $self->child->draw;
883 glDisable GL_BLEND; 838 glDisable GL_BLEND;
884 glDisable GL_TEXTURE_2D; 839 }
840
841 $self->SUPER::_draw;
885} 842}
886 843
887############################################################################# 844#############################################################################
888 845
889package CFClient::UI::FancyFrame; 846package CFClient::UI::FancyFrame;
… …
903 860
904 my $self = $class->SUPER::new ( 861 my $self = $class->SUPER::new (
905 bg => [1, 1, 1, 1], 862 bg => [1, 1, 1, 1],
906 border_bg => [1, 1, 1, 1], 863 border_bg => [1, 1, 1, 1],
907 border => 0.6, 864 border => 0.6,
865 toplevel => 1,
908 can_events => 1, 866 can_events => 1,
909 @_ 867 @_
910 ); 868 );
911 869
912 $self->{title} &&= new CFClient::UI::Label 870 $self->{title} &&= new CFClient::UI::Label
… …
1005 my ($self) = @_; 963 my ($self) = @_;
1006 964
1007 my ($w, $h ) = ($self->{w}, $self->{h}); 965 my ($w, $h ) = ($self->{w}, $self->{h});
1008 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
1009 967
1010 glEnable GL_BLEND;
1011 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1012 glEnable GL_TEXTURE_2D; 968 glEnable GL_TEXTURE_2D;
1013 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1014 970
1015 my $border = $self->border; 971 my $border = $self->border;
1016 972
1017 glColor @{ $self->{border_bg} }; 973 glColor @{ $self->{border_bg} };
1018 $tex[1]->draw_quad (0, 0, $w, $border); 974 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
1019 $tex[3]->draw_quad (0, $border, $border, $ch); 975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
1020 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1021 $tex[4]->draw_quad (0, $h - $border, $w, $border); 977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
1022 978
1023 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1024 my $bg = $tex[0]; 980 my $bg = $tex[0];
1025 981
1026 # TODO: repeat texture not scale 982 # TODO: repeat texture not scale
… …
1030 glColor @{ $self->{bg} }; 986 glColor @{ $self->{bg} };
1031 987
1032 $bg->{s} = $rep_x; 988 $bg->{s} = $rep_x;
1033 $bg->{t} = $rep_y; 989 $bg->{t} = $rep_y;
1034 $bg->{wrap_mode} = 1; 990 $bg->{wrap_mode} = 1;
1035 $bg->draw_quad ($border, $border, $cw, $ch); 991 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 }
1036 993
1037 glDisable GL_TEXTURE_2D; 994 glDisable GL_TEXTURE_2D;
1038 glDisable GL_BLEND;
1039 }
1040 995
1041 $self->{title}->draw if $self->{title}; 996 $self->{title}->draw if $self->{title};
1042 997
1043 $self->child->draw; 998 $self->child->draw;
1044} 999}
… …
1271} 1226}
1272 1227
1273sub size_allocate { 1228sub size_allocate {
1274 my ($self, $w, $h) = @_; 1229 my ($self, $w, $h) = @_;
1275 1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1276 my $children = $self->{children}; 1233 my $children = $self->{children};
1277 1234
1278 my @h = map $_->{req_h}, @$children; 1235 my @h = map $_->{req_h}, @$children;
1279 1236
1280 my $req_h = List::Util::sum @h; 1237 my $req_h = List::Util::sum @h;
… …
1319 my ($class, %arg) = @_; 1276 my ($class, %arg) = @_;
1320 1277
1321 my $self = $class->SUPER::new ( 1278 my $self = $class->SUPER::new (
1322 fg => [1, 1, 1], 1279 fg => [1, 1, 1],
1323 #font => default_font 1280 #font => default_font
1281 #text => initial text
1282 #markup => initial narkup
1283 layout => (new CFClient::Layout),
1324 fontsize => 1, 1284 fontsize => 1,
1325 text => "",
1326 align => -1, 1285 align => -1,
1327 valign => -1, 1286 valign => -1,
1328 padding => 2, 1287 padding => 2,
1329 layout => new CFClient::Layout,
1330 can_events => 0, 1288 can_events => 0,
1331 %arg 1289 %arg
1332 ); 1290 );
1333 1291
1334 if (exists $self->{template}) { 1292 if (exists $self->{template}) {
1335 my $layout = new CFClient::Layout; 1293 my $layout = new CFClient::Layout;
1336 $layout->set_text (delete $self->{template}); 1294 $layout->set_text (delete $self->{template});
1337 $self->{template} = $layout; 1295 $self->{template} = $layout;
1338 } 1296 }
1339 1297
1340 $self->set_text (delete $self->{text}) if exists $self->{text}; 1298 if (exists $self->{markup}) {
1341 $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 }
1342 1303
1343 $self 1304 $self
1344} 1305}
1345 1306
1346sub escape { 1307sub escape {
… …
1364 my ($self, $text) = @_; 1325 my ($self, $text) = @_;
1365 1326
1366 return if $self->{text} eq "T$text"; 1327 return if $self->{text} eq "T$text";
1367 $self->{text} = "T$text"; 1328 $self->{text} = "T$text";
1368 1329
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1369 $self->{layout}->set_text ($text); 1331 $self->{layout}->set_text ($text);
1370 1332
1371 delete $self->{texture};
1372 $self->update; 1333 $self->update;
1373 $self->check_size; 1334 $self->check_size;
1374} 1335}
1375 1336
1376sub set_markup { 1337sub set_markup {
1377 my ($self, $markup) = @_; 1338 my ($self, $markup) = @_;
1378 1339
1379 return if $self->{text} eq "M$markup"; 1340 return if $self->{text} eq "M$markup";
1380 $self->{text} = "M$markup"; 1341 $self->{text} = "M$markup";
1381 1342
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344
1345 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1382 $self->{layout}->set_markup ($markup); 1346 $self->{layout}->set_markup ($markup);
1383 1347
1384 delete $self->{texture};
1385 $self->update; 1348 $self->update;
1386 $self->check_size; 1349 $self->check_size;
1387} 1350}
1388 1351
1389sub size_request { 1352sub size_request {
… …
1429 1392
1430sub _draw { 1393sub _draw {
1431 my ($self) = @_; 1394 my ($self) = @_;
1432 1395
1433 my $tex = $self->{texture} ||= do { 1396 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}});
1434 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1398 $self->{layout}->set_font ($self->{font}) if $self->{font};
1435 $self->{layout}->set_width ($self->{w}); 1399 $self->{layout}->set_width ($self->{w});
1436 $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
1437 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
1438 }; 1413 };
1439 1414
1440 glEnable GL_BLEND;
1441 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1442 glEnable GL_TEXTURE_2D; 1415 glEnable GL_TEXTURE_2D;
1443 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1444 1417
1418 if ($tex->{format} == GL_ALPHA) {
1445 glColor @{$self->{fg}}; 1419 glColor @{$self->{fg}};
1446
1447 $self->{ox} = int (
1448 $self->{align} < 0 ? $self->{padding}
1449 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1450 : ($self->{w} - $tex->{w}) * 0.5
1451 );
1452
1453 $self->{oy} = int (
1454 $self->{valign} < 0 ? $self->{padding}
1455 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1456 : ($self->{h} - $tex->{h}) * 0.5
1457 );
1458
1459 $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 }
1460 1424
1461 glDisable GL_TEXTURE_2D; 1425 glDisable GL_TEXTURE_2D;
1462 glDisable GL_BLEND;
1463} 1426}
1464 1427
1465############################################################################# 1428#############################################################################
1466 1429
1467package CFClient::UI::EntryBase; 1430package CFClient::UI::EntryBase;
… …
1502 $self->{layout}->set_text ("$text "); 1465 $self->{layout}->set_text ("$text ");
1503 1466
1504 $self->emit (changed => $self->{text}); 1467 $self->emit (changed => $self->{text});
1505} 1468}
1506 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
1507sub get_text { 1479sub get_text {
1508 $_[0]{text} 1480 $_[0]{text}
1509} 1481}
1510 1482
1511sub size_request { 1483sub size_request {
… …
1518 1490
1519sub size_allocate { 1491sub size_allocate {
1520 my ($self, $w, $h) = @_; 1492 my ($self, $w, $h) = @_;
1521 1493
1522 $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
1523}
1524
1525sub set_text {
1526 my ($self, $text) = @_;
1527
1528 $self->{cursor} = length $text;
1529 $self->_set_text ($text);
1530 $self->update;
1531} 1495}
1532 1496
1533sub key_down { 1497sub key_down {
1534 my ($self, $ev) = @_; 1498 my ($self, $ev) = @_;
1535 1499
… …
1537 my $sym = $ev->{sym}; 1501 my $sym = $ev->{sym};
1538 my $uni = $ev->{unicode}; 1502 my $uni = $ev->{unicode};
1539 1503
1540 my $text = $self->get_text; 1504 my $text = $self->get_text;
1541 1505
1542 if ($sym == 8) { 1506 if ($uni == 8) {
1543 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1507 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1544 } elsif ($sym == 127) { 1508 } elsif ($uni == 127) {
1545 substr $text, $self->{cursor}, 1, ""; 1509 substr $text, $self->{cursor}, 1, "";
1546 } elsif ($sym == CFClient::SDLK_LEFT) { 1510 } elsif ($sym == CFClient::SDLK_LEFT) {
1547 --$self->{cursor} if $self->{cursor}; 1511 --$self->{cursor} if $self->{cursor};
1548 } elsif ($sym == CFClient::SDLK_RIGHT) { 1512 } elsif ($sym == CFClient::SDLK_RIGHT) {
1549 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1513 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1550 } elsif ($sym == CFClient::SDLK_HOME) { 1514 } elsif ($sym == CFClient::SDLK_HOME) {
1551 $self->{cursor} = 0; 1515 $self->{cursor} = 0;
1552 } elsif ($sym == CFClient::SDLK_END) { 1516 } elsif ($sym == CFClient::SDLK_END) {
1553 $self->{cursor} = length $text; 1517 $self->{cursor} = length $text;
1554 } elsif ($sym == 27) { 1518 } elsif ($uni == 27) {
1555 $self->emit ('escape'); 1519 $self->emit ('escape');
1556 } elsif ($uni) { 1520 } elsif ($uni) {
1557 substr $text, $self->{cursor}++, 0, chr $uni; 1521 substr $text, $self->{cursor}++, 0, chr $uni;
1558 } 1522 }
1559 1523
… …
1723 1687
1724 if ($GRAB == $self) { 1688 if ($GRAB == $self) {
1725 $self->{fg} = $self->{active_fg}; 1689 $self->{fg} = $self->{active_fg};
1726 } 1690 }
1727 1691
1728 glEnable GL_BLEND;
1729 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1730 glEnable GL_TEXTURE_2D; 1692 glEnable GL_TEXTURE_2D;
1731 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1693 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1732 glColor 0, 0, 0, 1; 1694 glColor 0, 0, 0, 1;
1733 1695
1734 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1696 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1735 1697
1736 glDisable GL_TEXTURE_2D; 1698 glDisable GL_TEXTURE_2D;
1737 glDisable GL_BLEND;
1738 1699
1739 $self->SUPER::_draw; 1700 $self->SUPER::_draw;
1740} 1701}
1741 1702
1742############################################################################# 1703#############################################################################
… …
1789 1750
1790 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;
1791 1752
1792 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1753 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1793 1754
1794 glEnable GL_BLEND; 1755 my $tex = $self->{state} ? $tex[1] : $tex[0];
1756
1795 glEnable GL_TEXTURE_2D; 1757 glEnable GL_TEXTURE_2D;
1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1797
1798 my $tex = $self->{state} ? $tex[1] : $tex[0];
1799
1800 $tex->draw_quad (0, 0, $s, $s); 1758 $tex->draw_quad_alpha (0, 0, $s, $s);
1801
1802 glDisable GL_TEXTURE_2D; 1759 glDisable GL_TEXTURE_2D;
1803 glDisable GL_BLEND;
1804} 1760}
1805 1761
1806############################################################################# 1762#############################################################################
1807 1763
1808package CFClient::UI::Image; 1764package CFClient::UI::Image;
… …
1851 glTranslate 0, -$self->{w}, 0; 1807 glTranslate 0, -$self->{w}, 0;
1852 1808
1853 ($w, $h) = ($h, $w); 1809 ($w, $h) = ($h, $w);
1854 } 1810 }
1855 1811
1856 glEnable GL_BLEND;
1857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1858 glEnable GL_TEXTURE_2D; 1812 glEnable GL_TEXTURE_2D;
1859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1860 1814
1861 $tex->draw_quad (0, 0, $w, $h); 1815 $tex->draw_quad_alpha (0, 0, $w, $h);
1862 1816
1863 glDisable GL_BLEND;
1864 glDisable GL_TEXTURE_2D; 1817 glDisable GL_TEXTURE_2D;
1865} 1818}
1866 1819
1867############################################################################# 1820#############################################################################
1868 1821
… …
2160 $page ||= 2; 2113 $page ||= 2;
2161 2114
2162 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2115 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2163 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2116 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2164 2117
2165 glEnable GL_BLEND;
2166 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2167 glEnable GL_TEXTURE_2D; 2118 glEnable GL_TEXTURE_2D;
2168 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2119 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2169 2120
2170 # draw background 2121 # draw background
2171 $tex[1]->draw_quad (0, 0, $w, $h); 2122 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
2172 2123
2173 # draw handle 2124 # draw handle
2174 $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);
2175 2126
2176 glDisable GL_BLEND;
2177 glDisable GL_TEXTURE_2D; 2127 glDisable GL_TEXTURE_2D;
2178} 2128}
2179 2129
2180############################################################################# 2130#############################################################################
2181 2131
… …
2192 fontsize => 1, 2142 fontsize => 1,
2193 can_events => 0, 2143 can_events => 0,
2194 #font => default_font 2144 #font => default_font
2195 @_, 2145 @_,
2196 2146
2197 layout => (new CFClient::Layout), 2147 layout => (new CFClient::Layout 1),
2198 par => [], 2148 par => [],
2199 height => 0, 2149 height => 0,
2200 children => [ 2150 children => [
2201 (new CFClient::UI::Empty expand => 1), 2151 (new CFClient::UI::Empty expand => 1),
2202 (new CFClient::UI::Slider vertical => 1), 2152 (new CFClient::UI::Slider vertical => 1),
… …
2220 2170
2221 my $layout = $self->{layout}; 2171 my $layout = $self->{layout};
2222 2172
2223 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2173 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2224 $layout->set_width ($self->{children}[0]{w}); 2174 $layout->set_width ($self->{children}[0]{w});
2225 $layout->set_text ($text); 2175 $layout->set_markup ($text);
2226 2176
2227 ($layout->size)[1] 2177 ($layout->size)[1]
2228} 2178}
2229 2179
2230sub reflow { 2180sub reflow {
… …
2268 2218
2269 return unless $self->{h} > 0; 2219 return unless $self->{h} > 0;
2270 2220
2271 delete $self->{texture}; 2221 delete $self->{texture};
2272 2222
2273 $ROOT->on_refresh ($self, sub { 2223 $ROOT->on_post_alloc ($self, sub {
2274 if (delete $self->{need_reflow}) { 2224 if (delete $self->{need_reflow}) {
2275 my $height = 0; 2225 my $height = 0;
2276 2226
2277 $height += $_->[0] = $self->text_height ($_->[2]) 2227 $height += $_->[0] = $self->text_height ($_->[2])
2278 for @{$self->{par}}; 2228 for @{$self->{par}};
… …
2286 2236
2287 $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 {
2288 glClearColor 0, 0, 0, 0; 2238 glClearColor 0, 0, 0, 0;
2289 glClear GL_COLOR_BUFFER_BIT; 2239 glClear GL_COLOR_BUFFER_BIT;
2290 2240
2291 glEnable GL_BLEND;
2292 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2293 glEnable GL_TEXTURE_2D; 2241 glEnable GL_TEXTURE_2D;
2294 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2295 2243
2296 my $top = int $self->{children}[1]{range}[0]; 2244 my $top = int $self->{children}[1]{range}[0];
2297 2245
… …
2306 2254
2307 for my $par (@{$self->{par}}) { 2255 for my $par (@{$self->{par}}) {
2308 my $h = $par->[0]; 2256 my $h = $par->[0];
2309 2257
2310 if ($y0 < $y + $h && $y < $y1) { 2258 if ($y0 < $y + $h && $y < $y1) {
2259 $layout->set_foreground (@{ $par->[1] });
2311 $layout->set_text ($par->[2]); 2260 $layout->set_markup ($par->[2]);
2312 2261
2313 glColor @{ $par->[1] };
2314 my ($W, $H) = $layout->size; 2262 my ($W, $H) = $layout->size;
2315 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);
2316 } 2264 }
2317 2265
2318 $y += $h; 2266 $y += $h;
2319 } 2267 }
2320 2268
2321 glDisable GL_TEXTURE_2D; 2269 glDisable GL_TEXTURE_2D;
2322 glDisable GL_BLEND;
2323 }; 2270 };
2324 }); 2271 });
2325} 2272}
2326 2273
2327sub _draw { 2274sub _draw {
2328 my ($self) = @_; 2275 my ($self) = @_;
2329 2276
2330 glEnable GL_BLEND;
2331 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2332 glEnable GL_TEXTURE_2D; 2277 glEnable GL_TEXTURE_2D;
2333 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2278 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2334 glColor 1, 1, 1, 1; 2279 glColor 1, 1, 1, 1;
2335 $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});
2336 glDisable GL_TEXTURE_2D; 2281 glDisable GL_TEXTURE_2D;
2337 glDisable GL_BLEND;
2338 2282
2339 $self->{children}[1]->draw; 2283 $self->{children}[1]->draw;
2340 2284
2341} 2285}
2342 2286
… …
2436 @_, 2380 @_,
2437 can_events => 0, 2381 can_events => 0,
2438 ) 2382 )
2439} 2383}
2440 2384
2441sub set_markup { 2385sub set_tooltip_from {
2442 my ($self, $text) = @_; 2386 my ($self, $widget) = @_;
2443 2387
2444 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2388 $self->add (new CFClient::UI::Label
2445 $self->{label}->set_markup ($text); 2389 markup => $widget->{tooltip},
2446 $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 );
2447} 2395}
2448 2396
2449sub size_request { 2397sub size_request {
2450 my ($self) = @_; 2398 my ($self) = @_;
2451
2452 $self->child->set_max_size ($::WIDTH * 0.3);
2453 2399
2454 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2400 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2455 2401
2456 ($w + 4, $h + 4) 2402 ($w + 4, $h + 4)
2457} 2403}
… …
2463} 2409}
2464 2410
2465sub _draw { 2411sub _draw {
2466 my ($self) = @_; 2412 my ($self) = @_;
2467 2413
2468 glPushMatrix;
2469 glTranslate 0.375, 0.375; 2414 glTranslate 0.375, 0.375;
2470 2415
2471 my ($w, $h) = @$self{qw(w h)}; 2416 my ($w, $h) = @$self{qw(w h)};
2472 2417
2473 glColor 1, 0.8, 0.4; 2418 glColor 1, 0.8, 0.4;
… …
2484 glVertex 0 , $h; 2429 glVertex 0 , $h;
2485 glVertex $w, $h; 2430 glVertex $w, $h;
2486 glVertex $w, 0; 2431 glVertex $w, 0;
2487 glEnd; 2432 glEnd;
2488 2433
2489 glPopMatrix; 2434 glTranslate 2 - 0.375, 2 - 0.375;
2490
2491 glTranslate 2, 2;
2492 $self->SUPER::_draw; 2435 $self->SUPER::_draw;
2493} 2436}
2494 2437
2495############################################################################# 2438#############################################################################
2496 2439
… …
2519 return unless $::CONN;#d# manage and cache textures differently 2462 return unless $::CONN;#d# manage and cache textures differently
2520 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2463 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2521 2464
2522 # TODO animation 2465 # TODO animation
2523 if ($tex) { 2466 if ($tex) {
2524 glEnable GL_BLEND;
2525 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2526 glEnable GL_TEXTURE_2D; 2467 glEnable GL_TEXTURE_2D;
2527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2468 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2528 glColor 1, 1, 1, 1; 2469 glColor 1, 1, 1, 1;
2529 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2470 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2530 glDisable GL_TEXTURE_2D; 2471 glDisable GL_TEXTURE_2D;
2531 glDisable GL_BLEND;
2532 } 2472 }
2533} 2473}
2534 2474
2535############################################################################# 2475#############################################################################
2536 2476
… …
2541sub new { 2481sub new {
2542 my $class = shift; 2482 my $class = shift;
2543 2483
2544 my %args = @_; 2484 my %args = @_;
2545 2485
2546 my $item = $args{item}; 2486 my $item = delete $args{item};
2547 2487
2548 my $desc = $item->{nrof} < 2 2488 my $desc = $item->{nrof} < 2
2549 ? $item->{name} 2489 ? $item->{name}
2550 : "$item->{nrof} $item->{name_pl}"; 2490 : "$item->{nrof} $item->{name_pl}";
2551 2491
… …
2580 2520
2581 1 2521 1
2582 }, 2522 },
2583 %args 2523 %args
2584 ); 2524 );
2525
2585 $self->add(new CFClient::UI::Face 2526 $self->add (new CFClient::UI::Face
2586 can_events => 0, 2527 can_events => 0,
2587 face => $item->{face}, 2528 face => $item->{face},
2588 anim => $item->{anim}, 2529 anim => $item->{anim},
2589 animspeed => $item->{animspeed}); 2530 animspeed => $item->{animspeed},
2531 );
2532
2590 $self->add(new CFClient::UI::Label 2533 $self->add (new CFClient::UI::Label
2591 can_events => 0, 2534 can_events => 0,
2592 text => $desc); 2535 text => $desc,
2536 );
2593 2537
2594 $self 2538 $self
2595} 2539}
2596 2540
2597############################################################################# 2541#############################################################################
… …
2615 my ($self, $items) = @_; 2559 my ($self, $items) = @_;
2616 2560
2617 $self->{scrolled}->clear; 2561 $self->{scrolled}->clear;
2618 return unless $items; 2562 return unless $items;
2619 2563
2620 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;
2621 2568
2622 $self->{real_items} = \@items; 2569 $self->{real_items} = \@items;
2623 2570
2624 for my $item (@items) { 2571 for my $item (@items) {
2625 my $desc = $item->{nrof} < 2 2572 my $desc = $item->{nrof} < 2
2626 ? $item->{name} 2573 ? $item->{name}
2627 : "$item->{nrof} $item->{name_pl}"; 2574 : "$item->{nrof} $item->{name_pl}";
2628 2575
2629 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2576 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2630 } 2577 }
2578
2579 $self->{scrolled}->add (@items);
2631 2580
2632# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2581# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633} 2582}
2634 2583
2635sub size_request { 2584sub size_request {
… …
2709 } 2658 }
2710} 2659}
2711 2660
2712############################################################################# 2661#############################################################################
2713 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/\012.*/…/s;
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 color => $item->{color},
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 color => [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
2714package CFClient::UI::Root; 2754package CFClient::UI::Root;
2715 2755
2716our @ISA = CFClient::UI::Container::; 2756our @ISA = CFClient::UI::Container::;
2717 2757
2718use CFClient::OpenGL; 2758use CFClient::OpenGL;
2719 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
2720sub check_size { 2775sub check_size {
2721 my ($self) = @_; 2776 my ($self) = @_;
2722 2777
2723 $self->configure (0, 0, $self->{w}, $self->{h}); 2778 $self->size_allocate ($self->{w}, $self->{h})
2779 if $self->{w};
2724} 2780}
2725 2781
2726sub size_request { 2782sub size_request {
2727 my ($self) = @_; 2783 my ($self) = @_;
2728 2784
… …
2730} 2786}
2731 2787
2732sub size_allocate { 2788sub size_allocate {
2733 my ($self, $w, $h) = @_; 2789 my ($self, $w, $h) = @_;
2734 2790
2735 my $old_w = $self->{old_w}; 2791 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2736 my $old_h = $self->{old_h}; 2792 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2737 2793
2738 if ($old_w && $old_h) { 2794 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2739 for my $child ($self->children) { 2795 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2740 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2741 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2742 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2743 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2744 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2745 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2746 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2747 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2748 }
2749 }
2750
2751 $self->{old_w} = $w;
2752 $self->{old_h} = $h;
2753}
2754
2755sub configure {
2756 my ($self, $x, $y, $w, $h) = @_;
2757
2758 $self->SUPER::configure ($x, $y, $w, $h);
2759 2796
2760 for my $child ($self->children) { 2797 for my $child ($self->children) {
2761 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)};
2762 2799
2763 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2800 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2764 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2801 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2765 $child->configure ($X, $Y, $W, $H); 2802 $child->configure ($X, $Y, $W, $H);
2766 } 2803 }
2767} 2804}
2768 2805
2769sub _topleft { 2806sub coord2local {
2770 my ($self, $x, $y) = @_; 2807 my ($self, $x, $y) = @_;
2771 2808
2772 ($x, $y) 2809 ($x, $y)
2773} 2810}
2774 2811
2812sub coord2global {
2813 my ($self, $x, $y) = @_;
2814
2815 ($x, $y)
2816}
2817
2775sub update { 2818sub update {
2776 my ($self) = @_; 2819 my ($self) = @_;
2777 2820
2778 $self->check_size; 2821 $self->check_size;
2779 ::refresh (); 2822 $::WANT_REFRESH++;
2780} 2823}
2781 2824
2782sub add { 2825sub add {
2783 my ($self, $child) = @_; 2826 my ($self, @children) = @_;
2784 2827
2828 for my $child (@children) {
2829 $child->{toplevel} = 1;
2830
2785 # integerize window positions 2831 # integerise window positions
2786 $child->{x} = int $child->{x}; 2832 $child->{x} = int $child->{x};
2787 $child->{y} = int $child->{y}; 2833 $child->{y} = int $child->{y};
2834 }
2788 2835
2789 $self->SUPER::add ($child); 2836 $self->SUPER::add (@children);
2790} 2837}
2791 2838
2792sub on_refresh { 2839sub on_refresh {
2793 my ($self, $id, $cb) = @_; 2840 my ($self, $id, $cb) = @_;
2794 2841
2795 $self->{refresh_hook}{$id} = $cb; 2842 $self->{refresh_hook}{$id} = $cb;
2796} 2843}
2797 2844
2845sub on_post_alloc {
2846 my ($self, $id, $cb) = @_;
2847
2848 $self->{post_alloc_hook}{$id} = $cb;
2849}
2850
2798sub draw { 2851sub draw {
2799 my ($self) = @_; 2852 my ($self) = @_;
2800 2853
2801 while (my $rcb = delete $self->{refresh_hook}) { 2854 while ($self->{refresh_hook}) {
2802 $_->() for values %$rcb; 2855 $_->()
2856 for values %{delete $self->{refresh_hook}};
2857 }
2858
2859 if ($self->{check_size}) {
2860 my @queue = ([], []);
2861
2862 for (;;) {
2863 if ($self->{check_size}) {
2864 # heuristic: check containers last
2865 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2866 for values %{delete $self->{check_size}}
2867 }
2868
2869 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2870
2871 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2872 ? @$widget{qw(user_w user_h)}
2873 : $widget->size_request;
2874
2875 if (delete $widget->{force_alloc}
2876 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2877 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2878
2879 $widget->{req_w} = $w;
2880 $widget->{req_h} = $h;
2881
2882 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2883
2884 $widget->{parent}->check_size
2885 if $widget->{parent};
2886 }
2887 }
2888 }
2889
2890 while ($self->{size_alloc}) {
2891 for (values %{delete $self->{size_alloc}}) {
2892 my ($widget, $w, $h) = @$_;
2893
2894 $w = 0 if $w < 0;
2895 $h = 0 if $h < 0;
2896
2897 $widget->{w} = $w;
2898 $widget->{h} = $h;
2899 $widget->size_allocate ($w, $h);
2900 $widget->emit (size_allocate => $w, $h);
2901 }
2902 }
2903
2904 while ($self->{post_alloc_hook}) {
2905 $_->()
2906 for values %{delete $self->{post_alloc_hook}};
2803 } 2907 }
2804 2908
2805 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2909 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2806 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2910 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2807 glClear GL_COLOR_BUFFER_BIT; 2911 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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