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.202 by root, Sun May 14 20:51:19 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) { 36 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 } 38 }
37 39
38 $TOOLTIP->move ($x, $y); 40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
39 } 43 }
40 44
41 return; 45 return;
42 } 46 }
43 } 47 }
… …
130 134
131 for (@$vals) { 135 for (@$vals) {
132 my $i = int $_ + $rem; 136 my $i = int $_ + $rem;
133 $rem += $_ - $i; 137 $rem += $_ - $i;
134 $_ = $i; 138 $_ = $i;
139 }
140}
141
142# call when resolution changes etc.
143sub rescale_widgets {
144 my ($sx, $sy) = @_;
145
146 for my $widget (values %WIDGET) {
147 if ($widget->{toplevel}) {
148 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
149 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
150 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
151 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
153 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
154 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
155 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
156 }
157
158 $widget->reconfigure;
135 } 159 }
136} 160}
137 161
138############################################################################# 162#############################################################################
139 163
… …
158 if (/^connect_(.*)$/) { 182 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 183 $self->connect ($1 => delete $self->{$_});
160 } 184 }
161 } 185 }
162 186
187 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
188
163 $self 189 $self
164} 190}
165 191
166sub destroy { 192sub destroy {
167 my ($self) = @_; 193 my ($self) = @_;
… …
173sub show { 199sub show {
174 my ($self) = @_; 200 my ($self) = @_;
175 201
176 return if $self->{parent}; 202 return if $self->{parent};
177 203
204 $self->{toplevel} = 1;
178 $CFClient::UI::ROOT->add ($self); 205 $CFClient::UI::ROOT->add ($self);
179} 206}
180 207
181sub hide { 208sub hide {
182 my ($self) = @_; 209 my ($self) = @_;
… …
232 $self->{y} = $y; 259 $self->{y} = $y;
233 $self->update; 260 $self->update;
234 } 261 }
235 262
236 if ($self->{w} != $w || $self->{h} != $h) { 263 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 264 $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 } 265 }
244} 266}
245 267
246sub size_allocate { 268sub size_allocate {
247 # nothing to be done 269 # nothing to be done
248} 270}
249 271
272sub reconfigure {
273 my ($self) = @_;
274
275 $self->check_size (1);
276 $self->update;
277}
278
250sub children { 279sub 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} 280}
264 281
265sub set_max_size { 282sub set_max_size {
266 my ($self, $w, $h) = @_; 283 my ($self, $w, $h) = @_;
267 284
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 285 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 286 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} 287}
281 288
282# translate global coordinates to local coordinate system 289# translate global coordinates to local coordinate system
283sub coord2local { 290sub coord2local {
284 my ($self, $x, $y) = @_; 291 my ($self, $x, $y) = @_;
285 292
286 my ($X, $Y) = $self->_topleft; 293 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 294}
289 295
290# translate local coordinates to global coordinate system 296# translate local coordinates to global coordinate system
291sub coord2global { 297sub coord2global {
292 my ($self, $x, $y) = @_; 298 my ($self, $x, $y) = @_;
293 299
294 my ($X, $Y) = $self->_topleft; 300 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 301}
297 302
298sub focus_in { 303sub focus_in {
299 my ($self) = @_; 304 my ($self) = @_;
300 305
… …
398 403
399sub set_parent { 404sub set_parent {
400 my ($self, $parent) = @_; 405 my ($self, $parent) = @_;
401 406
402 Scalar::Util::weaken ($self->{parent} = $parent); 407 Scalar::Util::weaken ($self->{parent} = $parent);
408
409 # TODO: req_w _does_change after ->reconfigure
410 $self->check_size
411 unless exists $self->{req_w};
403} 412}
404 413
405sub check_size { 414sub check_size {
406 my ($self) = @_; 415 my ($self, $forced) = @_;
407 416
408 $self->_check_size; 417 $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}; 418 $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} 419}
450 420
451sub update { 421sub update {
452 my ($self) = @_; 422 my ($self) = @_;
453 423
454 my $update = $CFClient::UI::ROOT->{_update} ||= {}; 424 $self->{parent}->update
455 425 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} 426}
468 427
469sub connect { 428sub connect {
470 my ($self, $signal, $cb) = @_; 429 my ($self, $signal, $cb) = @_;
471 430
… …
479} 438}
480 439
481sub DESTROY { 440sub DESTROY {
482 my ($self) = @_; 441 my ($self) = @_;
483 442
443 delete $WIDGET{$self+0};
484 #$self->deactivate; 444 #$self->deactivate;
485} 445}
486 446
487############################################################################# 447#############################################################################
488 448
… …
573 $self->{children} = [ 533 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 534 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 535 @{$self->{children}}, @widgets
576 ]; 536 ];
577 537
578 $_->check_size 538 $self->check_size (1);
579 for @widgets;
580
581 $self->update; 539 $self->update;
582} 540}
583 541
584sub children { 542sub children {
585 @{ $_[0]{children} } 543 @{ $_[0]{children} }
… …
692} 650}
693 651
694sub update { 652sub update {
695 my ($self) = @_; 653 my ($self) = @_;
696 654
697 $ROOT->on_refresh ($self => sub { $self->render_child }); 655 $ROOT->on_post_alloc ($self => sub { $self->render_child });
698 $self->SUPER::update; 656 $self->SUPER::update;
699} 657}
700 658
701sub size_allocate { 659sub size_allocate {
702 my ($self, $w, $h) = @_; 660 my ($self, $w, $h) = @_;
… …
733 my ($w, $h) = ($self->w, $self->h); 691 my ($w, $h) = ($self->w, $self->h);
734 692
735 my $tex = $self->{texture} 693 my $tex = $self->{texture}
736 or return; 694 or return;
737 695
738 glEnable GL_BLEND;
739 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
740 glEnable GL_TEXTURE_2D; 696 glEnable GL_TEXTURE_2D;
741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
742 glColor 0, 0, 0, 1; 698 glColor 0, 0, 0, 1;
743 699
744 $tex->draw_quad (0, 0, $w, $h); 700 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
745 701
746 glDisable GL_BLEND;
747 glDisable GL_TEXTURE_2D; 702 glDisable GL_TEXTURE_2D;
748} 703}
749 704
750############################################################################# 705#############################################################################
751 706
… …
775 $self->{view_y} = int $y; 730 $self->{view_y} = int $y;
776 731
777 $self->update; 732 $self->update;
778} 733}
779 734
780# hmm, this does not work for topleft of $self... but we should not aks for that 735# hmm, this does not work for topleft of $self... but we should not ask for that
781sub _topleft { 736sub coord2local {
782 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
783 738
784 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 739 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
740}
741
742sub coord2global {
743 my ($self, $x, $y) = @_;
744
745 $x = List::Util::min $self->{w}, $x - $self->{view_x};
746 $y = List::Util::min $self->{h}, $y - $self->{view_y};
747
748 $self->SUPER::coord2global ($x, $y)
785} 749}
786 750
787sub find_widget { 751sub find_widget {
788 my ($self, $x, $y) = @_; 752 my ($self, $x, $y) = @_;
789 753
… …
834 $self->add ($self->{slider}); 798 $self->add ($self->{slider});
835 799
836 $self 800 $self
837} 801}
838 802
839#TODO# update range on size_allocate depeneing on child 803#TODO# update range on size_allocate depending on child
840# update viewport offset on scroll 804# update viewport offset on scroll
841 805
842############################################################################# 806#############################################################################
843 807
844package CFClient::UI::Frame; 808package CFClient::UI::Frame;
… …
848use CFClient::OpenGL; 812use CFClient::OpenGL;
849 813
850sub new { 814sub new {
851 my $class = shift; 815 my $class = shift;
852 816
853 my $self = $class->SUPER::new ( 817 $class->SUPER::new (
854 bg => [1, 1, 1, 1], 818 bg => undef,
855 border_bg => [1, 1, 1, 1],
856 border => 0.8,
857 @_ 819 @_,
858 ); 820 )
859
860 $self
861} 821}
862 822
863sub _draw { 823sub _draw {
864 my ($self) = @_; 824 my ($self) = @_;
865 825
866 my ($w, $h) = ($self->{w}, $self->{h}); 826 if ($self->{bg}) {
827 my ($w, $h) = @$self{qw(w h)};
867 828
868 glEnable GL_BLEND; 829 glEnable GL_BLEND;
869 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 830 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
870 glEnable GL_TEXTURE_2D; 831 glColor @{ $self->{bg} };
871 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
872 832
873# glBegin GL_QUADS; 833 glBegin GL_QUADS;
874# glColor 0, 0, 0, 0;
875# glVertex 0 , 0; 834 glVertex 0 , 0;
876# glVertex 0 , $h; 835 glVertex 0 , $h;
877# glVertex $w, $h; 836 glVertex $w, $h;
878# glVertex $w, 0; 837 glVertex $w, 0;
879# glEnd; 838 glEnd;
880 839
881
882 $self->child->draw;
883 glDisable GL_BLEND; 840 glDisable GL_BLEND;
884 glDisable GL_TEXTURE_2D; 841 }
842
843 $self->SUPER::_draw;
885} 844}
886 845
887############################################################################# 846#############################################################################
888 847
889package CFClient::UI::FancyFrame; 848package CFClient::UI::FancyFrame;
… …
903 862
904 my $self = $class->SUPER::new ( 863 my $self = $class->SUPER::new (
905 bg => [1, 1, 1, 1], 864 bg => [1, 1, 1, 1],
906 border_bg => [1, 1, 1, 1], 865 border_bg => [1, 1, 1, 1],
907 border => 0.6, 866 border => 0.6,
867 toplevel => 1,
908 can_events => 1, 868 can_events => 1,
909 @_ 869 @_
910 ); 870 );
911 871
912 $self->{title} &&= new CFClient::UI::Label 872 $self->{title} &&= new CFClient::UI::Label
… …
1005 my ($self) = @_; 965 my ($self) = @_;
1006 966
1007 my ($w, $h ) = ($self->{w}, $self->{h}); 967 my ($w, $h ) = ($self->{w}, $self->{h});
1008 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 968 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
1009 969
1010 glEnable GL_BLEND;
1011 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1012 glEnable GL_TEXTURE_2D; 970 glEnable GL_TEXTURE_2D;
1013 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 971 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1014 972
1015 my $border = $self->border; 973 my $border = $self->border;
1016 974
1017 glColor @{ $self->{border_bg} }; 975 glColor @{ $self->{border_bg} };
1018 $tex[1]->draw_quad (0, 0, $w, $border); 976 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
1019 $tex[3]->draw_quad (0, $border, $border, $ch); 977 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
1020 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 978 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1021 $tex[4]->draw_quad (0, $h - $border, $w, $border); 979 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
1022 980
1023 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 981 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1024 my $bg = $tex[0]; 982 my $bg = $tex[0];
1025 983
1026 # TODO: repeat texture not scale 984 # TODO: repeat texture not scale
… …
1030 glColor @{ $self->{bg} }; 988 glColor @{ $self->{bg} };
1031 989
1032 $bg->{s} = $rep_x; 990 $bg->{s} = $rep_x;
1033 $bg->{t} = $rep_y; 991 $bg->{t} = $rep_y;
1034 $bg->{wrap_mode} = 1; 992 $bg->{wrap_mode} = 1;
1035 $bg->draw_quad ($border, $border, $cw, $ch); 993 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
994 }
1036 995
1037 glDisable GL_TEXTURE_2D; 996 glDisable GL_TEXTURE_2D;
1038 glDisable GL_BLEND;
1039 }
1040 997
1041 $self->{title}->draw if $self->{title}; 998 $self->{title}->draw if $self->{title};
1042 999
1043 $self->child->draw; 1000 $self->child->draw;
1044} 1001}
… …
1271} 1228}
1272 1229
1273sub size_allocate { 1230sub size_allocate {
1274 my ($self, $w, $h) = @_; 1231 my ($self, $w, $h) = @_;
1275 1232
1233 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1234
1276 my $children = $self->{children}; 1235 my $children = $self->{children};
1277 1236
1278 my @h = map $_->{req_h}, @$children; 1237 my @h = map $_->{req_h}, @$children;
1279 1238
1280 my $req_h = List::Util::sum @h; 1239 my $req_h = List::Util::sum @h;
… …
1319 my ($class, %arg) = @_; 1278 my ($class, %arg) = @_;
1320 1279
1321 my $self = $class->SUPER::new ( 1280 my $self = $class->SUPER::new (
1322 fg => [1, 1, 1], 1281 fg => [1, 1, 1],
1323 #font => default_font 1282 #font => default_font
1283 #text => initial text
1284 #markup => initial narkup
1285 layout => (new CFClient::Layout),
1324 fontsize => 1, 1286 fontsize => 1,
1325 text => "",
1326 align => -1, 1287 align => -1,
1327 valign => -1, 1288 valign => -1,
1328 padding => 2, 1289 padding => 2,
1329 layout => new CFClient::Layout,
1330 can_events => 0, 1290 can_events => 0,
1331 %arg 1291 %arg
1332 ); 1292 );
1333 1293
1334 if (exists $self->{template}) { 1294 if (exists $self->{template}) {
1335 my $layout = new CFClient::Layout; 1295 my $layout = new CFClient::Layout;
1336 $layout->set_text (delete $self->{template}); 1296 $layout->set_text (delete $self->{template});
1337 $self->{template} = $layout; 1297 $self->{template} = $layout;
1338 } 1298 }
1339 1299
1340 $self->set_text (delete $self->{text}) if exists $self->{text}; 1300 if (exists $self->{markup}) {
1341 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1301 $self->set_markup (delete $self->{markup});
1302 } else {
1303 $self->set_text (delete $self->{text});
1304 }
1342 1305
1343 $self 1306 $self
1344} 1307}
1345 1308
1346sub escape { 1309sub escape {
… …
1364 my ($self, $text) = @_; 1327 my ($self, $text) = @_;
1365 1328
1366 return if $self->{text} eq "T$text"; 1329 return if $self->{text} eq "T$text";
1367 $self->{text} = "T$text"; 1330 $self->{text} = "T$text";
1368 1331
1332 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1369 $self->{layout}->set_text ($text); 1333 $self->{layout}->set_text ($text);
1370 1334
1371 delete $self->{texture};
1372 $self->update; 1335 $self->update;
1373 $self->check_size; 1336 $self->check_size;
1374} 1337}
1375 1338
1376sub set_markup { 1339sub set_markup {
1377 my ($self, $markup) = @_; 1340 my ($self, $markup) = @_;
1378 1341
1379 return if $self->{text} eq "M$markup"; 1342 return if $self->{text} eq "M$markup";
1380 $self->{text} = "M$markup"; 1343 $self->{text} = "M$markup";
1381 1344
1345 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1346
1347 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1382 $self->{layout}->set_markup ($markup); 1348 $self->{layout}->set_markup ($markup);
1383 1349
1384 delete $self->{texture};
1385 $self->update; 1350 $self->update;
1386 $self->check_size; 1351 $self->check_size;
1387} 1352}
1388 1353
1389sub size_request { 1354sub size_request {
… …
1429 1394
1430sub _draw { 1395sub _draw {
1431 my ($self) = @_; 1396 my ($self) = @_;
1432 1397
1433 my $tex = $self->{texture} ||= do { 1398 my $tex = $self->{texture} ||= do {
1399 $self->{layout}->set_foreground (@{$self->{fg}});
1434 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1400 $self->{layout}->set_font ($self->{font}) if $self->{font};
1435 $self->{layout}->set_width ($self->{w}); 1401 $self->{layout}->set_width ($self->{w});
1436 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1403
1437 new_from_layout CFClient::Texture $self->{layout} 1404 my $tex = new_from_layout CFClient::Texture $self->{layout};
1405
1406 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1407 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1408 : ($self->{w} - $tex->{w}) * 0.5;
1409
1410 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1411 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1412 : ($self->{h} - $tex->{h}) * 0.5;
1413
1414 $tex
1438 }; 1415 };
1439 1416
1440 glEnable GL_BLEND;
1441 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1442 glEnable GL_TEXTURE_2D; 1417 glEnable GL_TEXTURE_2D;
1443 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1418 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1444 1419
1420 if ($tex->{format} == GL_ALPHA) {
1445 glColor @{$self->{fg}}; 1421 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}); 1422 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1423 } else {
1424 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1425 }
1460 1426
1461 glDisable GL_TEXTURE_2D; 1427 glDisable GL_TEXTURE_2D;
1462 glDisable GL_BLEND;
1463} 1428}
1464 1429
1465############################################################################# 1430#############################################################################
1466 1431
1467package CFClient::UI::EntryBase; 1432package CFClient::UI::EntryBase;
… …
1502 $self->{layout}->set_text ("$text "); 1467 $self->{layout}->set_text ("$text ");
1503 1468
1504 $self->emit (changed => $self->{text}); 1469 $self->emit (changed => $self->{text});
1505} 1470}
1506 1471
1472sub set_text {
1473 my ($self, $text) = @_;
1474
1475 $self->{cursor} = length $text;
1476 $self->_set_text ($text);
1477 $self->check_size;
1478 $self->update;
1479}
1480
1507sub get_text { 1481sub get_text {
1508 $_[0]{text} 1482 $_[0]{text}
1509} 1483}
1510 1484
1511sub size_request { 1485sub size_request {
… …
1518 1492
1519sub size_allocate { 1493sub size_allocate {
1520 my ($self, $w, $h) = @_; 1494 my ($self, $w, $h) = @_;
1521 1495
1522 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1496 $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} 1497}
1532 1498
1533sub key_down { 1499sub key_down {
1534 my ($self, $ev) = @_; 1500 my ($self, $ev) = @_;
1535 1501
… …
1537 my $sym = $ev->{sym}; 1503 my $sym = $ev->{sym};
1538 my $uni = $ev->{unicode}; 1504 my $uni = $ev->{unicode};
1539 1505
1540 my $text = $self->get_text; 1506 my $text = $self->get_text;
1541 1507
1542 if ($sym == 8) { 1508 if ($uni == 8) {
1543 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1509 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1544 } elsif ($sym == 127) { 1510 } elsif ($uni == 127) {
1545 substr $text, $self->{cursor}, 1, ""; 1511 substr $text, $self->{cursor}, 1, "";
1546 } elsif ($sym == CFClient::SDLK_LEFT) { 1512 } elsif ($sym == CFClient::SDLK_LEFT) {
1547 --$self->{cursor} if $self->{cursor}; 1513 --$self->{cursor} if $self->{cursor};
1548 } elsif ($sym == CFClient::SDLK_RIGHT) { 1514 } elsif ($sym == CFClient::SDLK_RIGHT) {
1549 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1515 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1550 } elsif ($sym == CFClient::SDLK_HOME) { 1516 } elsif ($sym == CFClient::SDLK_HOME) {
1551 $self->{cursor} = 0; 1517 $self->{cursor} = 0;
1552 } elsif ($sym == CFClient::SDLK_END) { 1518 } elsif ($sym == CFClient::SDLK_END) {
1553 $self->{cursor} = length $text; 1519 $self->{cursor} = length $text;
1554 } elsif ($sym == 27) { 1520 } elsif ($uni == 27) {
1555 $self->emit ('escape'); 1521 $self->emit ('escape');
1556 } elsif ($uni) { 1522 } elsif ($uni) {
1557 substr $text, $self->{cursor}++, 0, chr $uni; 1523 substr $text, $self->{cursor}++, 0, chr $uni;
1558 } 1524 }
1559 1525
… …
1723 1689
1724 if ($GRAB == $self) { 1690 if ($GRAB == $self) {
1725 $self->{fg} = $self->{active_fg}; 1691 $self->{fg} = $self->{active_fg};
1726 } 1692 }
1727 1693
1728 glEnable GL_BLEND;
1729 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1730 glEnable GL_TEXTURE_2D; 1694 glEnable GL_TEXTURE_2D;
1731 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1732 glColor 0, 0, 0, 1; 1696 glColor 0, 0, 0, 1;
1733 1697
1734 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1698 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1735 1699
1736 glDisable GL_TEXTURE_2D; 1700 glDisable GL_TEXTURE_2D;
1737 glDisable GL_BLEND;
1738 1701
1739 $self->SUPER::_draw; 1702 $self->SUPER::_draw;
1740} 1703}
1741 1704
1742############################################################################# 1705#############################################################################
… …
1789 1752
1790 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1753 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1791 1754
1792 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1755 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1793 1756
1794 glEnable GL_BLEND; 1757 my $tex = $self->{state} ? $tex[1] : $tex[0];
1758
1795 glEnable GL_TEXTURE_2D; 1759 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); 1760 $tex->draw_quad_alpha (0, 0, $s, $s);
1801
1802 glDisable GL_TEXTURE_2D; 1761 glDisable GL_TEXTURE_2D;
1803 glDisable GL_BLEND;
1804} 1762}
1805 1763
1806############################################################################# 1764#############################################################################
1807 1765
1808package CFClient::UI::Image; 1766package CFClient::UI::Image;
… …
1851 glTranslate 0, -$self->{w}, 0; 1809 glTranslate 0, -$self->{w}, 0;
1852 1810
1853 ($w, $h) = ($h, $w); 1811 ($w, $h) = ($h, $w);
1854 } 1812 }
1855 1813
1856 glEnable GL_BLEND;
1857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1858 glEnable GL_TEXTURE_2D; 1814 glEnable GL_TEXTURE_2D;
1859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1815 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1860 1816
1861 $tex->draw_quad (0, 0, $w, $h); 1817 $tex->draw_quad_alpha (0, 0, $w, $h);
1862 1818
1863 glDisable GL_BLEND;
1864 glDisable GL_TEXTURE_2D; 1819 glDisable GL_TEXTURE_2D;
1865} 1820}
1866 1821
1867############################################################################# 1822#############################################################################
1868 1823
… …
2160 $page ||= 2; 2115 $page ||= 2;
2161 2116
2162 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2117 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2163 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2118 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2164 2119
2165 glEnable GL_BLEND;
2166 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2167 glEnable GL_TEXTURE_2D; 2120 glEnable GL_TEXTURE_2D;
2168 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2121 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2169 2122
2170 # draw background 2123 # draw background
2171 $tex[1]->draw_quad (0, 0, $w, $h); 2124 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
2172 2125
2173 # draw handle 2126 # draw handle
2174 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2127 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
2175 2128
2176 glDisable GL_BLEND;
2177 glDisable GL_TEXTURE_2D; 2129 glDisable GL_TEXTURE_2D;
2178} 2130}
2179 2131
2180############################################################################# 2132#############################################################################
2181 2133
… …
2192 fontsize => 1, 2144 fontsize => 1,
2193 can_events => 0, 2145 can_events => 0,
2194 #font => default_font 2146 #font => default_font
2195 @_, 2147 @_,
2196 2148
2197 layout => (new CFClient::Layout), 2149 layout => (new CFClient::Layout 1),
2198 par => [], 2150 par => [],
2199 height => 0, 2151 height => 0,
2200 children => [ 2152 children => [
2201 (new CFClient::UI::Empty expand => 1), 2153 (new CFClient::UI::Empty expand => 1),
2202 (new CFClient::UI::Slider vertical => 1), 2154 (new CFClient::UI::Slider vertical => 1),
… …
2220 2172
2221 my $layout = $self->{layout}; 2173 my $layout = $self->{layout};
2222 2174
2223 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2175 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2224 $layout->set_width ($self->{children}[0]{w}); 2176 $layout->set_width ($self->{children}[0]{w});
2225 $layout->set_text ($text); 2177 $layout->set_markup ($text);
2226 2178
2227 ($layout->size)[1] 2179 ($layout->size)[1]
2228} 2180}
2229 2181
2230sub reflow { 2182sub reflow {
… …
2268 2220
2269 return unless $self->{h} > 0; 2221 return unless $self->{h} > 0;
2270 2222
2271 delete $self->{texture}; 2223 delete $self->{texture};
2272 2224
2273 $ROOT->on_refresh ($self, sub { 2225 $ROOT->on_post_alloc ($self, sub {
2274 if (delete $self->{need_reflow}) { 2226 if (delete $self->{need_reflow}) {
2275 my $height = 0; 2227 my $height = 0;
2276 2228
2277 $height += $_->[0] = $self->text_height ($_->[2]) 2229 $height += $_->[0] = $self->text_height ($_->[2])
2278 for @{$self->{par}}; 2230 for @{$self->{par}};
… …
2286 2238
2287 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2239 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2288 glClearColor 0, 0, 0, 0; 2240 glClearColor 0, 0, 0, 0;
2289 glClear GL_COLOR_BUFFER_BIT; 2241 glClear GL_COLOR_BUFFER_BIT;
2290 2242
2291 glEnable GL_BLEND;
2292 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2293 glEnable GL_TEXTURE_2D; 2243 glEnable GL_TEXTURE_2D;
2294 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2295 2245
2296 my $top = int $self->{children}[1]{range}[0]; 2246 my $top = int $self->{children}[1]{range}[0];
2297 2247
… …
2306 2256
2307 for my $par (@{$self->{par}}) { 2257 for my $par (@{$self->{par}}) {
2308 my $h = $par->[0]; 2258 my $h = $par->[0];
2309 2259
2310 if ($y0 < $y + $h && $y < $y1) { 2260 if ($y0 < $y + $h && $y < $y1) {
2261 $layout->set_foreground (@{ $par->[1] });
2311 $layout->set_text ($par->[2]); 2262 $layout->set_markup ($par->[2]);
2312 2263
2313 glColor @{ $par->[1] };
2314 my ($W, $H) = $layout->size; 2264 my ($W, $H) = $layout->size;
2315 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2265 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2316 } 2266 }
2317 2267
2318 $y += $h; 2268 $y += $h;
2319 } 2269 }
2320 2270
2321 glDisable GL_TEXTURE_2D; 2271 glDisable GL_TEXTURE_2D;
2322 glDisable GL_BLEND;
2323 }; 2272 };
2324 }); 2273 });
2325} 2274}
2326 2275
2327sub _draw { 2276sub _draw {
2328 my ($self) = @_; 2277 my ($self) = @_;
2329 2278
2330 glEnable GL_BLEND;
2331 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2332 glEnable GL_TEXTURE_2D; 2279 glEnable GL_TEXTURE_2D;
2333 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2280 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2334 glColor 1, 1, 1, 1; 2281 glColor 1, 1, 1, 1;
2335 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2282 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2336 glDisable GL_TEXTURE_2D; 2283 glDisable GL_TEXTURE_2D;
2337 glDisable GL_BLEND;
2338 2284
2339 $self->{children}[1]->draw; 2285 $self->{children}[1]->draw;
2340 2286
2341} 2287}
2342 2288
… …
2436 @_, 2382 @_,
2437 can_events => 0, 2383 can_events => 0,
2438 ) 2384 )
2439} 2385}
2440 2386
2441sub set_markup { 2387sub set_tooltip_from {
2442 my ($self, $text) = @_; 2388 my ($self, $widget) = @_;
2443 2389
2444 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2390 $self->add (new CFClient::UI::Label
2445 $self->{label}->set_markup ($text); 2391 markup => $widget->{tooltip},
2446 $self->add ($self->{label}); 2392 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2393 fontsize => 0.8,
2394 fg => [0, 0, 0, 1],
2395 font => ($widget->{tooltip_font} || $::FONT_PROP),
2396 );
2447} 2397}
2448 2398
2449sub size_request { 2399sub size_request {
2450 my ($self) = @_; 2400 my ($self) = @_;
2451
2452 $self->child->set_max_size ($::WIDTH * 0.3);
2453 2401
2454 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2402 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2455 2403
2456 ($w + 4, $h + 4) 2404 ($w + 4, $h + 4)
2457} 2405}
… …
2463} 2411}
2464 2412
2465sub _draw { 2413sub _draw {
2466 my ($self) = @_; 2414 my ($self) = @_;
2467 2415
2468 glPushMatrix;
2469 glTranslate 0.375, 0.375; 2416 glTranslate 0.375, 0.375;
2470 2417
2471 my ($w, $h) = @$self{qw(w h)}; 2418 my ($w, $h) = @$self{qw(w h)};
2472 2419
2473 glColor 1, 0.8, 0.4; 2420 glColor 1, 0.8, 0.4;
… …
2484 glVertex 0 , $h; 2431 glVertex 0 , $h;
2485 glVertex $w, $h; 2432 glVertex $w, $h;
2486 glVertex $w, 0; 2433 glVertex $w, 0;
2487 glEnd; 2434 glEnd;
2488 2435
2489 glPopMatrix; 2436 glTranslate 2 - 0.375, 2 - 0.375;
2490
2491 glTranslate 2, 2;
2492 $self->SUPER::_draw; 2437 $self->SUPER::_draw;
2493} 2438}
2494 2439
2495############################################################################# 2440#############################################################################
2496 2441
… …
2519 return unless $::CONN;#d# manage and cache textures differently 2464 return unless $::CONN;#d# manage and cache textures differently
2520 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2465 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2521 2466
2522 # TODO animation 2467 # TODO animation
2523 if ($tex) { 2468 if ($tex) {
2524 glEnable GL_BLEND;
2525 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2526 glEnable GL_TEXTURE_2D; 2469 glEnable GL_TEXTURE_2D;
2527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2528 glColor 1, 1, 1, 1; 2471 glColor 1, 1, 1, 1;
2529 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2472 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2530 glDisable GL_TEXTURE_2D; 2473 glDisable GL_TEXTURE_2D;
2531 glDisable GL_BLEND;
2532 } 2474 }
2533} 2475}
2534 2476
2535############################################################################# 2477#############################################################################
2536 2478
… …
2541sub new { 2483sub new {
2542 my $class = shift; 2484 my $class = shift;
2543 2485
2544 my %args = @_; 2486 my %args = @_;
2545 2487
2546 my $item = $args{item}; 2488 my $item = delete $args{item};
2547 2489
2548 my $desc = $item->{nrof} < 2 2490 my $desc = $item->{nrof} < 2
2549 ? $item->{name} 2491 ? $item->{name}
2550 : "$item->{nrof} $item->{name_pl}"; 2492 : "$item->{nrof} $item->{name_pl}";
2551 2493
… …
2580 2522
2581 1 2523 1
2582 }, 2524 },
2583 %args 2525 %args
2584 ); 2526 );
2527
2585 $self->add(new CFClient::UI::Face 2528 $self->add (new CFClient::UI::Face
2586 can_events => 0, 2529 can_events => 0,
2587 face => $item->{face}, 2530 face => $item->{face},
2588 anim => $item->{anim}, 2531 anim => $item->{anim},
2589 animspeed => $item->{animspeed}); 2532 animspeed => $item->{animspeed},
2533 );
2534
2590 $self->add(new CFClient::UI::Label 2535 $self->add (new CFClient::UI::Label
2591 can_events => 0, 2536 can_events => 0,
2592 text => $desc); 2537 text => $desc,
2538 );
2593 2539
2594 $self 2540 $self
2595} 2541}
2596 2542
2597############################################################################# 2543#############################################################################
… …
2615 my ($self, $items) = @_; 2561 my ($self, $items) = @_;
2616 2562
2617 $self->{scrolled}->clear; 2563 $self->{scrolled}->clear;
2618 return unless $items; 2564 return unless $items;
2619 2565
2620 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2566 my @items = sort {
2567 ($a->{type} <=> $b->{type})
2568 or ($a->{name} cmp $b->{name})
2569 } @$items;
2621 2570
2622 $self->{real_items} = \@items; 2571 $self->{real_items} = \@items;
2623 2572
2624 for my $item (@items) { 2573 for my $item (@items) {
2625 my $desc = $item->{nrof} < 2 2574 my $desc = $item->{nrof} < 2
2626 ? $item->{name} 2575 ? $item->{name}
2627 : "$item->{nrof} $item->{name_pl}"; 2576 : "$item->{nrof} $item->{name_pl}";
2628 2577
2629 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2578 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2630 } 2579 }
2580
2581 $self->{scrolled}->add (@items);
2631 2582
2632# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2583# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633} 2584}
2634 2585
2635sub size_request { 2586sub size_request {
… …
2709 } 2660 }
2710} 2661}
2711 2662
2712############################################################################# 2663#############################################################################
2713 2664
2665package CFClient::UI::Statusbox;
2666
2667our @ISA = CFClient::UI::VBox::;
2668
2669sub reorder {
2670 my ($self) = @_;
2671 my $NOW = time;
2672
2673 while (my ($k, $v) = each %{ $self->{item} }) {
2674 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2675 }
2676
2677 my @widgets;
2678
2679 my @items = sort {
2680 $a->{pri} <=> $b->{pri}
2681 or $b->{id} <=> $a->{id}
2682 } values %{ $self->{item} };
2683
2684 my $count = 10 + 1;
2685 for my $item (@items) {
2686 last unless --$count;
2687
2688 push @widgets, $item->{label} ||= do {
2689 # TODO: doesn't handle markup well (read as: at all)
2690 my $short = $item->{count} > 1
2691 ? "<b>$item->{count} ×</b> $item->{text}"
2692 : $item->{text};
2693
2694 for ($short) {
2695 s/^\s+//;
2696 s/\012.*/…/s;
2697 my $len = int 40 / $item->{fontsize};
2698 substr $_, $len, length, "…" if $len < length;
2699 }
2700
2701 new CFClient::UI::Label
2702 markup => $short,
2703 tooltip => $item->{tooltip},
2704 tooltip_font => $::FONT_PROP,
2705 tooltip_width => 0.67,
2706 fontsize => $item->{fontsize},
2707 color => $item->{color},
2708 can_events => 1,
2709 can_hover => 1
2710 };
2711 }
2712
2713 $self->clear;
2714 $self->SUPER::add (reverse @widgets);
2715}
2716
2717sub add {
2718 my ($self, $text, %arg) = @_;
2719
2720 $text =~ s/^\s+//;
2721 $text =~ s/\s+$//;
2722
2723 my $timeout = time + ((delete $arg{timeout}) || 60);
2724
2725 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2726
2727 if (my $item = $self->{item}{$group}) {
2728 if ($item->{text} eq $text) {
2729 $item->{count}++;
2730 } else {
2731 $item->{count} = 1;
2732 $item->{text} = $item->{tooltip} = $text;
2733 }
2734 $item->{id} = ++$self->{id};
2735 $item->{timeout} = $timeout;
2736 delete $item->{label};
2737 } else {
2738 $self->{item}{$group} = {
2739 id => ++$self->{id},
2740 text => $text,
2741 timeout => $timeout,
2742 tooltip => $text,
2743 fontsize => 0.8,
2744 color => [0.8, 0.8, 0.8, 0.8],
2745 pri => 0,
2746 count => 1,
2747 %arg,
2748 };
2749 }
2750
2751 $self->reorder;
2752}
2753
2754#############################################################################
2755
2714package CFClient::UI::Root; 2756package CFClient::UI::Root;
2715 2757
2716our @ISA = CFClient::UI::Container::; 2758our @ISA = CFClient::UI::Container::;
2717 2759
2718use CFClient::OpenGL; 2760use CFClient::OpenGL;
2719 2761
2762sub new {
2763 my $class = shift;
2764
2765 $class->SUPER::new (
2766 @_,
2767 )
2768}
2769
2770sub configure {
2771 my ($self, $x, $y, $w, $h) = @_;
2772
2773 $self->{w} = $w;
2774 $self->{h} = $h;
2775}
2776
2720sub check_size { 2777sub check_size {
2721 my ($self) = @_; 2778 my ($self) = @_;
2722 2779
2723 $self->configure (0, 0, $self->{w}, $self->{h}); 2780 $self->size_allocate ($self->{w}, $self->{h})
2781 if $self->{w};
2724} 2782}
2725 2783
2726sub size_request { 2784sub size_request {
2727 my ($self) = @_; 2785 my ($self) = @_;
2728 2786
… …
2730} 2788}
2731 2789
2732sub size_allocate { 2790sub size_allocate {
2733 my ($self, $w, $h) = @_; 2791 my ($self, $w, $h) = @_;
2734 2792
2735 my $old_w = $self->{old_w}; 2793 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2736 my $old_h = $self->{old_h}; 2794 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2737 2795
2738 if ($old_w && $old_h) { 2796 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2739 for my $child ($self->children) { 2797 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 2798
2760 for my $child ($self->children) { 2799 for my $child ($self->children) {
2761 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2800 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2762 2801
2763 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2802 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2764 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2803 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2765 $child->configure ($X, $Y, $W, $H); 2804 $child->configure ($X, $Y, $W, $H);
2766 } 2805 }
2767} 2806}
2768 2807
2769sub _topleft { 2808sub coord2local {
2770 my ($self, $x, $y) = @_; 2809 my ($self, $x, $y) = @_;
2771 2810
2772 ($x, $y) 2811 ($x, $y)
2773} 2812}
2774 2813
2814sub coord2global {
2815 my ($self, $x, $y) = @_;
2816
2817 ($x, $y)
2818}
2819
2775sub update { 2820sub update {
2776 my ($self) = @_; 2821 my ($self) = @_;
2777 2822
2778 $self->check_size; 2823 $self->check_size;
2779 ::refresh (); 2824 $::WANT_REFRESH++;
2780} 2825}
2781 2826
2782sub add { 2827sub add {
2783 my ($self, $child) = @_; 2828 my ($self, $child) = @_;
2784 2829
2785 # integerize window positions 2830 # integerise window positions
2786 $child->{x} = int $child->{x}; 2831 $child->{x} = int $child->{x};
2787 $child->{y} = int $child->{y}; 2832 $child->{y} = int $child->{y};
2788 2833
2789 $self->SUPER::add ($child); 2834 $self->SUPER::add ($child);
2790} 2835}
… …
2793 my ($self, $id, $cb) = @_; 2838 my ($self, $id, $cb) = @_;
2794 2839
2795 $self->{refresh_hook}{$id} = $cb; 2840 $self->{refresh_hook}{$id} = $cb;
2796} 2841}
2797 2842
2843sub on_post_alloc {
2844 my ($self, $id, $cb) = @_;
2845
2846 $self->{post_alloc_hook}{$id} = $cb;
2847}
2848
2798sub draw { 2849sub draw {
2799 my ($self) = @_; 2850 my ($self) = @_;
2800 2851
2801 while (my $rcb = delete $self->{refresh_hook}) { 2852 while ($self->{refresh_hook}) {
2802 $_->() for values %$rcb; 2853 $_->()
2854 for values %{delete $self->{refresh_hook}};
2855 }
2856
2857 if ($self->{check_size}) {
2858 my @queue = ([], []);
2859
2860 for (;;) {
2861 if ($self->{check_size}) {
2862 # heuristic: check containers last
2863 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2864 for values %{delete $self->{check_size}}
2865 }
2866
2867 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2868
2869 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2870 ? @$widget{qw(user_w user_h)}
2871 : $widget->size_request;
2872
2873 if (delete $widget->{force_alloc}
2874 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2875 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2876
2877 $widget->{req_w} = $w;
2878 $widget->{req_h} = $h;
2879
2880 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2881
2882 $widget->{parent}->check_size
2883 if $widget->{parent};
2884 }
2885 }
2886 }
2887
2888 while ($self->{size_alloc}) {
2889 for (values %{delete $self->{size_alloc}}) {
2890 my ($widget, $w, $h) = @$_;
2891
2892 $w = 0 if $w < 0;
2893 $h = 0 if $h < 0;
2894
2895 $widget->{w} = $w;
2896 $widget->{h} = $h;
2897 $widget->size_allocate ($w, $h);
2898 $widget->emit (size_allocate => $w, $h);
2899 }
2900 }
2901
2902 while ($self->{post_alloc_hook}) {
2903 $_->()
2904 for values %{delete $self->{post_alloc_hook}};
2803 } 2905 }
2804 2906
2805 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2907 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2806 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2908 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2807 glClear GL_COLOR_BUFFER_BIT; 2909 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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