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.254 by root, Mon May 29 01:53:23 2006 UTC vs.
Revision 1.265 by root, Thu Jun 1 02:59:46 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
… …
1000 1020
1001our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
1002 1022
1003use CFClient::OpenGL; 1023use CFClient::OpenGL;
1004 1024
1005my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
1006 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1007 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1008 1032
1009sub new { 1033sub new {
1010 my $class = shift; 1034 my $class = shift;
1011 1035
1012 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
1013 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
1014 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
1015 border => 0.6, 1039 border => 0.6,
1016 is_toplevel => 1,
1017 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
1018 @_ 1043 @_
1019 ); 1044 );
1020 1045
1021 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
1022 align => 0, 1047 align => 0,
… …
1041 $h + $self->border * 2, 1066 $h + $self->border * 2,
1042 ) 1067 )
1043} 1068}
1044 1069
1045sub size_allocate { 1070sub size_allocate {
1046 my ($self, $w, $h, $changed) = @_; 1071 my ($self, $w, $h) = @_;
1047
1048 return unless $changed;
1049 1072
1050 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
1051 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
1052 1075
1053 $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)
… …
1077 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
1078 1101
1079 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
1080 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
1081 1104
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1086 $self->move ($self->{user_x}, $self->{user_y}); 1107
1087 $self->realloc; 1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1088 }; 1110 };
1089 1111
1090 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
1091 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1092 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1094 $self->{motion} = sub { 1116 $self->{motion} = sub {
1095 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
1096 1118
1097 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
1098 1120
1099 $self->{user_x} = $bx + $x - $ox; 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1100 $self->{user_y} = $by + $y - $oy;
1101
1102 $self->move ($self->{user_x}, $self->{user_y});
1103 $self->realloc;
1104 }; 1122 };
1105 } 1123 }
1106} 1124}
1107 1125
1108sub button_up { 1126sub button_up {
… …
1127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1128 1146
1129 my $border = $self->border; 1147 my $border = $self->border;
1130 1148
1131 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
1132 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1133 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1134 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1135 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1136 1154
1137 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1138 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
1139 1157
1140 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
1141 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
1142 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
1143
1144 glColor @{ $self->{bg} };
1145
1146 $bg->{s} = $rep_x;
1147 $bg->{t} = $rep_y;
1148 $bg->{wrap_mode} = 1;
1149 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1150 } 1163 }
1151 1164
1152 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
1153 1166
… …
1235 (sum @$hs), 1248 (sum @$hs),
1236 ) 1249 )
1237} 1250}
1238 1251
1239sub size_allocate { 1252sub size_allocate {
1240 my ($self, $w, $h, $changed) = @_; 1253 my ($self, $w, $h) = @_;
1241 1254
1242 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1243 1256
1244 my $req_w = (sum @$ws) || 1; 1257 my $req_w = (sum @$ws) || 1;
1245 my $req_h = (sum @$hs) || 1; 1258 my $req_h = (sum @$hs) || 1;
… …
1323 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1324 ) 1337 )
1325} 1338}
1326 1339
1327sub size_allocate { 1340sub size_allocate {
1328 my ($self, $w, $h, $changed) = @_; 1341 my ($self, $w, $h) = @_;
1329 1342
1330 my $space = $self->{vertical} ? $h : $w; 1343 my $space = $self->{vertical} ? $h : $w;
1331 my $children = $self->{children}; 1344 my $children = $self->{children};
1332 1345
1333 my @req; 1346 my @req;
… …
1416 ellipsise => 3, # end 1429 ellipsise => 3, # end
1417 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1418 fontsize => 1, 1431 fontsize => 1,
1419 align => -1, 1432 align => -1,
1420 valign => -1, 1433 valign => -1,
1421 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1422 can_events => 0, 1436 can_events => 0,
1423 %arg 1437 %arg
1424 ); 1438 );
1425 1439
1426 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1502 1516
1503 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1504 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1505 } 1519 }
1506 1520
1507 ( 1521 ($w, $h)
1508 $w + $self->{padding} * 2,
1509 $h + $self->{padding} * 2,
1510 )
1511} 1522}
1512 1523
1513sub size_allocate { 1524sub size_allocate {
1514 my ($self, $w, $h, $changed) = @_; 1525 my ($self, $w, $h) = @_;
1515 1526
1516 delete $self->{texture} 1527 delete $self->{texture}
1517 if $changed; 1528 ;#d#
1518} 1529}
1519 1530
1520sub set_fontsize { 1531sub set_fontsize {
1521 my ($self, $fontsize) = @_; 1532 my ($self, $fontsize) = @_;
1522 1533
… …
1539 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1540 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1541 1552
1542 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1553 my $tex = new_from_layout CFClient::Texture $self->{layout};
1543 1554
1544 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1545 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1546 : ($self->{w} - $tex->{w}) * 0.5); 1557 : ($self->{w} - $tex->{w}) * 0.5);
1547 1558
1548 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1549 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1550 : ($self->{h} - $tex->{h}) * 0.5); 1561 : ($self->{h} - $tex->{h}) * 0.5);
1551 1562
1552 $tex 1563 $tex
1553 }; 1564 };
1554 1565
… …
1793 1804
1794sub new { 1805sub new {
1795 my $class = shift; 1806 my $class = shift;
1796 1807
1797 $class->SUPER::new ( 1808 $class->SUPER::new (
1798 padding => 4, 1809 padding_x => 4,
1810 padding_y => 4,
1799 fg => [1, 1, 1], 1811 fg => [1, 1, 1],
1800 active_fg => [0, 0, 1], 1812 active_fg => [0, 0, 1],
1801 can_hover => 1, 1813 can_hover => 1,
1802 align => 0, 1814 align => 0,
1803 valign => 0, 1815 valign => 0,
… …
1850 1862
1851sub new { 1863sub new {
1852 my $class = shift; 1864 my $class = shift;
1853 1865
1854 $class->SUPER::new ( 1866 $class->SUPER::new (
1855 padding => 2, 1867 padding_x => 2,
1868 padding_y => 2,
1856 fg => [1, 1, 1], 1869 fg => [1, 1, 1],
1857 active_fg => [1, 1, 0], 1870 active_fg => [1, 1, 0],
1858 bg => [0, 0, 0, 0.2], 1871 bg => [0, 0, 0, 0.2],
1859 active_bg => [1, 1, 1, 0.5], 1872 active_bg => [1, 1, 1, 0.5],
1860 state => 0, 1873 state => 0,
… …
1864} 1877}
1865 1878
1866sub size_request { 1879sub size_request {
1867 my ($self) = @_; 1880 my ($self) = @_;
1868 1881
1869 ($self->{padding} * 2 + 6) x 2 1882 (6) x 2
1870} 1883}
1871 1884
1872sub button_down { 1885sub button_down {
1873 my ($self, $ev, $x, $y) = @_; 1886 my ($self, $ev, $x, $y) = @_;
1874 1887
1875 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1876 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1877 $self->{state} = !$self->{state}; 1890 $self->{state} = !$self->{state};
1878 $self->_emit (changed => $self->{state}); 1891 $self->_emit (changed => $self->{state});
1879 } 1892 }
1880} 1893}
1881 1894
1882sub _draw { 1895sub _draw {
1883 my ($self) = @_; 1896 my ($self) = @_;
1884 1897
1885 $self->SUPER::_draw; 1898 $self->SUPER::_draw;
1886 1899
1887 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1900 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1888 1901
1889 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1902 my ($w, $h) = @$self{qw(w h)};
1903
1904 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1890 1905
1891 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1892 1907
1893 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1908 my $tex = $self->{state} ? $tex[1] : $tex[0];
1894 1909
… …
2159 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
2160 active_fg => [0, 0, 0], 2175 active_fg => [0, 0, 0],
2161 bg => [0, 0, 0, 0.2], 2176 bg => [0, 0, 0, 0.2],
2162 active_bg => [1, 1, 1, 0.5], 2177 active_bg => [1, 1, 1, 0.5],
2163 range => [0, 0, 100, 10, 0], 2178 range => [0, 0, 100, 10, 0],
2164 req_w => $::WIDTH / 80, 2179 min_w => $::WIDTH / 80,
2165 req_h => $::WIDTH / 80, 2180 min_h => $::WIDTH / 80,
2166 vertical => 0, 2181 vertical => 0,
2167 can_hover => 1, 2182 can_hover => 1,
2168 inner_pad => 0.02, 2183 inner_pad => 0.02,
2169 @_ 2184 @_
2170 ); 2185 );
… …
2210} 2225}
2211 2226
2212sub size_request { 2227sub size_request {
2213 my ($self) = @_; 2228 my ($self) = @_;
2214 2229
2215 my $w = $self->{req_w}; 2230 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2231}
2220 2232
2221sub button_down { 2233sub button_down {
2222 my ($self, $ev, $x, $y) = @_; 2234 my ($self, $ev, $x, $y) = @_;
2223 2235
… …
2373 $self->{fontsize} = $fontsize; 2385 $self->{fontsize} = $fontsize;
2374 $self->reflow; 2386 $self->reflow;
2375} 2387}
2376 2388
2377sub size_allocate { 2389sub size_allocate {
2378 my ($self, $w, $h, $changed) = @_; 2390 my ($self, $w, $h) = @_;
2379 2391
2380 $self->SUPER::size_allocate ($w, $h, $changed); 2392 $self->SUPER::size_allocate ($w, $h);
2381
2382 return unless $changed;
2383 2393
2384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2394 $self->{layout}->set_font ($self->{font}) if $self->{font};
2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2386 $self->{layout}->set_width ($self->{children}[0]{w}); 2396 $self->{layout}->set_width ($self->{children}[0]{w});
2387 2397
… …
2610} 2620}
2611 2621
2612sub set_tooltip_from { 2622sub set_tooltip_from {
2613 my ($self, $widget) = @_; 2623 my ($self, $widget) = @_;
2614 2624
2625 my $tooltip = $widget->{tooltip};
2626
2627 if ($ENV{CFPLUS_DEBUG} & 2) {
2628 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}";
2632 }
2633
2615 $self->add (new CFClient::UI::Label 2634 $self->add (new CFClient::UI::Label
2616 markup => $widget->{tooltip}, 2635 markup => $tooltip,
2617 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2618 fontsize => 0.8, 2637 fontsize => 0.8,
2619 fg => [0, 0, 0, 1], 2638 fg => [0, 0, 0, 1],
2620 ellipsise => 0, 2639 ellipsise => 0,
2621 font => ($widget->{tooltip_font} || $::FONT_PROP), 2640 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2629 2648
2630 ($w + 4, $h + 4) 2649 ($w + 4, $h + 4)
2631} 2650}
2632 2651
2633sub size_allocate { 2652sub size_allocate {
2634 my ($self, $w, $h, $changed) = @_; 2653 my ($self, $w, $h) = @_;
2635 2654
2636 return unless $changed;
2637
2638 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2655 $self->SUPER::size_allocate ($w - 4, $h - 4);
2639} 2656}
2640 2657
2641sub visibility_change { 2658sub visibility_change {
2642 my ($self, $visible) = @_; 2659 my ($self, $visible) = @_;
2643 2660
… …
2650 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2667 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2651 2668
2652 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2669 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2653 if $x + $self->{w} > $::WIDTH; 2670 if $x + $self->{w} > $::WIDTH;
2654 2671
2655 $self->move ($x, $y); 2672 $self->move_abs ($x, $y);
2656 }); 2673 });
2657} 2674}
2658 2675
2659sub _draw { 2676sub _draw {
2660 my ($self) = @_; 2677 my ($self) = @_;
… …
2764 $self->SUPER::DESTROY; 2781 $self->SUPER::DESTROY;
2765} 2782}
2766 2783
2767############################################################################# 2784#############################################################################
2768 2785
2769package CFClient::UI::Inventory;
2770
2771our @ISA = CFClient::UI::ScrolledWindow::;
2772
2773sub new {
2774 my $class = shift;
2775
2776 my $self = $class->SUPER::new (
2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778 @_,
2779 );
2780
2781 $self
2782}
2783
2784sub set_items {
2785 my ($self, $items) = @_;
2786
2787 $self->{scrolled}->clear;
2788 return unless $items;
2789
2790 my @items = sort {
2791 ($a->{type} <=> $b->{type})
2792 or ($a->{name} cmp $b->{name})
2793 } @$items;
2794
2795 $self->{real_items} = \@items;
2796
2797 my $row = 0;
2798 for my $item (@items) {
2799 CFClient::Item::update_widgets $item;
2800
2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805 $row++;
2806 }
2807}
2808
2809#############################################################################
2810
2811package CFClient::UI::Menu; 2786package CFClient::UI::Menu;
2812 2787
2813our @ISA = CFClient::UI::FancyFrame::; 2788our @ISA = CFClient::UI::FancyFrame::;
2814 2789
2815use CFClient::OpenGL; 2790use CFClient::OpenGL;
… …
2853 # maybe save $GRAB? must be careful about events... 2828 # maybe save $GRAB? must be careful about events...
2854 $GRAB = $self; 2829 $GRAB = $self;
2855 $self->{button} = $ev->{button}; 2830 $self->{button} = $ev->{button};
2856 2831
2857 $self->show; 2832 $self->show;
2858 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2833 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2859} 2834}
2860 2835
2861sub mouse_motion { 2836sub mouse_motion {
2862 my ($self, $ev, $x, $y) = @_; 2837 my ($self, $ev, $x, $y) = @_;
2863 2838
… …
2988 $self->SUPER::reconfigure; 2963 $self->SUPER::reconfigure;
2989} 2964}
2990 2965
2991############################################################################# 2966#############################################################################
2992 2967
2968package CFClient::UI::Inventory;
2969
2970our @ISA = CFClient::UI::ScrolledWindow::;
2971
2972sub new {
2973 my $class = shift;
2974
2975 my $self = $class->SUPER::new (
2976 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2977 @_,
2978 );
2979
2980 $self
2981}
2982
2983sub set_items {
2984 my ($self, $items) = @_;
2985
2986 $self->{scrolled}->clear;
2987 return unless $items;
2988
2989 my @items = sort {
2990 ($a->{type} <=> $b->{type})
2991 or ($a->{name} cmp $b->{name})
2992 } @$items;
2993
2994 $self->{real_items} = \@items;
2995
2996 my $row = 0;
2997 for my $item (@items) {
2998 CFClient::Item::update_widgets $item;
2999
3000 $self->{scrolled}->add (0, $row, $item->{face_widget});
3001 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3002 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3003
3004 $row++;
3005 }
3006}
3007
3008#############################################################################
3009
3010package CFClient::UI::BindEditor;
3011
3012our @ISA = CFClient::UI::FancyFrame::;
3013
3014sub new {
3015 my $class = shift;
3016
3017 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3018
3019 $self->add (my $vb = new CFClient::UI::VBox);
3020
3021
3022 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3023 text => "start recording",
3024 tooltip => "Start/Stops recording of actions."
3025 ."All subsequent actions after the recording started will be captured."
3026 ."The actions are displayed after the record was stopped."
3027 ."To bind the action you have to click on the 'Bind' button",
3028 on_activate => sub {
3029 unless ($self->{recording}) {
3030 $self->start;
3031 } else {
3032 $self->stop;
3033 }
3034 });
3035
3036 $vb->add (new CFClient::UI::Label text => "Actions:");
3037 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3038
3039 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3040 $vb->add (my $hb = new CFClient::UI::HBox);
3041 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3042 $hb->add (new CFClient::UI::Button
3043 text => "bind",
3044 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3045 on_activate => sub {
3046 $self->ask_for_bind;
3047 });
3048
3049 $vb->add (my $hb = new CFClient::UI::HBox);
3050 $hb->add (new CFClient::UI::Button
3051 text => "ok",
3052 expand => 1,
3053 tooltip => "This closes the binding editor and saves the binding",
3054 on_activate => sub {
3055 $self->hide;
3056 $self->commit;
3057 });
3058
3059 $hb->add (new CFClient::UI::Button
3060 text => "cancel",
3061 expand => 1,
3062 tooltip => "This closes the binding editor without saving",
3063 on_activate => sub {
3064 $self->hide;
3065 $self->{binding_cancel}->()
3066 if $self->{binding_cancel};
3067 });
3068
3069 $self->update_binding_widgets;
3070
3071 $self
3072}
3073
3074sub commit {
3075 my ($self) = @_;
3076 my ($mod, $sym, $cmds) = $self->get_binding;
3077 if ($sym != 0 && @$cmds > 0) {
3078 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3079 ."'. Don't forget 'Save Config'!");
3080 $self->{binding_change}->($mod, $sym, $cmds)
3081 if $self->{binding_change};
3082 } else {
3083 $::STATUSBOX->add ("No action bound, no key or action specified!");
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 }
3087}
3088
3089sub start {
3090 my ($self) = @_;
3091
3092 $self->{rec_btn}->set_text ("stop recording");
3093 $self->{recording} = 1;
3094 $self->clear_command_list;
3095 $::CONN->start_record if $::CONN;
3096}
3097
3098sub stop {
3099 my ($self) = @_;
3100
3101 $self->{rec_btn}->set_text ("start recording");
3102 $self->{recording} = 0;
3103
3104 my $rec;
3105 $rec = $::CONN->stop_record if $::CONN;
3106 return unless ref $rec eq 'ARRAY';
3107 $self->set_command_list ($rec);
3108}
3109
3110# if $commit is true, the binding will be set after the user entered a key combo
3111sub ask_for_bind {
3112 my ($self, $commit) = @_;
3113
3114 CFClient::Binder::open_binding_dialog (sub {
3115 my ($mod, $sym) = @_;
3116 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3117 $self->update_binding_widgets;
3118 $self->commit if $commit;
3119 });
3120}
3121
3122# $mod and $sym are the modifiers and key symbol
3123# $cmds is a array ref of strings (the commands)
3124# $cb is the callback that is executed on OK
3125# $ccb is the callback that is executed on CANCEL and
3126# when the binding was unsuccessful on OK
3127sub set_binding {
3128 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3129
3130 $self->clear_command_list;
3131 $self->{recording} = 0;
3132 $self->{rec_btn}->set_text ("start recording");
3133
3134 $self->{binding} = [$mod, $sym];
3135 $self->{commands} = $cmds;
3136
3137 $self->{binding_change} = $cb;
3138 $self->{binding_cancel} = $ccb;
3139
3140 $self->update_binding_widgets;
3141}
3142
3143# this is a shortcut method that asks for a binding
3144# and then just binds it.
3145sub do_quick_binding {
3146 my ($self, $cmds) = @_;
3147 $self->set_binding (undef, undef, $cmds, sub {
3148 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3149 });
3150 $self->ask_for_bind (1);
3151}
3152
3153sub update_binding_widgets {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3157 $self->set_command_list ($cmds);
3158}
3159
3160sub get_binding {
3161 my ($self) = @_;
3162 return (
3163 $self->{binding}->[0],
3164 $self->{binding}->[1],
3165 [ grep { defined $_ } @{$self->{commands}} ]
3166 );
3167}
3168
3169sub clear_command_list {
3170 my ($self) = @_;
3171 $self->{cmdbox}->clear ();
3172}
3173
3174sub set_command_list {
3175 my ($self, $cmds) = @_;
3176
3177 $self->{cmdbox}->clear ();
3178 $self->{commands} = $cmds;
3179
3180 my $idx = 0;
3181
3182 for (@$cmds) {
3183 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3184
3185 my $i = $idx;
3186 $hb->add (new CFClient::UI::Label text => $_);
3187 $hb->add (new CFClient::UI::Button
3188 text => "delete",
3189 tooltip => "Deletes the action from the record",
3190 on_activate => sub {
3191 $self->{cmdbox}->remove ($hb);
3192 $cmds->[$i] = undef;
3193 });
3194
3195
3196 $idx++
3197 }
3198}
3199
3200#############################################################################
3201
3202package CFClient::UI::SpellList;
3203
3204our @ISA = CFClient::UI::FancyFrame::;
3205
3206sub new {
3207 my $class = shift;
3208
3209 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3210
3211 $self->add (new CFClient::UI::ScrolledWindow
3212 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3213
3214 $self;
3215}
3216
3217# XXX: Do sorting? Argl...
3218sub add_spell {
3219 my ($self, $spell) = @_;
3220 $self->{spells}->{$spell->{name}} = $spell;
3221
3222 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223 face => $spell->{face},
3224 can_hover => 1,
3225 can_events => 1,
3226 tooltip => $spell->{message});
3227
3228 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229 text => $spell->{name},
3230 can_hover => 1,
3231 can_events => 1,
3232 tooltip => $spell->{message},
3233 expand => 1);
3234
3235 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3238 expand => 1);
3239
3240 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241 text => "bind to key",
3242 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243}
3244
3245sub rebuild_spell_list {
3246 my ($self) = @_;
3247 $self->{tbl_idx} = 0;
3248 $self->add_spell ($_) for values %{$self->{spells}};
3249}
3250
3251sub remove_spell {
3252 my ($self, $spell) = @_;
3253 delete $self->{spells}->{$spell->{name}};
3254 $self->rebuild_spell_list;
3255}
3256
3257#############################################################################
3258
2993package CFClient::UI::Root; 3259package CFClient::UI::Root;
2994 3260
2995our @ISA = CFClient::UI::Container::; 3261our @ISA = CFClient::UI::Container::;
2996 3262
2997use CFClient::OpenGL; 3263use CFClient::OpenGL;
… …
3007 Scalar::Util::weaken ($self->{root} = $self); 3273 Scalar::Util::weaken ($self->{root} = $self);
3008 3274
3009 $self 3275 $self
3010} 3276}
3011 3277
3012sub configure {
3013 my ($self, $x, $y, $w, $h) = @_;
3014
3015 $self->{w} = $w;
3016 $self->{h} = $h;
3017}
3018
3019sub reconfigure {
3020 my ($self) = @_;
3021
3022 $self->SUPER::reconfigure;
3023
3024 $self->size_allocate ($self->{w}, $self->{h}, 1)
3025 if $self->{w};
3026}
3027
3028sub size_request { 3278sub size_request {
3029 my ($self) = @_; 3279 my ($self) = @_;
3030 3280
3031 ($self->{w}, $self->{h}) 3281 ($self->{w}, $self->{h})
3032} 3282}
3033 3283
3284sub _to_pixel {
3285 my ($coord, $size, $max) = @_;
3286
3287 $coord =
3288 $coord eq "center" ? ($max - $size) * 0.5
3289 : $coord eq "max" ? $max
3290 : $coord;
3291
3292 $coord = 0 if $coord < 0;
3293 $coord = $max - $size if $coord > $max - $size;
3294
3295 int $coord + 0.5
3296}
3297
3034sub size_allocate { 3298sub size_allocate {
3035 my ($self, $w, $h, $changed) = @_; 3299 my ($self, $w, $h) = @_;
3036 3300
3037 for my $child ($self->children) { 3301 for my $child ($self->children) {
3038 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3302 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3039 3303
3040 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3304 $X = $child->{force_x} if exists $child->{force_x};
3041 if exists $child->{req_x}; 3305 $Y = $child->{force_y} if exists $child->{force_y};
3042 3306
3043 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3307 $X = _to_pixel $X, $W, $self->{w};
3044 if exists $child->{req_y}; 3308 $Y = _to_pixel $Y, $H, $self->{h};
3045
3046 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3047
3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050 3309
3051 $child->configure ($X, $Y, $W, $H); 3310 $child->configure ($X, $Y, $W, $H);
3052 } 3311 }
3053} 3312}
3054 3313
… …
3071} 3330}
3072 3331
3073sub add { 3332sub add {
3074 my ($self, @children) = @_; 3333 my ($self, @children) = @_;
3075 3334
3076 for my $child (@children) {
3077 $child->{is_toplevel} = 1; 3335 $_->{is_toplevel} = 1
3078 3336 for @children;
3079 # integerise window positions
3080 $child->{x} = int $child->{x};
3081 $child->{y} = int $child->{y};
3082 }
3083 3337
3084 $self->SUPER::add (@children); 3338 $self->SUPER::add (@children);
3085} 3339}
3086 3340
3087sub remove { 3341sub remove {
3088 my ($self, @children) = @_; 3342 my ($self, @children) = @_;
3089 3343
3090 $self->SUPER::remove (@children); 3344 $self->SUPER::remove (@children);
3345
3346 delete $self->{is_toplevel}
3347 for @children;
3091 3348
3092 while (@children) { 3349 while (@children) {
3093 my $w = pop @children; 3350 my $w = pop @children;
3094 push @children, $w->children; 3351 push @children, $w->children;
3095 $w->set_invisible; 3352 $w->set_invisible;
… …
3121 3378
3122 while () { 3379 while () {
3123 if ($self->{realloc}) { 3380 if ($self->{realloc}) {
3124 #TODO use array-of-depth approach 3381 #TODO use array-of-depth approach
3125 3382
3383 use sort 'stable';
3384
3126 @queue = sort { $a->{visible} <=> $b->{visible} } 3385 @queue = sort { $a->{visible} <=> $b->{visible} }
3127 @queue, values %{delete $self->{realloc}}; 3386 @queue, values %{delete $self->{realloc}};
3128 } 3387 }
3129 3388
3130 my $widget = pop @queue || last; 3389 my $widget = pop @queue || last;
3131 3390
3132 $widget->{visible} or last; # do not resize invisible widgets 3391 $widget->{visible} or last; # do not resize invisible widgets
3133 3392
3134 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3135 ? @$widget{qw(def_w def_h)}
3136 : $widget->size_request; 3393 my ($w, $h) = $widget->size_request;
3137 3394
3138 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3395 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3396 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3397
3398 $w = $widget->{force_w} if exists $widget->{force_w};
3399 $h = $widget->{force_h} if exists $widget->{force_h};
3400
3401 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3402 || delete $widget->{force_realloc}) {
3403 $widget->{req_w} = $w;
3404 $widget->{req_h} = $h;
3405
3406 $self->{size_alloc}{$widget+0} = $widget;
3407
3408 if (my $parent = $widget->{parent}) {
3409 $self->{realloc}{$parent+0} = $parent;
3410 #unshift @queue, $parent;
3411 $parent->{force_size_alloc} = 1;
3412 $self->{size_alloc}{$parent+0} = $parent;
3139 3413 }
3140 $widget->{req_w} = $w; 3414 }
3141 $widget->{req_h} = $h;
3142 3415
3143 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3416 delete $self->{realloc}{$widget+0};
3144
3145 push @queue, $widget->{parent}
3146 if $widget->{parent};
3147 } 3417 }
3148 } 3418 }
3149 3419
3150 while (my $size_alloc = delete $self->{size_alloc}) { 3420 while (my $size_alloc = delete $self->{size_alloc}) {
3151 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3421 my @queue = sort { $b->{visible} <=> $a->{visible} }
3152 values %$size_alloc; 3422 values %$size_alloc;
3153 3423
3154 while () { 3424 while () {
3155 my ($widget, $w, $h) = @{ pop @queue or last }; 3425 my $widget = pop @queue || last;
3426
3427 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3156 3428
3157 $w = 0 if $w < 0; 3429 $w = 0 if $w < 0;
3158 $h = 0 if $h < 0; 3430 $h = 0 if $h < 0;
3159 3431
3160 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3432 $w = int $w + 0.5;
3433 $h = int $h + 0.5;
3161 3434
3435 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3162 $widget->{w} = $w; 3436 $widget->{w} = $w;
3163 $widget->{h} = $h; 3437 $widget->{h} = $h;
3164 3438
3165 $widget->emit (size_allocate => $w, $h, $changed); 3439 $widget->emit (size_allocate => $w, $h);
3440 }
3166 } 3441 }
3167 } 3442 }
3168 3443
3169 while ($self->{post_alloc_hook}) { 3444 while ($self->{post_alloc_hook}) {
3170 $_->() 3445 $_->()
3171 for values %{delete $self->{post_alloc_hook}}; 3446 for values %{delete $self->{post_alloc_hook}};
3172 } 3447 }
3448
3173 3449
3174 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3450 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3175 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3451 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3176 glClear GL_COLOR_BUFFER_BIT; 3452 glClear GL_COLOR_BUFFER_BIT;
3177 3453

Diff Legend

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