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.255 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.259 by root, Tue May 30 07:13:09 2006 UTC

… …
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
29 } 27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
30 31
31 return $LAYOUT; 32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
32} 36}
33 37
34sub set_layout { 38sub set_layout {
35 my ($layout) = @_; 39 my ($layout) = @_;
40
36 $LAYOUT = $layout; 41 $LAYOUT = $layout;
37} 42}
38 43
39sub check_tooltip { 44sub check_tooltip {
40 if (!$GRAB) { 45 if (!$GRAB) {
… …
165sub rescale_widgets { 170sub rescale_widgets {
166 my ($sx, $sy) = @_; 171 my ($sx, $sy) = @_;
167 172
168 for my $widget (values %WIDGET) { 173 for my $widget (values %WIDGET) {
169 if ($widget->{is_toplevel}) { 174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
170 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
171 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
172 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
173 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
174 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
175 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
176 } 188 }
177 } 189 }
178 190
179 reconfigure_widgets; 191 reconfigure_widgets;
180} 192}
… …
189 201
190sub new { 202sub new {
191 my $class = shift; 203 my $class = shift;
192 204
193 my $self = bless { 205 my $self = bless {
194 x => 0, 206 x => "center",
195 y => 0, 207 y => "center",
196 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
197 can_events => 1, 211 can_events => 1,
198 @_ 212 @_
199 }, $class; 213 }, $class;
214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
200 216
201 for (keys %$self) { 217 for (keys %$self) {
202 if (/^on_(.*)$/) { 218 if (/^on_(.*)$/) {
203 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
204 } 220 }
205 } 221 }
206 222
207 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
208
209 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
210 $self->{req_x} = $layout->{x} * $::WIDTH; 224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
211 $self->{req_y} = $layout->{y} * $::HEIGHT; 225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
212 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
213 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
214 } 233 }
215 234
216 $self 235 $self
217} 236}
218 237
… …
227 my ($self) = @_; 246 my ($self) = @_;
228 247
229 return if $self->{parent}; 248 return if $self->{parent};
230 249
231 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
232}
233
234sub center {
235 my ($self) = @_;
236
237 $CFClient::UI::ROOT->on_post_alloc (
238 "center_$self" => sub {
239 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
240 },
241 );
242
243 $self->update;
244} 251}
245 252
246sub set_visible { 253sub set_visible {
247 my ($self) = @_; 254 my ($self) = @_;
248 255
… …
303 310
304 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
305 if $self->{parent}; 312 if $self->{parent};
306} 313}
307 314
308sub move { 315sub move_abs {
309 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
310 317
311 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
312 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
313 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
314 321
315 $self->update; 322 $self->update;
316} 323}
317 324
318sub set_size { 325sub set_size {
319 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
320 327
321 $self->{def_w} = $w; 328 $self->{force_w} = $w;
322 $self->{def_h} = $h; 329 $self->{force_h} = $h;
323 330
324 $self->realloc; 331 $self->realloc;
325} 332}
326 333
327sub size_request { 334sub size_request {
… …
331 338
332sub configure { 339sub configure {
333 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
334 341
335 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
336 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
337 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
338 347
339 # use alignment to adjust x, y 348 # use alignment to adjust x, y
340 349
341 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
342 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
343
344 ($w, $h) = ($w2, $h2);
345 } 352 }
346 353
347 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
348 $self->{x} = $x; 355 $self->{x} = $x;
349 $self->{y} = $y; 356 $self->{y} = $y;
350 $self->update; 357 $self->update;
351 } 358 }
352 359
353 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
354 return unless $self->{visible}; 361 return unless $self->{visible};
355 362
363 $self->{alloc_w} = $w;
364 $self->{alloc_h} = $h;
365
356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 366 $self->{root}{size_alloc}{$self+0} = $self;
357 } 367 }
358} 368}
359 369
360sub size_allocate { 370sub size_allocate {
361 # nothing to be done 371 # nothing to be done
… …
461 471
462sub set_parent { 472sub set_parent {
463 my ($self, $parent) = @_; 473 my ($self, $parent) = @_;
464 474
465 Scalar::Util::weaken ($self->{parent} = $parent); 475 Scalar::Util::weaken ($self->{parent} = $parent);
466
467 $self->set_visible if $parent->{visible}; 476 $self->set_visible if $parent->{visible};
468} 477}
469 478
470sub connect { 479sub connect {
471 my ($self, $signal, $cb) = @_; 480 my ($self, $signal, $cb) = @_;
… …
492 501
493sub realloc { 502sub realloc {
494 my ($self) = @_; 503 my ($self) = @_;
495 504
496 if ($self->{visible}) { 505 if ($self->{visible}) {
497 return if $self->{root}{realloc}{$self}; 506 return if $self->{root}{realloc}{$self+0};
498 507
499 $self->{root}{realloc}{$self} = $self; 508 $self->{root}{realloc}{$self+0} = $self;
500 $self->{root}->update; 509 $self->{root}->update;
501 } else { 510 } else {
502 delete $self->{req_w}; 511 delete $self->{req_w};
512 delete $self->{req_h};
503 } 513 }
504} 514}
505 515
506sub update { 516sub update {
507 my ($self) = @_; 517 my ($self) = @_;
508 518
509 $self->{parent}->update 519 $self->{parent}->update
510 if $self->{parent}; 520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
511} 528}
512 529
513sub draw { 530sub draw {
514 my ($self) = @_; 531 my ($self) = @_;
515 532
… …
533 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
534 glEnd; 551 glEnd;
535 glDisable GL_BLEND; 552 glDisable GL_BLEND;
536 } 553 }
537 554
538 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
539 glPushMatrix; 556 glPushMatrix;
540 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
542 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
543 glVertex 0 , 0; 560 glVertex 0 , 0;
… …
619 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
620 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
621} 638}
622 639
623sub size_request { 640sub size_request {
624 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
625} 644}
626 645
627sub draw { } 646sub draw { }
628 647
629############################################################################# 648#############################################################################
… …
750sub size_request { 769sub size_request {
751 $_[0]{children}[0]->size_request 770 $_[0]{children}[0]->size_request
752} 771}
753 772
754sub size_allocate { 773sub size_allocate {
755 my ($self, $w, $h, $changed) = @_; 774 my ($self, $w, $h) = @_;
756 775
757 $self->{children}[0]->configure (0, 0, $w, $h); 776 $self->{children}[0]->configure (0, 0, $w, $h);
758} 777}
759 778
760############################################################################# 779#############################################################################
… …
777 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
778 $self->SUPER::update; 797 $self->SUPER::update;
779} 798}
780 799
781sub size_allocate { 800sub size_allocate {
782 my ($self, $w, $h, $changed) = @_; 801 my ($self, $w, $h) = @_;
783 802
784 $self->SUPER::size_allocate ($w, $h, $changed); 803 $self->SUPER::size_allocate ($w, $h);
785 $self->update 804 $self->update;
786 if $changed;
787} 805}
788 806
789sub _render { 807sub _render {
790 $_[0]{children}[0]->draw; 808 $_[0]{children}[0]->draw;
791} 809}
… …
835} 853}
836 854
837sub size_request { 855sub size_request {
838 my ($self) = @_; 856 my ($self) = @_;
839 857
840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 859
842 $w = 10 if $self->{scroll_x}; 860 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y}; 861 $h = 10 if $self->{scroll_y};
844 862
845 ($w, $h) 863 ($w, $h)
846} 864}
847 865
848sub size_allocate { 866sub size_allocate {
849 my ($self, $w, $h, $changed) = @_; 867 my ($self, $w, $h) = @_;
850 868
869 my $child = $self->child;
870
851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853 873
854 $self->child->configure (0, 0, $w, $h); 874 $self->child->configure (0, 0, $w, $h);
855 $self->update; 875 $self->update;
856} 876}
857 877
… …
941 my $child = $self->{vp}->child; 961 my $child = $self->{vp}->child;
942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943} 963}
944 964
945sub size_allocate { 965sub size_allocate {
946 my ($self, $w, $h, $changed) = @_; 966 my ($self, $w, $h) = @_;
947 967
948 $self->SUPER::size_allocate ($w, $h, $changed); 968 $self->SUPER::size_allocate ($w, $h);
949 969
950 my $child = $self->{vp}->child; 970 my $child = $self->{vp}->child;
951 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
952} 972}
953 973
… …
1015 1035
1016 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
1017 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
1018 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
1019 border => 0.6, 1039 border => 0.6,
1020 is_toplevel => 1,
1021 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
1022 @_ 1043 @_
1023 ); 1044 );
1024 1045
1025 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
1026 align => 0, 1047 align => 0,
… …
1045 $h + $self->border * 2, 1066 $h + $self->border * 2,
1046 ) 1067 )
1047} 1068}
1048 1069
1049sub size_allocate { 1070sub size_allocate {
1050 my ($self, $w, $h, $changed) = @_; 1071 my ($self, $w, $h) = @_;
1051
1052 return unless $changed;
1053 1072
1054 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
1055 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
1056 1075
1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1081 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
1082 1101
1083 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
1084 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
1085 1104
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090 $self->move ($self->{user_x}, $self->{user_y}); 1107
1091 $self->realloc; 1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1092 }; 1110 };
1093 1111
1094 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
1095 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1096 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1098 $self->{motion} = sub { 1116 $self->{motion} = sub {
1099 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
1100 1118
1101 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
1102 1120
1103 $self->{user_x} = $bx + $x - $ox; 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1104 $self->{user_y} = $by + $y - $oy;
1105
1106 $self->move ($self->{user_x}, $self->{user_y});
1107 $self->realloc;
1108 }; 1122 };
1109 } 1123 }
1110} 1124}
1111 1125
1112sub button_up { 1126sub button_up {
… …
1234 (sum @$hs), 1248 (sum @$hs),
1235 ) 1249 )
1236} 1250}
1237 1251
1238sub size_allocate { 1252sub size_allocate {
1239 my ($self, $w, $h, $changed) = @_; 1253 my ($self, $w, $h) = @_;
1240 1254
1241 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1242 1256
1243 my $req_w = (sum @$ws) || 1; 1257 my $req_w = (sum @$ws) || 1;
1244 my $req_h = (sum @$hs) || 1; 1258 my $req_h = (sum @$hs) || 1;
… …
1322 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1323 ) 1337 )
1324} 1338}
1325 1339
1326sub size_allocate { 1340sub size_allocate {
1327 my ($self, $w, $h, $changed) = @_; 1341 my ($self, $w, $h) = @_;
1328 1342
1329 my $space = $self->{vertical} ? $h : $w; 1343 my $space = $self->{vertical} ? $h : $w;
1330 my $children = $self->{children}; 1344 my $children = $self->{children};
1331 1345
1332 my @req; 1346 my @req;
… …
1415 ellipsise => 3, # end 1429 ellipsise => 3, # end
1416 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1417 fontsize => 1, 1431 fontsize => 1,
1418 align => -1, 1432 align => -1,
1419 valign => -1, 1433 valign => -1,
1420 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1421 can_events => 0, 1436 can_events => 0,
1422 %arg 1437 %arg
1423 ); 1438 );
1424 1439
1425 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1501 1516
1502 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1503 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1504 } 1519 }
1505 1520
1506 ( 1521 ($w, $h)
1507 $w + $self->{padding} * 2,
1508 $h + $self->{padding} * 2,
1509 )
1510} 1522}
1511 1523
1512sub size_allocate { 1524sub size_allocate {
1513 my ($self, $w, $h, $changed) = @_; 1525 my ($self, $w, $h) = @_;
1514 1526
1515 delete $self->{texture} 1527 delete $self->{texture};
1516 if $changed;
1517} 1528}
1518 1529
1519sub set_fontsize { 1530sub set_fontsize {
1520 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1521 1532
… …
1538 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1539 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1540 1551
1541 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1542 1553
1543 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1544 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1545 : ($self->{w} - $tex->{w}) * 0.5); 1556 : ($self->{w} - $tex->{w}) * 0.5);
1546 1557
1547 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1548 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1549 : ($self->{h} - $tex->{h}) * 0.5); 1560 : ($self->{h} - $tex->{h}) * 0.5);
1550 1561
1551 $tex 1562 $tex
1552 }; 1563 };
1553 1564
… …
1792 1803
1793sub new { 1804sub new {
1794 my $class = shift; 1805 my $class = shift;
1795 1806
1796 $class->SUPER::new ( 1807 $class->SUPER::new (
1797 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1798 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1799 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1800 can_hover => 1, 1812 can_hover => 1,
1801 align => 0, 1813 align => 0,
1802 valign => 0, 1814 valign => 0,
… …
1849 1861
1850sub new { 1862sub new {
1851 my $class = shift; 1863 my $class = shift;
1852 1864
1853 $class->SUPER::new ( 1865 $class->SUPER::new (
1854 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1855 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1856 active_fg => [1, 1, 0], 1869 active_fg => [1, 1, 0],
1857 bg => [0, 0, 0, 0.2], 1870 bg => [0, 0, 0, 0.2],
1858 active_bg => [1, 1, 1, 0.5], 1871 active_bg => [1, 1, 1, 0.5],
1859 state => 0, 1872 state => 0,
… …
1863} 1876}
1864 1877
1865sub size_request { 1878sub size_request {
1866 my ($self) = @_; 1879 my ($self) = @_;
1867 1880
1868 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1869} 1882}
1870 1883
1871sub button_down { 1884sub button_down {
1872 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1873 1886
1874 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1875 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1876 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1877 $self->_emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1878 } 1891 }
1879} 1892}
1880 1893
1881sub _draw { 1894sub _draw {
1882 my ($self) = @_; 1895 my ($self) = @_;
1883 1896
1884 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1885 1898
1886 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1887 1900
1888 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1901 my ($w, $h) = @$self{qw(w h)};
1902
1903 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1889 1904
1890 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1891 1906
1892 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1893 1908
… …
2158 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
2159 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2160 bg => [0, 0, 0, 0.2], 2175 bg => [0, 0, 0, 0.2],
2161 active_bg => [1, 1, 1, 0.5], 2176 active_bg => [1, 1, 1, 0.5],
2162 range => [0, 0, 100, 10, 0], 2177 range => [0, 0, 100, 10, 0],
2163 req_w => $::WIDTH / 80, 2178 min_w => $::WIDTH / 80,
2164 req_h => $::WIDTH / 80, 2179 min_h => $::WIDTH / 80,
2165 vertical => 0, 2180 vertical => 0,
2166 can_hover => 1, 2181 can_hover => 1,
2167 inner_pad => 0.02, 2182 inner_pad => 0.02,
2168 @_ 2183 @_
2169 ); 2184 );
… …
2209} 2224}
2210 2225
2211sub size_request { 2226sub size_request {
2212 my ($self) = @_; 2227 my ($self) = @_;
2213 2228
2214 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
2215 my $h = $self->{req_h};
2216
2217 $self->{vertical} ? ($h, $w) : ($w, $h)
2218} 2230}
2219 2231
2220sub button_down { 2232sub button_down {
2221 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
2222 2234
… …
2372 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
2373 $self->reflow; 2385 $self->reflow;
2374} 2386}
2375 2387
2376sub size_allocate { 2388sub size_allocate {
2377 my ($self, $w, $h, $changed) = @_; 2389 my ($self, $w, $h) = @_;
2378 2390
2379 $self->SUPER::size_allocate ($w, $h, $changed); 2391 $self->SUPER::size_allocate ($w, $h);
2380
2381 return unless $changed;
2382 2392
2383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2393 $self->{layout}->set_font ($self->{font}) if $self->{font};
2384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2385 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2386 2396
… …
2609} 2619}
2610 2620
2611sub set_tooltip_from { 2621sub set_tooltip_from {
2612 my ($self, $widget) = @_; 2622 my ($self, $widget) = @_;
2613 2623
2624 my $tooltip = $widget->{tooltip};
2625
2626 if ($ENV{CFPLUS_DEBUG} & 2) {
2627 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}";
2631 }
2632
2614 $self->add (new CFClient::UI::Label 2633 $self->add (new CFClient::UI::Label
2615 markup => $widget->{tooltip}, 2634 markup => $tooltip,
2616 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2617 fontsize => 0.8, 2636 fontsize => 0.8,
2618 fg => [0, 0, 0, 1], 2637 fg => [0, 0, 0, 1],
2619 ellipsise => 0, 2638 ellipsise => 0,
2620 font => ($widget->{tooltip_font} || $::FONT_PROP), 2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2628 2647
2629 ($w + 4, $h + 4) 2648 ($w + 4, $h + 4)
2630} 2649}
2631 2650
2632sub size_allocate { 2651sub size_allocate {
2633 my ($self, $w, $h, $changed) = @_; 2652 my ($self, $w, $h) = @_;
2634 2653
2635 return unless $changed;
2636
2637 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2638} 2655}
2639 2656
2640sub visibility_change { 2657sub visibility_change {
2641 my ($self, $visible) = @_; 2658 my ($self, $visible) = @_;
2642 2659
… …
2649 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2650 2667
2651 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2652 if $x + $self->{w} > $::WIDTH; 2669 if $x + $self->{w} > $::WIDTH;
2653 2670
2654 $self->move ($x, $y); 2671 $self->move_abs ($x, $y);
2655 }); 2672 });
2656} 2673}
2657 2674
2658sub _draw { 2675sub _draw {
2659 my ($self) = @_; 2676 my ($self) = @_;
… …
2852 # maybe save $GRAB? must be careful about events... 2869 # maybe save $GRAB? must be careful about events...
2853 $GRAB = $self; 2870 $GRAB = $self;
2854 $self->{button} = $ev->{button}; 2871 $self->{button} = $ev->{button};
2855 2872
2856 $self->show; 2873 $self->show;
2857 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2858} 2875}
2859 2876
2860sub mouse_motion { 2877sub mouse_motion {
2861 my ($self, $ev, $x, $y) = @_; 2878 my ($self, $ev, $x, $y) = @_;
2862 2879
… …
3006 Scalar::Util::weaken ($self->{root} = $self); 3023 Scalar::Util::weaken ($self->{root} = $self);
3007 3024
3008 $self 3025 $self
3009} 3026}
3010 3027
3011sub configure {
3012 my ($self, $x, $y, $w, $h) = @_;
3013
3014 $self->{w} = $w;
3015 $self->{h} = $h;
3016}
3017
3018sub reconfigure {
3019 my ($self) = @_;
3020
3021 $self->SUPER::reconfigure;
3022
3023 $self->size_allocate ($self->{w}, $self->{h}, 1)
3024 if $self->{w};
3025}
3026
3027sub size_request { 3028sub size_request {
3028 my ($self) = @_; 3029 my ($self) = @_;
3029 3030
3030 ($self->{w}, $self->{h}) 3031 ($self->{w}, $self->{h})
3031} 3032}
3032 3033
3034sub _to_pixel {
3035 my ($coord, $size, $max) = @_;
3036
3037 $coord =
3038 $coord eq "center" ? ($max - $size) * 0.5
3039 : $coord eq "max" ? $max
3040 : $coord;
3041
3042 $coord = 0 if $coord < 0;
3043 $coord = $max - $size if $coord > $max - $size;
3044
3045 int $coord + 0.5
3046}
3047
3033sub size_allocate { 3048sub size_allocate {
3034 my ($self, $w, $h, $changed) = @_; 3049 my ($self, $w, $h) = @_;
3035 3050
3036 for my $child ($self->children) { 3051 for my $child ($self->children) {
3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038 3053
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3054 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3055 $Y = $child->{force_y} if exists $child->{force_y};
3041 3056
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3057 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3058 $Y = _to_pixel $Y, $H, $self->{h};
3044
3045 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3046
3047 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3048 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3049 3059
3050 $child->configure ($X, $Y, $W, $H); 3060 $child->configure ($X, $Y, $W, $H);
3051 } 3061 }
3052} 3062}
3053 3063
… …
3070} 3080}
3071 3081
3072sub add { 3082sub add {
3073 my ($self, @children) = @_; 3083 my ($self, @children) = @_;
3074 3084
3075 for my $child (@children) {
3076 $child->{is_toplevel} = 1; 3085 $_->{is_toplevel} = 1
3077 3086 for @children;
3078 # integerise window positions
3079 $child->{x} = int $child->{x};
3080 $child->{y} = int $child->{y};
3081 }
3082 3087
3083 $self->SUPER::add (@children); 3088 $self->SUPER::add (@children);
3084} 3089}
3085 3090
3086sub remove { 3091sub remove {
3087 my ($self, @children) = @_; 3092 my ($self, @children) = @_;
3088 3093
3089 $self->SUPER::remove (@children); 3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3090 3098
3091 while (@children) { 3099 while (@children) {
3092 my $w = pop @children; 3100 my $w = pop @children;
3093 push @children, $w->children; 3101 push @children, $w->children;
3094 $w->set_invisible; 3102 $w->set_invisible;
… …
3120 3128
3121 while () { 3129 while () {
3122 if ($self->{realloc}) { 3130 if ($self->{realloc}) {
3123 #TODO use array-of-depth approach 3131 #TODO use array-of-depth approach
3124 3132
3133 use sort 'stable';
3134
3125 @queue = sort { $a->{visible} <=> $b->{visible} } 3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3126 @queue, values %{delete $self->{realloc}}; 3136 @queue, values %{delete $self->{realloc}};
3127 } 3137 }
3128 3138
3129 my $widget = pop @queue || last; 3139 my $widget = pop @queue || last;
3130 3140
3131 $widget->{visible} or last; # do not resize invisible widgets 3141 $widget->{visible} or last; # do not resize invisible widgets
3132 3142
3133 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3134 ? @$widget{qw(def_w def_h)}
3135 : $widget->size_request; 3143 my ($w, $h) = $widget->size_request;
3136 3144
3137 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3147
3148 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h};
3150
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3152 || delete $widget->{force_realloc}) {
3153 $widget->{req_w} = $w;
3154 $widget->{req_h} = $h;
3155
3156 $self->{size_alloc}{$widget+0} = $widget;
3157
3158 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent;
3160 #unshift @queue, $parent;
3161 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent;
3138 3163 }
3139 $widget->{req_w} = $w; 3164 }
3140 $widget->{req_h} = $h;
3141 3165
3142 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3166 delete $self->{realloc}{$widget+0};
3143
3144 push @queue, $widget->{parent}
3145 if $widget->{parent};
3146 } 3167 }
3147 } 3168 }
3148 3169
3149 while (my $size_alloc = delete $self->{size_alloc}) { 3170 while (my $size_alloc = delete $self->{size_alloc}) {
3150 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3151 values %$size_alloc; 3172 values %$size_alloc;
3152 3173
3153 while () { 3174 while () {
3154 my ($widget, $w, $h) = @{ pop @queue or last }; 3175 my $widget = pop @queue || last;
3176
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3155 3178
3156 $w = 0 if $w < 0; 3179 $w = 0 if $w < 0;
3157 $h = 0 if $h < 0; 3180 $h = 0 if $h < 0;
3158 3181
3159 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3182 $w = int $w + 0.5;
3183 $h = int $h + 0.5;
3160 3184
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3161 $widget->{w} = $w; 3186 $widget->{w} = $w;
3162 $widget->{h} = $h; 3187 $widget->{h} = $h;
3163 3188
3164 $widget->emit (size_allocate => $w, $h, $changed); 3189 $widget->emit (size_allocate => $w, $h);
3190 }
3165 } 3191 }
3166 } 3192 }
3167 3193
3168 while ($self->{post_alloc_hook}) { 3194 while ($self->{post_alloc_hook}) {
3169 $_->() 3195 $_->()
3170 for values %{delete $self->{post_alloc_hook}}; 3196 for values %{delete $self->{post_alloc_hook}};
3171 } 3197 }
3198
3172 3199
3173 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3174 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3175 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
3176 3203

Diff Legend

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