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.266 by root, Thu Jun 1 03:42:58 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 {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
40 if (!$GRAB) { 47 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
45 $TOOLTIP->hide; 51 $TOOLTIP->hide;
46 52
47 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
48 54
… …
165sub rescale_widgets { 171sub rescale_widgets {
166 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
167 173
168 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
169 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
170 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $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}; 180 $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}; 181 $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}; 182 $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}; 183 $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}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
176 } 189 }
177 } 190 }
178 191
179 reconfigure_widgets; 192 reconfigure_widgets;
180} 193}
… …
189 202
190sub new { 203sub new {
191 my $class = shift; 204 my $class = shift;
192 205
193 my $self = bless { 206 my $self = bless {
194 x => 0, 207 x => "center",
195 y => 0, 208 y => "center",
196 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
197 can_events => 1, 212 can_events => 1,
198 @_ 213 @_
199 }, $class; 214 }, $class;
215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
200 217
201 for (keys %$self) { 218 for (keys %$self) {
202 if (/^on_(.*)$/) { 219 if (/^on_(.*)$/) {
203 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
204 } 221 }
205 } 222 }
206 223
207 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
208
209 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
210 $self->{req_x} = $layout->{x} * $::WIDTH; 225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
211 $self->{req_y} = $layout->{y} * $::HEIGHT; 226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
212 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 227 $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; 228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
214 } 234 }
215 235
216 $self 236 $self
217} 237}
218 238
… …
227 my ($self) = @_; 247 my ($self) = @_;
228 248
229 return if $self->{parent}; 249 return if $self->{parent};
230 250
231 $CFClient::UI::ROOT->add ($self); 251 $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} 252}
245 253
246sub set_visible { 254sub set_visible {
247 my ($self) = @_; 255 my ($self) = @_;
248 256
… …
303 311
304 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
305 if $self->{parent}; 313 if $self->{parent};
306} 314}
307 315
308sub move { 316sub move_abs {
309 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
310 318
311 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
312 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
313 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
314 322
315 $self->update; 323 $self->update;
316} 324}
317 325
318sub set_size { 326sub set_size {
319 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
320 328
321 $self->{def_w} = $w; 329 $self->{force_w} = $w;
322 $self->{def_h} = $h; 330 $self->{force_h} = $h;
323 331
324 $self->realloc; 332 $self->realloc;
325} 333}
326 334
327sub size_request { 335sub size_request {
… …
331 339
332sub configure { 340sub configure {
333 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
334 342
335 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
336 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
337 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
338 348
339 # use alignment to adjust x, y 349 # use alignment to adjust x, y
340 350
341 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
342 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
343
344 ($w, $h) = ($w2, $h2);
345 } 353 }
346 354
347 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
348 $self->{x} = $x; 356 $self->{x} = $x;
349 $self->{y} = $y; 357 $self->{y} = $y;
350 $self->update; 358 $self->update;
351 } 359 }
352 360
353 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
354 return unless $self->{visible}; 362 return unless $self->{visible};
355 363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 367 $self->{root}{size_alloc}{$self+0} = $self;
357 } 368 }
358} 369}
359 370
360sub size_allocate { 371sub size_allocate {
361 # nothing to be done 372 # nothing to be done
… …
461 472
462sub set_parent { 473sub set_parent {
463 my ($self, $parent) = @_; 474 my ($self, $parent) = @_;
464 475
465 Scalar::Util::weaken ($self->{parent} = $parent); 476 Scalar::Util::weaken ($self->{parent} = $parent);
466
467 $self->set_visible if $parent->{visible}; 477 $self->set_visible if $parent->{visible};
468} 478}
469 479
470sub connect { 480sub connect {
471 my ($self, $signal, $cb) = @_; 481 my ($self, $signal, $cb) = @_;
… …
492 502
493sub realloc { 503sub realloc {
494 my ($self) = @_; 504 my ($self) = @_;
495 505
496 if ($self->{visible}) { 506 if ($self->{visible}) {
497 return if $self->{root}{realloc}{$self}; 507 return if $self->{root}{realloc}{$self+0};
498 508
499 $self->{root}{realloc}{$self} = $self; 509 $self->{root}{realloc}{$self+0} = $self;
500 $self->{root}->update; 510 $self->{root}->update;
501 } else { 511 } else {
502 delete $self->{req_w}; 512 delete $self->{req_w};
513 delete $self->{req_h};
503 } 514 }
504} 515}
505 516
506sub update { 517sub update {
507 my ($self) = @_; 518 my ($self) = @_;
508 519
509 $self->{parent}->update 520 $self->{parent}->update
510 if $self->{parent}; 521 if $self->{parent};
522}
523
524sub reconfigure {
525 my ($self) = @_;
526
527 $self->realloc;
528 $self->update;
511} 529}
512 530
513sub draw { 531sub draw {
514 my ($self) = @_; 532 my ($self) = @_;
515 533
… …
533 glVertex $x , $y + $self->{h}; 551 glVertex $x , $y + $self->{h};
534 glEnd; 552 glEnd;
535 glDisable GL_BLEND; 553 glDisable GL_BLEND;
536 } 554 }
537 555
538 if ($ENV{PCLIENT_DEBUG}) { 556 if ($ENV{CFPLUS_DEBUG} & 1) {
539 glPushMatrix; 557 glPushMatrix;
540 glColor 1, 1, 0, 1; 558 glColor 1, 1, 0, 1;
541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 559 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
542 glBegin GL_LINE_LOOP; 560 glBegin GL_LINE_LOOP;
543 glVertex 0 , 0; 561 glVertex 0 , 0;
… …
619 my ($class, %arg) = @_; 637 my ($class, %arg) = @_;
620 $class->SUPER::new (can_events => 0, %arg); 638 $class->SUPER::new (can_events => 0, %arg);
621} 639}
622 640
623sub size_request { 641sub size_request {
624 (0, 0) 642 my ($self) = @_;
643
644 ($self->{w} + 0, $self->{h} + 0)
625} 645}
626 646
627sub draw { } 647sub draw { }
628 648
629############################################################################# 649#############################################################################
… …
750sub size_request { 770sub size_request {
751 $_[0]{children}[0]->size_request 771 $_[0]{children}[0]->size_request
752} 772}
753 773
754sub size_allocate { 774sub size_allocate {
755 my ($self, $w, $h, $changed) = @_; 775 my ($self, $w, $h) = @_;
756 776
757 $self->{children}[0]->configure (0, 0, $w, $h); 777 $self->{children}[0]->configure (0, 0, $w, $h);
758} 778}
759 779
760############################################################################# 780#############################################################################
… …
777 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 797 $ROOT->on_post_alloc ($self => sub { $self->render_child });
778 $self->SUPER::update; 798 $self->SUPER::update;
779} 799}
780 800
781sub size_allocate { 801sub size_allocate {
782 my ($self, $w, $h, $changed) = @_; 802 my ($self, $w, $h) = @_;
783 803
784 $self->SUPER::size_allocate ($w, $h, $changed); 804 $self->SUPER::size_allocate ($w, $h);
785 $self->update 805 $self->update;
786 if $changed;
787} 806}
788 807
789sub _render { 808sub _render {
790 $_[0]{children}[0]->draw; 809 $_[0]{children}[0]->draw;
791} 810}
… …
835} 854}
836 855
837sub size_request { 856sub size_request {
838 my ($self) = @_; 857 my ($self) = @_;
839 858
840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 859 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 860
842 $w = 10 if $self->{scroll_x}; 861 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y}; 862 $h = 10 if $self->{scroll_y};
844 863
845 ($w, $h) 864 ($w, $h)
846} 865}
847 866
848sub size_allocate { 867sub size_allocate {
849 my ($self, $w, $h, $changed) = @_; 868 my ($self, $w, $h) = @_;
850 869
870 my $child = $self->child;
871
851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 872 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 873 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853 874
854 $self->child->configure (0, 0, $w, $h); 875 $self->child->configure (0, 0, $w, $h);
855 $self->update; 876 $self->update;
856} 877}
857 878
… …
941 my $child = $self->{vp}->child; 962 my $child = $self->{vp}->child;
942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 963 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943} 964}
944 965
945sub size_allocate { 966sub size_allocate {
946 my ($self, $w, $h, $changed) = @_; 967 my ($self, $w, $h) = @_;
947 968
948 $self->SUPER::size_allocate ($w, $h, $changed); 969 $self->SUPER::size_allocate ($w, $h);
949 970
950 my $child = $self->{vp}->child; 971 my $child = $self->{vp}->child;
951 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 972 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
952} 973}
953 974
… …
1000 1021
1001our @ISA = CFClient::UI::Bin::; 1022our @ISA = CFClient::UI::Bin::;
1002 1023
1003use CFClient::OpenGL; 1024use CFClient::OpenGL;
1004 1025
1005my @tex = 1026my $bg =
1027 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1028 mipmap => 1, wrap => 1;
1029
1030my @border =
1006 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1031 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); 1032 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1008 1033
1009sub new { 1034sub new {
1010 my $class = shift; 1035 my $class = shift;
1011 1036
1012 my $self = $class->SUPER::new ( 1037 my $self = $class->SUPER::new (
1013 bg => [1, 1, 1, 1], 1038 bg => [1, 1, 1, 1],
1014 border_bg => [1, 1, 1, 1], 1039 border_bg => [1, 1, 1, 1],
1015 border => 0.6, 1040 border => 0.6,
1016 is_toplevel => 1,
1017 can_events => 1, 1041 can_events => 1,
1042 min_w => 16,
1043 min_h => 16,
1018 @_ 1044 @_
1019 ); 1045 );
1020 1046
1021 $self->{title} &&= new CFClient::UI::Label 1047 $self->{title} &&= new CFClient::UI::Label
1022 align => 0, 1048 align => 0,
… …
1041 $h + $self->border * 2, 1067 $h + $self->border * 2,
1042 ) 1068 )
1043} 1069}
1044 1070
1045sub size_allocate { 1071sub size_allocate {
1046 my ($self, $w, $h, $changed) = @_; 1072 my ($self, $w, $h) = @_;
1047
1048 return unless $changed;
1049 1073
1050 $h -= List::Util::max 0, $self->border * 2; 1074 $h -= List::Util::max 0, $self->border * 2;
1051 $w -= List::Util::max 0, $self->border * 2; 1075 $w -= List::Util::max 0, $self->border * 2;
1052 1076
1053 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1077 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1077 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
1078 1102
1079 my $dx = $ev->{x} - $ox; 1103 my $dx = $ev->{x} - $ox;
1080 my $dy = $ev->{y} - $oy; 1104 my $dy = $ev->{y} - $oy;
1081 1105
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1106 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1107 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1086 $self->move ($self->{user_x}, $self->{user_y}); 1108
1087 $self->realloc; 1109 $self->realloc;
1110 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1088 }; 1111 };
1089 1112
1090 } elsif ($lr ^ $td) { 1113 } elsif ($lr ^ $td) {
1091 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1114 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1092 my ($bx, $by) = ($self->{x}, $self->{y}); 1115 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1094 $self->{motion} = sub { 1117 $self->{motion} = sub {
1095 my ($ev, $x, $y) = @_; 1118 my ($ev, $x, $y) = @_;
1096 1119
1097 ($x, $y) = ($ev->{x}, $ev->{y}); 1120 ($x, $y) = ($ev->{x}, $ev->{y});
1098 1121
1099 $self->{user_x} = $bx + $x - $ox; 1122 $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 }; 1123 };
1105 } 1124 }
1106} 1125}
1107 1126
1108sub button_up { 1127sub button_up {
… …
1127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1128 1147
1129 my $border = $self->border; 1148 my $border = $self->border;
1130 1149
1131 glColor @{ $self->{border_bg} }; 1150 glColor @{ $self->{border_bg} };
1132 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1151 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1133 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1152 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1134 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1153 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1135 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1154 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1136 1155
1137 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1156 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1138 my $bg = $tex[0]; 1157 glColor @{ $self->{bg} };
1139 1158
1140 # TODO: repeat texture not scale 1159 # TODO: repeat texture not scale
1160 # solve this better(?)
1141 my $rep_x = $cw / $bg->{w}; 1161 $bg->{s} = $cw / $bg->{w};
1142 my $rep_y = $ch / $bg->{h}; 1162 $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); 1163 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1150 } 1164 }
1151 1165
1152 glDisable GL_TEXTURE_2D; 1166 glDisable GL_TEXTURE_2D;
1153 1167
… …
1235 (sum @$hs), 1249 (sum @$hs),
1236 ) 1250 )
1237} 1251}
1238 1252
1239sub size_allocate { 1253sub size_allocate {
1240 my ($self, $w, $h, $changed) = @_; 1254 my ($self, $w, $h) = @_;
1241 1255
1242 my ($ws, $hs) = $self->get_wh; 1256 my ($ws, $hs) = $self->get_wh;
1243 1257
1244 my $req_w = (sum @$ws) || 1; 1258 my $req_w = (sum @$ws) || 1;
1245 my $req_h = (sum @$hs) || 1; 1259 my $req_h = (sum @$hs) || 1;
… …
1323 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1337 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1324 ) 1338 )
1325} 1339}
1326 1340
1327sub size_allocate { 1341sub size_allocate {
1328 my ($self, $w, $h, $changed) = @_; 1342 my ($self, $w, $h) = @_;
1329 1343
1330 my $space = $self->{vertical} ? $h : $w; 1344 my $space = $self->{vertical} ? $h : $w;
1331 my $children = $self->{children}; 1345 my $children = $self->{children};
1332 1346
1333 my @req; 1347 my @req;
… …
1416 ellipsise => 3, # end 1430 ellipsise => 3, # end
1417 layout => (new CFClient::Layout), 1431 layout => (new CFClient::Layout),
1418 fontsize => 1, 1432 fontsize => 1,
1419 align => -1, 1433 align => -1,
1420 valign => -1, 1434 valign => -1,
1421 padding => 2, 1435 padding_x => 2,
1436 padding_y => 2,
1422 can_events => 0, 1437 can_events => 0,
1423 %arg 1438 %arg
1424 ); 1439 );
1425 1440
1426 if (exists $self->{template}) { 1441 if (exists $self->{template}) {
… …
1502 1517
1503 $w = List::Util::max $w, $w2; 1518 $w = List::Util::max $w, $w2;
1504 $h = List::Util::max $h, $h2; 1519 $h = List::Util::max $h, $h2;
1505 } 1520 }
1506 1521
1507 ( 1522 ($w, $h)
1508 $w + $self->{padding} * 2,
1509 $h + $self->{padding} * 2,
1510 )
1511} 1523}
1512 1524
1513sub size_allocate { 1525sub size_allocate {
1514 my ($self, $w, $h, $changed) = @_; 1526 my ($self, $w, $h) = @_;
1515 1527
1516 delete $self->{texture} 1528 delete $self->{texture}
1517 if $changed; 1529 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1518} 1530}
1519 1531
1520sub set_fontsize { 1532sub set_fontsize {
1521 my ($self, $fontsize) = @_; 1533 my ($self, $fontsize) = @_;
1522 1534
… …
1539 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1551 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1540 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1552 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1541 1553
1542 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1554 my $tex = new_from_layout CFClient::Texture $self->{layout};
1543 1555
1544 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1556 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1545 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1557 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1546 : ($self->{w} - $tex->{w}) * 0.5); 1558 : ($self->{w} - $tex->{w}) * 0.5);
1547 1559
1548 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1560 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1549 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1561 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1550 : ($self->{h} - $tex->{h}) * 0.5); 1562 : ($self->{h} - $tex->{h}) * 0.5);
1551 1563
1552 $tex 1564 $tex
1553 }; 1565 };
1554 1566
… …
1793 1805
1794sub new { 1806sub new {
1795 my $class = shift; 1807 my $class = shift;
1796 1808
1797 $class->SUPER::new ( 1809 $class->SUPER::new (
1798 padding => 4, 1810 padding_x => 4,
1811 padding_y => 4,
1799 fg => [1, 1, 1], 1812 fg => [1, 1, 1],
1800 active_fg => [0, 0, 1], 1813 active_fg => [0, 0, 1],
1801 can_hover => 1, 1814 can_hover => 1,
1802 align => 0, 1815 align => 0,
1803 valign => 0, 1816 valign => 0,
… …
1850 1863
1851sub new { 1864sub new {
1852 my $class = shift; 1865 my $class = shift;
1853 1866
1854 $class->SUPER::new ( 1867 $class->SUPER::new (
1855 padding => 2, 1868 padding_x => 2,
1869 padding_y => 2,
1856 fg => [1, 1, 1], 1870 fg => [1, 1, 1],
1857 active_fg => [1, 1, 0], 1871 active_fg => [1, 1, 0],
1858 bg => [0, 0, 0, 0.2], 1872 bg => [0, 0, 0, 0.2],
1859 active_bg => [1, 1, 1, 0.5], 1873 active_bg => [1, 1, 1, 0.5],
1860 state => 0, 1874 state => 0,
… …
1864} 1878}
1865 1879
1866sub size_request { 1880sub size_request {
1867 my ($self) = @_; 1881 my ($self) = @_;
1868 1882
1869 ($self->{padding} * 2 + 6) x 2 1883 (6) x 2
1870} 1884}
1871 1885
1872sub button_down { 1886sub button_down {
1873 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1874 1888
1875 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1889 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1876 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1890 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1877 $self->{state} = !$self->{state}; 1891 $self->{state} = !$self->{state};
1878 $self->_emit (changed => $self->{state}); 1892 $self->_emit (changed => $self->{state});
1879 } 1893 }
1880} 1894}
1881 1895
1882sub _draw { 1896sub _draw {
1883 my ($self) = @_; 1897 my ($self) = @_;
1884 1898
1885 $self->SUPER::_draw; 1899 $self->SUPER::_draw;
1886 1900
1887 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1901 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1888 1902
1889 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1903 my ($w, $h) = @$self{qw(w h)};
1904
1905 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1890 1906
1891 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1907 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1892 1908
1893 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1909 my $tex = $self->{state} ? $tex[1] : $tex[0];
1894 1910
… …
2159 fg => [1, 1, 1], 2175 fg => [1, 1, 1],
2160 active_fg => [0, 0, 0], 2176 active_fg => [0, 0, 0],
2161 bg => [0, 0, 0, 0.2], 2177 bg => [0, 0, 0, 0.2],
2162 active_bg => [1, 1, 1, 0.5], 2178 active_bg => [1, 1, 1, 0.5],
2163 range => [0, 0, 100, 10, 0], 2179 range => [0, 0, 100, 10, 0],
2164 req_w => $::WIDTH / 80, 2180 min_w => $::WIDTH / 80,
2165 req_h => $::WIDTH / 80, 2181 min_h => $::WIDTH / 80,
2166 vertical => 0, 2182 vertical => 0,
2167 can_hover => 1, 2183 can_hover => 1,
2168 inner_pad => 0.02, 2184 inner_pad => 0.02,
2169 @_ 2185 @_
2170 ); 2186 );
… …
2210} 2226}
2211 2227
2212sub size_request { 2228sub size_request {
2213 my ($self) = @_; 2229 my ($self) = @_;
2214 2230
2215 my $w = $self->{req_w}; 2231 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2232}
2220 2233
2221sub button_down { 2234sub button_down {
2222 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
2223 2236
… …
2373 $self->{fontsize} = $fontsize; 2386 $self->{fontsize} = $fontsize;
2374 $self->reflow; 2387 $self->reflow;
2375} 2388}
2376 2389
2377sub size_allocate { 2390sub size_allocate {
2378 my ($self, $w, $h, $changed) = @_; 2391 my ($self, $w, $h) = @_;
2379 2392
2380 $self->SUPER::size_allocate ($w, $h, $changed); 2393 $self->SUPER::size_allocate ($w, $h);
2381
2382 return unless $changed;
2383 2394
2384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2395 $self->{layout}->set_font ($self->{font}) if $self->{font};
2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2396 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2386 $self->{layout}->set_width ($self->{children}[0]{w}); 2397 $self->{layout}->set_width ($self->{children}[0]{w});
2387 2398
… …
2610} 2621}
2611 2622
2612sub set_tooltip_from { 2623sub set_tooltip_from {
2613 my ($self, $widget) = @_; 2624 my ($self, $widget) = @_;
2614 2625
2626 my $tooltip = $widget->{tooltip};
2627
2628 if ($ENV{CFPLUS_DEBUG} & 2) {
2629 $tooltip .= "\n\n" . (ref $widget) . "\n"
2630 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2631 . "req $widget->{req_w} $widget->{req_h}\n"
2632 . "visible $widget->{visible}";
2633 }
2634
2615 $self->add (new CFClient::UI::Label 2635 $self->add (new CFClient::UI::Label
2616 markup => $widget->{tooltip}, 2636 markup => $tooltip,
2617 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2637 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2618 fontsize => 0.8, 2638 fontsize => 0.8,
2619 fg => [0, 0, 0, 1], 2639 fg => [0, 0, 0, 1],
2620 ellipsise => 0, 2640 ellipsise => 0,
2621 font => ($widget->{tooltip_font} || $::FONT_PROP), 2641 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2629 2649
2630 ($w + 4, $h + 4) 2650 ($w + 4, $h + 4)
2631} 2651}
2632 2652
2633sub size_allocate { 2653sub size_allocate {
2634 my ($self, $w, $h, $changed) = @_; 2654 my ($self, $w, $h) = @_;
2635 2655
2636 return unless $changed;
2637
2638 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2656 $self->SUPER::size_allocate ($w - 4, $h - 4);
2639} 2657}
2640 2658
2641sub visibility_change { 2659sub visibility_change {
2642 my ($self, $visible) = @_; 2660 my ($self, $visible) = @_;
2643 2661
… …
2650 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2668 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2651 2669
2652 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2670 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2653 if $x + $self->{w} > $::WIDTH; 2671 if $x + $self->{w} > $::WIDTH;
2654 2672
2655 $self->move ($x, $y); 2673 $self->move_abs ($x, $y);
2656 }); 2674 });
2657} 2675}
2658 2676
2659sub _draw { 2677sub _draw {
2660 my ($self) = @_; 2678 my ($self) = @_;
… …
2764 $self->SUPER::DESTROY; 2782 $self->SUPER::DESTROY;
2765} 2783}
2766 2784
2767############################################################################# 2785#############################################################################
2768 2786
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; 2787package CFClient::UI::Menu;
2812 2788
2813our @ISA = CFClient::UI::FancyFrame::; 2789our @ISA = CFClient::UI::FancyFrame::;
2814 2790
2815use CFClient::OpenGL; 2791use CFClient::OpenGL;
… …
2853 # maybe save $GRAB? must be careful about events... 2829 # maybe save $GRAB? must be careful about events...
2854 $GRAB = $self; 2830 $GRAB = $self;
2855 $self->{button} = $ev->{button}; 2831 $self->{button} = $ev->{button};
2856 2832
2857 $self->show; 2833 $self->show;
2858 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2834 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2859} 2835}
2860 2836
2861sub mouse_motion { 2837sub mouse_motion {
2862 my ($self, $ev, $x, $y) = @_; 2838 my ($self, $ev, $x, $y) = @_;
2863 2839
… …
2988 $self->SUPER::reconfigure; 2964 $self->SUPER::reconfigure;
2989} 2965}
2990 2966
2991############################################################################# 2967#############################################################################
2992 2968
2969package CFClient::UI::Inventory;
2970
2971our @ISA = CFClient::UI::ScrolledWindow::;
2972
2973sub new {
2974 my $class = shift;
2975
2976 my $self = $class->SUPER::new (
2977 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2978 @_,
2979 );
2980
2981 $self
2982}
2983
2984sub set_items {
2985 my ($self, $items) = @_;
2986
2987 $self->{scrolled}->clear;
2988 return unless $items;
2989
2990 my @items = sort {
2991 ($a->{type} <=> $b->{type})
2992 or ($a->{name} cmp $b->{name})
2993 } @$items;
2994
2995 $self->{real_items} = \@items;
2996
2997 my $row = 0;
2998 for my $item (@items) {
2999 CFClient::Item::update_widgets $item;
3000
3001 $self->{scrolled}->add (0, $row, $item->{face_widget});
3002 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3003 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3004
3005 $row++;
3006 }
3007}
3008
3009#############################################################################
3010
3011package CFClient::UI::BindEditor;
3012
3013our @ISA = CFClient::UI::FancyFrame::;
3014
3015sub new {
3016 my $class = shift;
3017
3018 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3019
3020 $self->add (my $vb = new CFClient::UI::VBox);
3021
3022
3023 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3024 text => "start recording",
3025 tooltip => "Start/Stops recording of actions."
3026 ."All subsequent actions after the recording started will be captured."
3027 ."The actions are displayed after the record was stopped."
3028 ."To bind the action you have to click on the 'Bind' button",
3029 on_activate => sub {
3030 unless ($self->{recording}) {
3031 $self->start;
3032 } else {
3033 $self->stop;
3034 }
3035 });
3036
3037 $vb->add (new CFClient::UI::Label text => "Actions:");
3038 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3039
3040 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3041 $vb->add (my $hb = new CFClient::UI::HBox);
3042 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3043 $hb->add (new CFClient::UI::Button
3044 text => "bind",
3045 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3046 on_activate => sub {
3047 $self->ask_for_bind;
3048 });
3049
3050 $vb->add (my $hb = new CFClient::UI::HBox);
3051 $hb->add (new CFClient::UI::Button
3052 text => "ok",
3053 expand => 1,
3054 tooltip => "This closes the binding editor and saves the binding",
3055 on_activate => sub {
3056 $self->hide;
3057 $self->commit;
3058 });
3059
3060 $hb->add (new CFClient::UI::Button
3061 text => "cancel",
3062 expand => 1,
3063 tooltip => "This closes the binding editor without saving",
3064 on_activate => sub {
3065 $self->hide;
3066 $self->{binding_cancel}->()
3067 if $self->{binding_cancel};
3068 });
3069
3070 $self->update_binding_widgets;
3071
3072 $self
3073}
3074
3075sub commit {
3076 my ($self) = @_;
3077 my ($mod, $sym, $cmds) = $self->get_binding;
3078 if ($sym != 0 && @$cmds > 0) {
3079 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3080 ."'. Don't forget 'Save Config'!");
3081 $self->{binding_change}->($mod, $sym, $cmds)
3082 if $self->{binding_change};
3083 } else {
3084 $::STATUSBOX->add ("No action bound, no key or action specified!");
3085 $self->{binding_cancel}->()
3086 if $self->{binding_cancel};
3087 }
3088}
3089
3090sub start {
3091 my ($self) = @_;
3092
3093 $self->{rec_btn}->set_text ("stop recording");
3094 $self->{recording} = 1;
3095 $self->clear_command_list;
3096 $::CONN->start_record if $::CONN;
3097}
3098
3099sub stop {
3100 my ($self) = @_;
3101
3102 $self->{rec_btn}->set_text ("start recording");
3103 $self->{recording} = 0;
3104
3105 my $rec;
3106 $rec = $::CONN->stop_record if $::CONN;
3107 return unless ref $rec eq 'ARRAY';
3108 $self->set_command_list ($rec);
3109}
3110
3111# if $commit is true, the binding will be set after the user entered a key combo
3112sub ask_for_bind {
3113 my ($self, $commit) = @_;
3114
3115 CFClient::Binder::open_binding_dialog (sub {
3116 my ($mod, $sym) = @_;
3117 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3118 $self->update_binding_widgets;
3119 $self->commit if $commit;
3120 });
3121}
3122
3123# $mod and $sym are the modifiers and key symbol
3124# $cmds is a array ref of strings (the commands)
3125# $cb is the callback that is executed on OK
3126# $ccb is the callback that is executed on CANCEL and
3127# when the binding was unsuccessful on OK
3128sub set_binding {
3129 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3130
3131 $self->clear_command_list;
3132 $self->{recording} = 0;
3133 $self->{rec_btn}->set_text ("start recording");
3134
3135 $self->{binding} = [$mod, $sym];
3136 $self->{commands} = $cmds;
3137
3138 $self->{binding_change} = $cb;
3139 $self->{binding_cancel} = $ccb;
3140
3141 $self->update_binding_widgets;
3142}
3143
3144# this is a shortcut method that asks for a binding
3145# and then just binds it.
3146sub do_quick_binding {
3147 my ($self, $cmds) = @_;
3148 $self->set_binding (undef, undef, $cmds, sub {
3149 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3150 });
3151 $self->ask_for_bind (1);
3152}
3153
3154sub update_binding_widgets {
3155 my ($self) = @_;
3156 my ($mod, $sym, $cmds) = $self->get_binding;
3157 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3158 $self->set_command_list ($cmds);
3159}
3160
3161sub get_binding {
3162 my ($self) = @_;
3163 return (
3164 $self->{binding}->[0],
3165 $self->{binding}->[1],
3166 [ grep { defined $_ } @{$self->{commands}} ]
3167 );
3168}
3169
3170sub clear_command_list {
3171 my ($self) = @_;
3172 $self->{cmdbox}->clear ();
3173}
3174
3175sub set_command_list {
3176 my ($self, $cmds) = @_;
3177
3178 $self->{cmdbox}->clear ();
3179 $self->{commands} = $cmds;
3180
3181 my $idx = 0;
3182
3183 for (@$cmds) {
3184 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3185
3186 my $i = $idx;
3187 $hb->add (new CFClient::UI::Label text => $_);
3188 $hb->add (new CFClient::UI::Button
3189 text => "delete",
3190 tooltip => "Deletes the action from the record",
3191 on_activate => sub {
3192 $self->{cmdbox}->remove ($hb);
3193 $cmds->[$i] = undef;
3194 });
3195
3196
3197 $idx++
3198 }
3199}
3200
3201#############################################################################
3202
3203package CFClient::UI::SpellList;
3204
3205our @ISA = CFClient::UI::FancyFrame::;
3206
3207sub new {
3208 my $class = shift;
3209
3210 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3211
3212 $self->add (new CFClient::UI::ScrolledWindow
3213 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3214
3215 $self;
3216}
3217
3218# XXX: Do sorting? Argl...
3219sub add_spell {
3220 my ($self, $spell) = @_;
3221 $self->{spells}->{$spell->{name}} = $spell;
3222
3223 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3224 face => $spell->{face},
3225 can_hover => 1,
3226 can_events => 1,
3227 tooltip => $spell->{message});
3228
3229 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3230 text => $spell->{name},
3231 can_hover => 1,
3232 can_events => 1,
3233 tooltip => $spell->{message},
3234 expand => 1);
3235
3236 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3237 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3238 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3239 expand => 1);
3240
3241 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3242 text => "bind to key",
3243 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3244}
3245
3246sub rebuild_spell_list {
3247 my ($self) = @_;
3248 $self->{tbl_idx} = 0;
3249 $self->add_spell ($_) for values %{$self->{spells}};
3250}
3251
3252sub remove_spell {
3253 my ($self, $spell) = @_;
3254 delete $self->{spells}->{$spell->{name}};
3255 $self->rebuild_spell_list;
3256}
3257
3258#############################################################################
3259
2993package CFClient::UI::Root; 3260package CFClient::UI::Root;
2994 3261
2995our @ISA = CFClient::UI::Container::; 3262our @ISA = CFClient::UI::Container::;
2996 3263
2997use CFClient::OpenGL; 3264use CFClient::OpenGL;
… …
3007 Scalar::Util::weaken ($self->{root} = $self); 3274 Scalar::Util::weaken ($self->{root} = $self);
3008 3275
3009 $self 3276 $self
3010} 3277}
3011 3278
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 { 3279sub size_request {
3029 my ($self) = @_; 3280 my ($self) = @_;
3030 3281
3031 ($self->{w}, $self->{h}) 3282 ($self->{w}, $self->{h})
3032} 3283}
3033 3284
3285sub _to_pixel {
3286 my ($coord, $size, $max) = @_;
3287
3288 $coord =
3289 $coord eq "center" ? ($max - $size) * 0.5
3290 : $coord eq "max" ? $max
3291 : $coord;
3292
3293 $coord = 0 if $coord < 0;
3294 $coord = $max - $size if $coord > $max - $size;
3295
3296 int $coord + 0.5
3297}
3298
3034sub size_allocate { 3299sub size_allocate {
3035 my ($self, $w, $h, $changed) = @_; 3300 my ($self, $w, $h) = @_;
3036 3301
3037 for my $child ($self->children) { 3302 for my $child ($self->children) {
3038 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3303 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3039 3304
3040 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3305 $X = $child->{force_x} if exists $child->{force_x};
3041 if exists $child->{req_x}; 3306 $Y = $child->{force_y} if exists $child->{force_y};
3042 3307
3043 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3308 $X = _to_pixel $X, $W, $self->{w};
3044 if exists $child->{req_y}; 3309 $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 3310
3051 $child->configure ($X, $Y, $W, $H); 3311 $child->configure ($X, $Y, $W, $H);
3052 } 3312 }
3053} 3313}
3054 3314
… …
3071} 3331}
3072 3332
3073sub add { 3333sub add {
3074 my ($self, @children) = @_; 3334 my ($self, @children) = @_;
3075 3335
3076 for my $child (@children) {
3077 $child->{is_toplevel} = 1; 3336 $_->{is_toplevel} = 1
3078 3337 for @children;
3079 # integerise window positions
3080 $child->{x} = int $child->{x};
3081 $child->{y} = int $child->{y};
3082 }
3083 3338
3084 $self->SUPER::add (@children); 3339 $self->SUPER::add (@children);
3085} 3340}
3086 3341
3087sub remove { 3342sub remove {
3088 my ($self, @children) = @_; 3343 my ($self, @children) = @_;
3089 3344
3090 $self->SUPER::remove (@children); 3345 $self->SUPER::remove (@children);
3346
3347 delete $self->{is_toplevel}
3348 for @children;
3091 3349
3092 while (@children) { 3350 while (@children) {
3093 my $w = pop @children; 3351 my $w = pop @children;
3094 push @children, $w->children; 3352 push @children, $w->children;
3095 $w->set_invisible; 3353 $w->set_invisible;
… …
3115 $_->() 3373 $_->()
3116 for values %{delete $self->{refresh_hook}}; 3374 for values %{delete $self->{refresh_hook}};
3117 } 3375 }
3118 3376
3119 if ($self->{realloc}) { 3377 if ($self->{realloc}) {
3378 my %queue;
3120 my @queue; 3379 my @queue;
3380 my $widget;
3121 3381
3382 outer:
3122 while () { 3383 while () {
3123 if ($self->{realloc}) { 3384 if (my $realloc = delete $self->{realloc}) {
3124 #TODO use array-of-depth approach 3385 for $widget (values %$realloc) {
3386 $widget->{visible} or next; # do not resize invisible widgets
3125 3387
3126 @queue = sort { $a->{visible} <=> $b->{visible} } 3388 $queue{$widget+0}++ and next; # duplicates are common
3127 @queue, values %{delete $self->{realloc}}; 3389
3390 push @{ $queue[$widget->{visible}] }, $widget;
3391 }
3128 } 3392 }
3129 3393
3394 while () {
3395 @queue or last outer;
3396
3397 $widget = pop @{ $queue[-1] || [] }
3398 and last;
3399
3400 pop @queue;
3401 }
3402
3403 delete $queue{$widget+0};
3404
3405 my ($w, $h) = $widget->size_request;
3406
3407 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3408 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3409
3410 $w = $widget->{force_w} if exists $widget->{force_w};
3411 $h = $widget->{force_h} if exists $widget->{force_h};
3412
3413 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3414 || delete $widget->{force_realloc}) {
3415 $widget->{req_w} = $w;
3416 $widget->{req_h} = $h;
3417
3418 $self->{size_alloc}{$widget+0} = $widget;
3419
3420 if (my $parent = $widget->{parent}) {
3421 $self->{realloc}{$parent+0} = $parent
3422 unless $queue{$parent+0};
3423
3424 $parent->{force_size_alloc} = 1;
3425 $self->{size_alloc}{$parent+0} = $parent;
3426 }
3427 }
3428
3429 delete $self->{realloc}{$widget+0};
3430 }
3431 }
3432
3433 while (my $size_alloc = delete $self->{size_alloc}) {
3434 my @queue = sort { $b->{visible} <=> $a->{visible} }
3435 values %$size_alloc;
3436
3437 while () {
3130 my $widget = pop @queue || last; 3438 my $widget = pop @queue || last;
3131 3439
3132 $widget->{visible} or last; # do not resize invisible widgets 3440 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3133
3134 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3135 ? @$widget{qw(def_w def_h)}
3136 : $widget->size_request;
3137
3138 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3139
3140 $widget->{req_w} = $w;
3141 $widget->{req_h} = $h;
3142
3143 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3144
3145 push @queue, $widget->{parent}
3146 if $widget->{parent};
3147 }
3148 }
3149
3150 while (my $size_alloc = delete $self->{size_alloc}) {
3151 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3152 values %$size_alloc;
3153
3154 while () {
3155 my ($widget, $w, $h) = @{ pop @queue or last };
3156 3441
3157 $w = 0 if $w < 0; 3442 $w = 0 if $w < 0;
3158 $h = 0 if $h < 0; 3443 $h = 0 if $h < 0;
3159 3444
3160 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3445 $w = int $w + 0.5;
3446 $h = int $h + 0.5;
3161 3447
3448 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3449 $widget->{old_w} = $widget->{w};
3450 $widget->{old_h} = $widget->{h};
3451
3162 $widget->{w} = $w; 3452 $widget->{w} = $w;
3163 $widget->{h} = $h; 3453 $widget->{h} = $h;
3164 3454
3165 $widget->emit (size_allocate => $w, $h, $changed); 3455 $widget->emit (size_allocate => $w, $h);
3456 }
3166 } 3457 }
3167 } 3458 }
3168 3459
3169 while ($self->{post_alloc_hook}) { 3460 while ($self->{post_alloc_hook}) {
3170 $_->() 3461 $_->()
3171 for values %{delete $self->{post_alloc_hook}}; 3462 for values %{delete $self->{post_alloc_hook}};
3172 } 3463 }
3464
3173 3465
3174 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3466 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3175 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3467 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3176 glClear GL_COLOR_BUFFER_BIT; 3468 glClear GL_COLOR_BUFFER_BIT;
3177 3469

Diff Legend

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