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

Diff Legend

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