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.252 by root, Sun May 28 23:21:28 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) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
43 48
44 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
45 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
46 53
47 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
48 55
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 57
51 $TOOLTIP->set_tooltip_from ($widget); 58 $TOOLTIP->set_tooltip_from ($widget);
52
53 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
54
55 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
56 if $x + $TOOLTIP->{w} > $::WIDTH;
57
58 $TOOLTIP->move ($x, $y);
59 $TOOLTIP->show; 59 $TOOLTIP->show;
60 } 60 }
61 61
62 return; 62 return;
63 } 63 }
… …
170sub rescale_widgets { 170sub rescale_widgets {
171 my ($sx, $sy) = @_; 171 my ($sx, $sy) = @_;
172 172
173 for my $widget (values %WIDGET) { 173 for my $widget (values %WIDGET) {
174 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
175 $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.]+$/;
176 $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};
177 $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};
178 $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.]+$/;
179 $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};
180 $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
181 } 188 }
182 } 189 }
183 190
184 reconfigure_widgets; 191 reconfigure_widgets;
185} 192}
… …
194 201
195sub new { 202sub new {
196 my $class = shift; 203 my $class = shift;
197 204
198 my $self = bless { 205 my $self = bless {
199 x => 0, 206 x => "center",
200 y => 0, 207 y => "center",
201 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
202 can_events => 1, 211 can_events => 1,
203 @_ 212 @_
204 }, $class; 213 }, $class;
214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
205 216
206 for (keys %$self) { 217 for (keys %$self) {
207 if (/^on_(.*)$/) { 218 if (/^on_(.*)$/) {
208 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
209 } 220 }
210 } 221 }
211 222
212 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
213
214 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
215 $self->{req_x} = $layout->{x} * $::WIDTH; 224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
216 $self->{req_y} = $layout->{y} * $::HEIGHT; 225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
217 $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};
218 $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};
219 } 233 }
220 234
221 $self 235 $self
222} 236}
223 237
… …
232 my ($self) = @_; 246 my ($self) = @_;
233 247
234 return if $self->{parent}; 248 return if $self->{parent};
235 249
236 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
237}
238
239sub center {
240 my ($self) = @_;
241
242 $CFClient::UI::ROOT->on_post_alloc (
243 "center_$self" => sub {
244 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
245 },
246 );
247
248 $self->update;
249} 251}
250 252
251sub set_visible { 253sub set_visible {
252 my ($self) = @_; 254 my ($self) = @_;
253 255
… …
308 310
309 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
310 if $self->{parent}; 312 if $self->{parent};
311} 313}
312 314
313sub move { 315sub move_abs {
314 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
315 317
316 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
317 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
318 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
319 321
320 $self->update; 322 $self->update;
321} 323}
322 324
323sub set_size { 325sub set_size {
324 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
325 327
326 $self->{def_w} = $w; 328 $self->{force_w} = $w;
327 $self->{def_h} = $h; 329 $self->{force_h} = $h;
328 330
329 $self->realloc; 331 $self->realloc;
330} 332}
331 333
332sub size_request { 334sub size_request {
… …
336 338
337sub configure { 339sub configure {
338 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
339 341
340 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
341 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
342 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
343 347
344 # use alignment to adjust x, y 348 # use alignment to adjust x, y
345 349
346 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
347 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
348
349 ($w, $h) = ($w2, $h2);
350 } 352 }
351 353
352 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
353 $self->{x} = $x; 355 $self->{x} = $x;
354 $self->{y} = $y; 356 $self->{y} = $y;
355 $self->update; 357 $self->update;
356 } 358 }
357 359
358 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
359 return unless $self->{visible}; 361 return unless $self->{visible};
360 362
363 $self->{alloc_w} = $w;
364 $self->{alloc_h} = $h;
365
361 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 366 $self->{root}{size_alloc}{$self+0} = $self;
362 } 367 }
363} 368}
364 369
365sub size_allocate { 370sub size_allocate {
366 # nothing to be done 371 # nothing to be done
… …
466 471
467sub set_parent { 472sub set_parent {
468 my ($self, $parent) = @_; 473 my ($self, $parent) = @_;
469 474
470 Scalar::Util::weaken ($self->{parent} = $parent); 475 Scalar::Util::weaken ($self->{parent} = $parent);
471
472 $self->set_visible if $parent->{visible}; 476 $self->set_visible if $parent->{visible};
473} 477}
474 478
475sub connect { 479sub connect {
476 my ($self, $signal, $cb) = @_; 480 my ($self, $signal, $cb) = @_;
… …
497 501
498sub realloc { 502sub realloc {
499 my ($self) = @_; 503 my ($self) = @_;
500 504
501 if ($self->{visible}) { 505 if ($self->{visible}) {
502 return if $self->{root}{realloc}{$self}; 506 return if $self->{root}{realloc}{$self+0};
503 507
504 $self->{root}{realloc}{$self} = $self; 508 $self->{root}{realloc}{$self+0} = $self;
505 $self->{root}->update; 509 $self->{root}->update;
506 } else { 510 } else {
507 delete $self->{req_w}; 511 delete $self->{req_w};
512 delete $self->{req_h};
508 } 513 }
509} 514}
510 515
511sub update { 516sub update {
512 my ($self) = @_; 517 my ($self) = @_;
513 518
514 $self->{parent}->update 519 $self->{parent}->update
515 if $self->{parent}; 520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
516} 528}
517 529
518sub draw { 530sub draw {
519 my ($self) = @_; 531 my ($self) = @_;
520 532
… …
538 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
539 glEnd; 551 glEnd;
540 glDisable GL_BLEND; 552 glDisable GL_BLEND;
541 } 553 }
542 554
543 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
544 glPushMatrix; 556 glPushMatrix;
545 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
546 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
547 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
548 glVertex 0 , 0; 560 glVertex 0 , 0;
… …
624 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
625 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
626} 638}
627 639
628sub size_request { 640sub size_request {
629 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
630} 644}
631 645
632sub draw { } 646sub draw { }
633 647
634############################################################################# 648#############################################################################
… …
755sub size_request { 769sub size_request {
756 $_[0]{children}[0]->size_request 770 $_[0]{children}[0]->size_request
757} 771}
758 772
759sub size_allocate { 773sub size_allocate {
760 my ($self, $w, $h, $changed) = @_; 774 my ($self, $w, $h) = @_;
761 775
762 $self->{children}[0]->configure (0, 0, $w, $h); 776 $self->{children}[0]->configure (0, 0, $w, $h);
763} 777}
764 778
765############################################################################# 779#############################################################################
… …
782 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
783 $self->SUPER::update; 797 $self->SUPER::update;
784} 798}
785 799
786sub size_allocate { 800sub size_allocate {
787 my ($self, $w, $h, $changed) = @_; 801 my ($self, $w, $h) = @_;
788 802
789 $self->SUPER::size_allocate ($w, $h, $changed); 803 $self->SUPER::size_allocate ($w, $h);
790 $self->update 804 $self->update;
791 if $changed;
792} 805}
793 806
794sub _render { 807sub _render {
795 $_[0]{children}[0]->draw; 808 $_[0]{children}[0]->draw;
796} 809}
… …
840} 853}
841 854
842sub size_request { 855sub size_request {
843 my ($self) = @_; 856 my ($self) = @_;
844 857
845 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)};
846 859
847 $w = 10 if $self->{scroll_x}; 860 $w = 10 if $self->{scroll_x};
848 $h = 10 if $self->{scroll_y}; 861 $h = 10 if $self->{scroll_y};
849 862
850 ($w, $h) 863 ($w, $h)
851} 864}
852 865
853sub size_allocate { 866sub size_allocate {
854 my ($self, $w, $h, $changed) = @_; 867 my ($self, $w, $h) = @_;
855 868
869 my $child = $self->child;
870
856 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
857 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
858 873
859 $self->child->configure (0, 0, $w, $h); 874 $self->child->configure (0, 0, $w, $h);
860 $self->update; 875 $self->update;
861} 876}
862 877
… …
946 my $child = $self->{vp}->child; 961 my $child = $self->{vp}->child;
947 $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]);
948} 963}
949 964
950sub size_allocate { 965sub size_allocate {
951 my ($self, $w, $h, $changed) = @_; 966 my ($self, $w, $h) = @_;
952 967
953 $self->SUPER::size_allocate ($w, $h, $changed); 968 $self->SUPER::size_allocate ($w, $h);
954 969
955 my $child = $self->{vp}->child; 970 my $child = $self->{vp}->child;
956 $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]);
957} 972}
958 973
… …
1005 1020
1006our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
1007 1022
1008use CFClient::OpenGL; 1023use CFClient::OpenGL;
1009 1024
1010my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
1011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1012 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);
1013 1032
1014sub new { 1033sub new {
1015 my $class = shift; 1034 my $class = shift;
1016 1035
1017 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
1018 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
1019 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
1020 border => 0.6, 1039 border => 0.6,
1021 is_toplevel => 1,
1022 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
1023 @_ 1043 @_
1024 ); 1044 );
1025 1045
1026 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
1027 align => 0, 1047 align => 0,
… …
1046 $h + $self->border * 2, 1066 $h + $self->border * 2,
1047 ) 1067 )
1048} 1068}
1049 1069
1050sub size_allocate { 1070sub size_allocate {
1051 my ($self, $w, $h, $changed) = @_; 1071 my ($self, $w, $h) = @_;
1052
1053 return unless $changed;
1054 1072
1055 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
1056 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
1057 1075
1058 $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)
… …
1082 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
1083 1101
1084 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
1085 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
1086 1104
1087 $self->{user_x} = $wx + $dx * $mx;
1088 $self->{user_y} = $wy + $dy * $my;
1089 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1090 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1091 $self->move ($self->{user_x}, $self->{user_y}); 1107
1092 $self->realloc; 1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1093 }; 1110 };
1094 1111
1095 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
1096 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1097 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1099 $self->{motion} = sub { 1116 $self->{motion} = sub {
1100 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
1101 1118
1102 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
1103 1120
1104 $self->{user_x} = $bx + $x - $ox; 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1105 $self->{user_y} = $by + $y - $oy;
1106
1107 $self->move ($self->{user_x}, $self->{user_y});
1108 $self->realloc;
1109 }; 1122 };
1110 } 1123 }
1111} 1124}
1112 1125
1113sub button_up { 1126sub button_up {
… …
1132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1133 1146
1134 my $border = $self->border; 1147 my $border = $self->border;
1135 1148
1136 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
1137 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1138 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1139 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1140 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1141 1154
1142 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1143 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
1144 1157
1145 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
1146 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
1147 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
1148
1149 glColor @{ $self->{bg} };
1150
1151 $bg->{s} = $rep_x;
1152 $bg->{t} = $rep_y;
1153 $bg->{wrap_mode} = 1;
1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155 } 1163 }
1156 1164
1157 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
1158 1166
… …
1240 (sum @$hs), 1248 (sum @$hs),
1241 ) 1249 )
1242} 1250}
1243 1251
1244sub size_allocate { 1252sub size_allocate {
1245 my ($self, $w, $h, $changed) = @_; 1253 my ($self, $w, $h) = @_;
1246 1254
1247 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1248 1256
1249 my $req_w = (sum @$ws) || 1; 1257 my $req_w = (sum @$ws) || 1;
1250 my $req_h = (sum @$hs) || 1; 1258 my $req_h = (sum @$hs) || 1;
… …
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 ) 1337 )
1330} 1338}
1331 1339
1332sub size_allocate { 1340sub size_allocate {
1333 my ($self, $w, $h, $changed) = @_; 1341 my ($self, $w, $h) = @_;
1334 1342
1335 my $space = $self->{vertical} ? $h : $w; 1343 my $space = $self->{vertical} ? $h : $w;
1336 my $children = $self->{children}; 1344 my $children = $self->{children};
1337 1345
1338 my @req; 1346 my @req;
… …
1421 ellipsise => 3, # end 1429 ellipsise => 3, # end
1422 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1423 fontsize => 1, 1431 fontsize => 1,
1424 align => -1, 1432 align => -1,
1425 valign => -1, 1433 valign => -1,
1426 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1427 can_events => 0, 1436 can_events => 0,
1428 %arg 1437 %arg
1429 ); 1438 );
1430 1439
1431 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1507 1516
1508 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1509 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1510 } 1519 }
1511 1520
1512 ( 1521 ($w, $h)
1513 $w + $self->{padding} * 2,
1514 $h + $self->{padding} * 2,
1515 )
1516} 1522}
1517 1523
1518sub size_allocate { 1524sub size_allocate {
1519 my ($self, $w, $h, $changed) = @_; 1525 my ($self, $w, $h) = @_;
1520 1526
1521 delete $self->{texture} 1527 delete $self->{texture}
1522 if $changed; 1528 ;#d#
1523} 1529}
1524 1530
1525sub set_fontsize { 1531sub set_fontsize {
1526 my ($self, $fontsize) = @_; 1532 my ($self, $fontsize) = @_;
1527 1533
… …
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546 1552
1547 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1553 my $tex = new_from_layout CFClient::Texture $self->{layout};
1548 1554
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551 : ($self->{w} - $tex->{w}) * 0.5); 1557 : ($self->{w} - $tex->{w}) * 0.5);
1552 1558
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555 : ($self->{h} - $tex->{h}) * 0.5); 1561 : ($self->{h} - $tex->{h}) * 0.5);
1556 1562
1557 $tex 1563 $tex
1558 }; 1564 };
1559 1565
… …
1798 1804
1799sub new { 1805sub new {
1800 my $class = shift; 1806 my $class = shift;
1801 1807
1802 $class->SUPER::new ( 1808 $class->SUPER::new (
1803 padding => 4, 1809 padding_x => 4,
1810 padding_y => 4,
1804 fg => [1, 1, 1], 1811 fg => [1, 1, 1],
1805 active_fg => [0, 0, 1], 1812 active_fg => [0, 0, 1],
1806 can_hover => 1, 1813 can_hover => 1,
1807 align => 0, 1814 align => 0,
1808 valign => 0, 1815 valign => 0,
… …
1855 1862
1856sub new { 1863sub new {
1857 my $class = shift; 1864 my $class = shift;
1858 1865
1859 $class->SUPER::new ( 1866 $class->SUPER::new (
1860 padding => 2, 1867 padding_x => 2,
1868 padding_y => 2,
1861 fg => [1, 1, 1], 1869 fg => [1, 1, 1],
1862 active_fg => [1, 1, 0], 1870 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2], 1871 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5], 1872 active_bg => [1, 1, 1, 0.5],
1865 state => 0, 1873 state => 0,
… …
1869} 1877}
1870 1878
1871sub size_request { 1879sub size_request {
1872 my ($self) = @_; 1880 my ($self) = @_;
1873 1881
1874 ($self->{padding} * 2 + 6) x 2 1882 (6) x 2
1875} 1883}
1876 1884
1877sub button_down { 1885sub button_down {
1878 my ($self, $ev, $x, $y) = @_; 1886 my ($self, $ev, $x, $y) = @_;
1879 1887
1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882 $self->{state} = !$self->{state}; 1890 $self->{state} = !$self->{state};
1883 $self->_emit (changed => $self->{state}); 1891 $self->_emit (changed => $self->{state});
1884 } 1892 }
1885} 1893}
1886 1894
1887sub _draw { 1895sub _draw {
1888 my ($self) = @_; 1896 my ($self) = @_;
1889 1897
1890 $self->SUPER::_draw; 1898 $self->SUPER::_draw;
1891 1899
1892 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1900 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893 1901
1894 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;
1895 1905
1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897 1907
1898 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1908 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899 1909
… …
2164 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2175 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2176 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2177 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2178 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2179 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2180 min_h => $::WIDTH / 80,
2171 vertical => 0, 2181 vertical => 0,
2172 can_hover => 1, 2182 can_hover => 1,
2173 inner_pad => 0.02, 2183 inner_pad => 0.02,
2174 @_ 2184 @_
2175 ); 2185 );
… …
2215} 2225}
2216 2226
2217sub size_request { 2227sub size_request {
2218 my ($self) = @_; 2228 my ($self) = @_;
2219 2229
2220 my $w = $self->{req_w}; 2230 ($self->{req_w}, $self->{req_h})
2221 my $h = $self->{req_h};
2222
2223 $self->{vertical} ? ($h, $w) : ($w, $h)
2224} 2231}
2225 2232
2226sub button_down { 2233sub button_down {
2227 my ($self, $ev, $x, $y) = @_; 2234 my ($self, $ev, $x, $y) = @_;
2228 2235
… …
2378 $self->{fontsize} = $fontsize; 2385 $self->{fontsize} = $fontsize;
2379 $self->reflow; 2386 $self->reflow;
2380} 2387}
2381 2388
2382sub size_allocate { 2389sub size_allocate {
2383 my ($self, $w, $h, $changed) = @_; 2390 my ($self, $w, $h) = @_;
2384 2391
2385 $self->SUPER::size_allocate ($w, $h, $changed); 2392 $self->SUPER::size_allocate ($w, $h);
2386
2387 return unless $changed;
2388 2393
2389 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2394 $self->{layout}->set_font ($self->{font}) if $self->{font};
2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2391 $self->{layout}->set_width ($self->{children}[0]{w}); 2396 $self->{layout}->set_width ($self->{children}[0]{w});
2392 2397
… …
2615} 2620}
2616 2621
2617sub set_tooltip_from { 2622sub set_tooltip_from {
2618 my ($self, $widget) = @_; 2623 my ($self, $widget) = @_;
2619 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
2620 $self->add (new CFClient::UI::Label 2634 $self->add (new CFClient::UI::Label
2621 markup => $widget->{tooltip}, 2635 markup => $tooltip,
2622 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2623 fontsize => 0.8, 2637 fontsize => 0.8,
2624 fg => [0, 0, 0, 1], 2638 fg => [0, 0, 0, 1],
2625 ellipsise => 0, 2639 ellipsise => 0,
2626 font => ($widget->{tooltip_font} || $::FONT_PROP), 2640 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2634 2648
2635 ($w + 4, $h + 4) 2649 ($w + 4, $h + 4)
2636} 2650}
2637 2651
2638sub size_allocate { 2652sub size_allocate {
2639 my ($self, $w, $h, $changed) = @_; 2653 my ($self, $w, $h) = @_;
2640 2654
2641 return unless $changed;
2642
2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2655 $self->SUPER::size_allocate ($w - 4, $h - 4);
2656}
2657
2658sub visibility_change {
2659 my ($self, $visible) = @_;
2660
2661 return unless $visible;
2662
2663 $self->{root}->on_post_alloc ("move_$self" => sub {
2664 my $widget = $self->{owner}
2665 or return;
2666
2667 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2668
2669 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2670 if $x + $self->{w} > $::WIDTH;
2671
2672 $self->move_abs ($x, $y);
2673 });
2644} 2674}
2645 2675
2646sub _draw { 2676sub _draw {
2647 my ($self) = @_; 2677 my ($self) = @_;
2648 2678
… …
2751 $self->SUPER::DESTROY; 2781 $self->SUPER::DESTROY;
2752} 2782}
2753 2783
2754############################################################################# 2784#############################################################################
2755 2785
2756package CFClient::UI::Inventory;
2757
2758our @ISA = CFClient::UI::ScrolledWindow::;
2759
2760sub new {
2761 my $class = shift;
2762
2763 my $self = $class->SUPER::new (
2764 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2765 @_,
2766 );
2767
2768 $self
2769}
2770
2771sub set_items {
2772 my ($self, $items) = @_;
2773
2774 $self->{scrolled}->clear;
2775 return unless $items;
2776
2777 my @items = sort {
2778 ($a->{type} <=> $b->{type})
2779 or ($a->{name} cmp $b->{name})
2780 } @$items;
2781
2782 $self->{real_items} = \@items;
2783
2784 my $row = 0;
2785 for my $item (@items) {
2786 CFClient::Item::update_widgets $item;
2787
2788 $self->{scrolled}->add (0, $row, $item->{face_widget});
2789 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2790 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2791
2792 $row++;
2793 }
2794}
2795
2796#############################################################################
2797
2798package CFClient::UI::Menu; 2786package CFClient::UI::Menu;
2799 2787
2800our @ISA = CFClient::UI::FancyFrame::; 2788our @ISA = CFClient::UI::FancyFrame::;
2801 2789
2802use CFClient::OpenGL; 2790use CFClient::OpenGL;
… …
2840 # maybe save $GRAB? must be careful about events... 2828 # maybe save $GRAB? must be careful about events...
2841 $GRAB = $self; 2829 $GRAB = $self;
2842 $self->{button} = $ev->{button}; 2830 $self->{button} = $ev->{button};
2843 2831
2844 $self->show; 2832 $self->show;
2845 $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);
2846} 2834}
2847 2835
2848sub mouse_motion { 2836sub mouse_motion {
2849 my ($self, $ev, $x, $y) = @_; 2837 my ($self, $ev, $x, $y) = @_;
2850 2838
… …
2975 $self->SUPER::reconfigure; 2963 $self->SUPER::reconfigure;
2976} 2964}
2977 2965
2978############################################################################# 2966#############################################################################
2979 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
2980package CFClient::UI::Root; 3259package CFClient::UI::Root;
2981 3260
2982our @ISA = CFClient::UI::Container::; 3261our @ISA = CFClient::UI::Container::;
2983 3262
2984use CFClient::OpenGL; 3263use CFClient::OpenGL;
… …
2994 Scalar::Util::weaken ($self->{root} = $self); 3273 Scalar::Util::weaken ($self->{root} = $self);
2995 3274
2996 $self 3275 $self
2997} 3276}
2998 3277
2999sub configure {
3000 my ($self, $x, $y, $w, $h) = @_;
3001
3002 $self->{w} = $w;
3003 $self->{h} = $h;
3004}
3005
3006sub reconfigure {
3007 my ($self) = @_;
3008
3009 $self->SUPER::reconfigure;
3010
3011 $self->size_allocate ($self->{w}, $self->{h}, 1)
3012 if $self->{w};
3013}
3014
3015sub size_request { 3278sub size_request {
3016 my ($self) = @_; 3279 my ($self) = @_;
3017 3280
3018 ($self->{w}, $self->{h}) 3281 ($self->{w}, $self->{h})
3019} 3282}
3020 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
3021sub size_allocate { 3298sub size_allocate {
3022 my ($self, $w, $h, $changed) = @_; 3299 my ($self, $w, $h) = @_;
3023 3300
3024 for my $child ($self->children) { 3301 for my $child ($self->children) {
3025 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)};
3026 3303
3027 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3304 $X = $child->{force_x} if exists $child->{force_x};
3028 if exists $child->{req_x}; 3305 $Y = $child->{force_y} if exists $child->{force_y};
3029 3306
3030 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3307 $X = _to_pixel $X, $W, $self->{w};
3031 if exists $child->{req_y}; 3308 $Y = _to_pixel $Y, $H, $self->{h};
3032
3033 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3034
3035 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3036 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3037 3309
3038 $child->configure ($X, $Y, $W, $H); 3310 $child->configure ($X, $Y, $W, $H);
3039 } 3311 }
3040} 3312}
3041 3313
… …
3058} 3330}
3059 3331
3060sub add { 3332sub add {
3061 my ($self, @children) = @_; 3333 my ($self, @children) = @_;
3062 3334
3063 for my $child (@children) {
3064 $child->{is_toplevel} = 1; 3335 $_->{is_toplevel} = 1
3065 3336 for @children;
3066 # integerise window positions
3067 $child->{x} = int $child->{x};
3068 $child->{y} = int $child->{y};
3069 }
3070 3337
3071 $self->SUPER::add (@children); 3338 $self->SUPER::add (@children);
3072} 3339}
3073 3340
3074sub remove { 3341sub remove {
3075 my ($self, @children) = @_; 3342 my ($self, @children) = @_;
3076 3343
3077 $self->SUPER::remove (@children); 3344 $self->SUPER::remove (@children);
3345
3346 delete $self->{is_toplevel}
3347 for @children;
3078 3348
3079 while (@children) { 3349 while (@children) {
3080 my $w = pop @children; 3350 my $w = pop @children;
3081 push @children, $w->children; 3351 push @children, $w->children;
3082 $w->set_invisible; 3352 $w->set_invisible;
… …
3108 3378
3109 while () { 3379 while () {
3110 if ($self->{realloc}) { 3380 if ($self->{realloc}) {
3111 #TODO use array-of-depth approach 3381 #TODO use array-of-depth approach
3112 3382
3383 use sort 'stable';
3384
3113 @queue = sort { $a->{visible} <=> $b->{visible} } 3385 @queue = sort { $a->{visible} <=> $b->{visible} }
3114 @queue, values %{delete $self->{realloc}}; 3386 @queue, values %{delete $self->{realloc}};
3115 } 3387 }
3116 3388
3117 my $widget = pop @queue || last; 3389 my $widget = pop @queue || last;
3118 3390
3119 $widget->{visible} or last; # do not resize invisible widgets 3391 $widget->{visible} or last; # do not resize invisible widgets
3120 3392
3121 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3122 ? @$widget{qw(def_w def_h)}
3123 : $widget->size_request; 3393 my ($w, $h) = $widget->size_request;
3124 3394
3125 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;
3126 3413 }
3127 $widget->{req_w} = $w; 3414 }
3128 $widget->{req_h} = $h;
3129 3415
3130 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3416 delete $self->{realloc}{$widget+0};
3131
3132 push @queue, $widget->{parent}
3133 if $widget->{parent};
3134 } 3417 }
3135 } 3418 }
3136 3419
3137 while (my $size_alloc = delete $self->{size_alloc}) { 3420 while (my $size_alloc = delete $self->{size_alloc}) {
3138 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3421 my @queue = sort { $b->{visible} <=> $a->{visible} }
3139 values %$size_alloc; 3422 values %$size_alloc;
3140 3423
3141 while () { 3424 while () {
3142 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)};
3143 3428
3144 $w = 0 if $w < 0; 3429 $w = 0 if $w < 0;
3145 $h = 0 if $h < 0; 3430 $h = 0 if $h < 0;
3146 3431
3147 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3432 $w = int $w + 0.5;
3433 $h = int $h + 0.5;
3148 3434
3435 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3149 $widget->{w} = $w; 3436 $widget->{w} = $w;
3150 $widget->{h} = $h; 3437 $widget->{h} = $h;
3151 3438
3152 $widget->emit (size_allocate => $w, $h, $changed); 3439 $widget->emit (size_allocate => $w, $h);
3440 }
3153 } 3441 }
3154 } 3442 }
3155 3443
3156 while ($self->{post_alloc_hook}) { 3444 while ($self->{post_alloc_hook}) {
3157 $_->() 3445 $_->()
3158 for values %{delete $self->{post_alloc_hook}}; 3446 for values %{delete $self->{post_alloc_hook}};
3159 } 3447 }
3448
3160 3449
3161 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3450 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3162 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3451 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3163 glClear GL_COLOR_BUFFER_BIT; 3452 glClear GL_COLOR_BUFFER_BIT;
3164 3453

Diff Legend

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