ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.254 by root, Mon May 29 01:53:23 2006 UTC vs.
Revision 1.267 by root, Thu Jun 1 04:10:29 2006 UTC

… …
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
29 } 27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
30 31
31 return $LAYOUT; 32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
32} 36}
33 37
34sub set_layout { 38sub set_layout {
35 my ($layout) = @_; 39 my ($layout) = @_;
40
36 $LAYOUT = $layout; 41 $LAYOUT = $layout;
37} 42}
38 43
39sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
40 if (!$GRAB) { 47 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
45 $TOOLTIP->hide; 51 $TOOLTIP->hide;
46 52
47 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
48 54
… …
165sub rescale_widgets { 171sub rescale_widgets {
166 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
167 173
168 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
169 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
170 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
171 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
172 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
173 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
174 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
175 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
176 } 189 }
177 } 190 }
178 191
179 reconfigure_widgets; 192 reconfigure_widgets;
180} 193}
… …
189 202
190sub new { 203sub new {
191 my $class = shift; 204 my $class = shift;
192 205
193 my $self = bless { 206 my $self = bless {
194 x => 0, 207 x => "center",
195 y => 0, 208 y => "center",
196 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
197 can_events => 1, 212 can_events => 1,
198 @_ 213 @_
199 }, $class; 214 }, $class;
215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
200 217
201 for (keys %$self) { 218 for (keys %$self) {
202 if (/^on_(.*)$/) { 219 if (/^on_(.*)$/) {
203 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
204 } 221 }
205 } 222 }
206 223
207 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
208
209 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
210 $self->{req_x} = $layout->{x} * $::WIDTH; 225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
211 $self->{req_y} = $layout->{y} * $::HEIGHT; 226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
212 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
213 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
214 } 234 }
215 235
216 $self 236 $self
217} 237}
218 238
… …
227 my ($self) = @_; 247 my ($self) = @_;
228 248
229 return if $self->{parent}; 249 return if $self->{parent};
230 250
231 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
232}
233
234sub center {
235 my ($self) = @_;
236
237 $CFClient::UI::ROOT->on_post_alloc (
238 "center_$self" => sub {
239 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
240 },
241 );
242
243 $self->update;
244} 252}
245 253
246sub set_visible { 254sub set_visible {
247 my ($self) = @_; 255 my ($self) = @_;
248 256
… …
303 311
304 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
305 if $self->{parent}; 313 if $self->{parent};
306} 314}
307 315
308sub move { 316sub move_abs {
309 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
310 318
311 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
312 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
313 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
314 322
315 $self->update; 323 $self->update;
316} 324}
317 325
318sub set_size { 326sub set_size {
319 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
320 328
321 $self->{def_w} = $w; 329 $self->{force_w} = $w;
322 $self->{def_h} = $h; 330 $self->{force_h} = $h;
323 331
324 $self->realloc; 332 $self->realloc;
325} 333}
326 334
327sub size_request { 335sub size_request {
… …
331 339
332sub configure { 340sub configure {
333 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
334 342
335 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
336 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
337 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
338 348
339 # use alignment to adjust x, y 349 # use alignment to adjust x, y
340 350
341 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
342 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
343
344 ($w, $h) = ($w2, $h2);
345 } 353 }
346 354
347 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
348 $self->{x} = $x; 356 $self->{x} = $x;
349 $self->{y} = $y; 357 $self->{y} = $y;
350 $self->update; 358 $self->update;
351 } 359 }
352 360
353 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
354 return unless $self->{visible}; 362 return unless $self->{visible};
355 363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 367 $self->{root}{size_alloc}{$self+0} = $self;
357 } 368 }
358} 369}
359 370
360sub size_allocate { 371sub size_allocate {
361 # nothing to be done 372 # nothing to be done
… …
439 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
440 451
441 $self->focus_in; 452 $self->focus_in;
442} 453}
443 454
444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
449
450sub find_widget { 455sub find_widget {
451 my ($self, $x, $y) = @_; 456 my ($self, $x, $y) = @_;
452 457
453 return () unless $self->{can_events}; 458 return () unless $self->{can_events};
454 459
… …
461 466
462sub set_parent { 467sub set_parent {
463 my ($self, $parent) = @_; 468 my ($self, $parent) = @_;
464 469
465 Scalar::Util::weaken ($self->{parent} = $parent); 470 Scalar::Util::weaken ($self->{parent} = $parent);
466
467 $self->set_visible if $parent->{visible}; 471 $self->set_visible if $parent->{visible};
468} 472}
469 473
470sub connect { 474sub connect {
471 my ($self, $signal, $cb) = @_; 475 my ($self, $signal, $cb) = @_;
… …
492 496
493sub realloc { 497sub realloc {
494 my ($self) = @_; 498 my ($self) = @_;
495 499
496 if ($self->{visible}) { 500 if ($self->{visible}) {
497 return if $self->{root}{realloc}{$self}; 501 return if $self->{root}{realloc}{$self+0};
498 502
499 $self->{root}{realloc}{$self} = $self; 503 $self->{root}{realloc}{$self+0} = $self;
500 $self->{root}->update; 504 $self->{root}->update;
501 } else { 505 } else {
502 delete $self->{req_w}; 506 delete $self->{req_w};
507 delete $self->{req_h};
503 } 508 }
504} 509}
505 510
506sub update { 511sub update {
507 my ($self) = @_; 512 my ($self) = @_;
508 513
509 $self->{parent}->update 514 $self->{parent}->update
510 if $self->{parent}; 515 if $self->{parent};
511} 516}
512 517
518sub reconfigure {
519 my ($self) = @_;
520
521 $self->realloc;
522 $self->update;
523}
524
525# using global variables seems a bit hacky, but passing through all drawing
526# functions seems pointless.
527our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
528
513sub draw { 529sub draw {
514 my ($self) = @_; 530 my ($self) = @_;
515 531
516 return unless $self->{h} && $self->{w}; 532 return unless $self->{h} && $self->{w};
533
534 local $draw_x = $draw_x + $self->{x};
535 local $draw_y = $draw_y + $self->{y};
536
537 return if $draw_x + $self->{w} < 0;
538 return if $draw_x >= $draw_w;
539 return if $draw_y + $self->{h} < 0;
540 return if $draw_y >= $draw_h;
517 541
518 glPushMatrix; 542 glPushMatrix;
519 glTranslate $self->{x}, $self->{y}, 0; 543 glTranslate $self->{x}, $self->{y}, 0;
520 $self->_draw; 544 $self->_draw;
521 glPopMatrix; 545 glPopMatrix;
… …
533 glVertex $x , $y + $self->{h}; 557 glVertex $x , $y + $self->{h};
534 glEnd; 558 glEnd;
535 glDisable GL_BLEND; 559 glDisable GL_BLEND;
536 } 560 }
537 561
538 if ($ENV{PCLIENT_DEBUG}) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
539 glPushMatrix; 563 glPushMatrix;
540 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
542 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
543 glVertex 0 , 0; 567 glVertex 0 , 0;
… …
619 my ($class, %arg) = @_; 643 my ($class, %arg) = @_;
620 $class->SUPER::new (can_events => 0, %arg); 644 $class->SUPER::new (can_events => 0, %arg);
621} 645}
622 646
623sub size_request { 647sub size_request {
624 (0, 0) 648 my ($self) = @_;
649
650 ($self->{w} + 0, $self->{h} + 0)
625} 651}
626 652
627sub draw { } 653sub draw { }
628 654
629############################################################################# 655#############################################################################
… …
750sub size_request { 776sub size_request {
751 $_[0]{children}[0]->size_request 777 $_[0]{children}[0]->size_request
752} 778}
753 779
754sub size_allocate { 780sub size_allocate {
755 my ($self, $w, $h, $changed) = @_; 781 my ($self, $w, $h) = @_;
756 782
757 $self->{children}[0]->configure (0, 0, $w, $h); 783 $self->{children}[0]->configure (0, 0, $w, $h);
758} 784}
759 785
760############################################################################# 786#############################################################################
… …
777 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 803 $ROOT->on_post_alloc ($self => sub { $self->render_child });
778 $self->SUPER::update; 804 $self->SUPER::update;
779} 805}
780 806
781sub size_allocate { 807sub size_allocate {
782 my ($self, $w, $h, $changed) = @_; 808 my ($self, $w, $h) = @_;
783 809
784 $self->SUPER::size_allocate ($w, $h, $changed); 810 $self->SUPER::size_allocate ($w, $h);
785 $self->update 811 $self->update;
786 if $changed;
787} 812}
788 813
789sub _render { 814sub _render {
815 my ($self) = @_;
816
790 $_[0]{children}[0]->draw; 817 $self->{children}[0]->draw;
791} 818}
792 819
793sub render_child { 820sub render_child {
794 my ($self) = @_; 821 my ($self) = @_;
795 822
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 823 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 824 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 825 glClear GL_COLOR_BUFFER_BIT;
799 826
827 {
828 package CFClient::UI::Base;
829
830 ($draw_x, $draw_y, $draw_w, $draw_h) =
831 (0, 0, $self->{w}, $self->{h});
832 }
833
800 $self->_render; 834 $self->_render;
801 }; 835 };
802} 836}
803 837
804sub _draw { 838sub _draw {
805 my ($self) = @_; 839 my ($self) = @_;
806 840
807 my ($w, $h) = ($self->w, $self->h); 841 my ($w, $h) = @$self{qw(w h)};
808 842
809 my $tex = $self->{texture} 843 my $tex = $self->{texture}
810 or return; 844 or return;
811 845
812 glEnable GL_TEXTURE_2D; 846 glEnable GL_TEXTURE_2D;
… …
835} 869}
836 870
837sub size_request { 871sub size_request {
838 my ($self) = @_; 872 my ($self) = @_;
839 873
840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 874 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 875
842 $w = 10 if $self->{scroll_x}; 876 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y}; 877 $h = 10 if $self->{scroll_y};
844 878
845 ($w, $h) 879 ($w, $h)
846} 880}
847 881
848sub size_allocate { 882sub size_allocate {
849 my ($self, $w, $h, $changed) = @_; 883 my ($self, $w, $h) = @_;
850 884
885 my $child = $self->child;
886
851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 887 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 888 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853 889
854 $self->child->configure (0, 0, $w, $h); 890 $self->child->configure (0, 0, $w, $h);
855 $self->update; 891 $self->update;
856} 892}
857 893
… …
892 } 928 }
893} 929}
894 930
895sub _render { 931sub _render {
896 my ($self) = @_; 932 my ($self) = @_;
933
934 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
935 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
897 936
898 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 937 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899 938
900 $self->SUPER::_render; 939 $self->SUPER::_render;
901} 940}
… …
941 my $child = $self->{vp}->child; 980 my $child = $self->{vp}->child;
942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 981 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943} 982}
944 983
945sub size_allocate { 984sub size_allocate {
946 my ($self, $w, $h, $changed) = @_; 985 my ($self, $w, $h) = @_;
947 986
948 $self->SUPER::size_allocate ($w, $h, $changed); 987 $self->SUPER::size_allocate ($w, $h);
949 988
950 my $child = $self->{vp}->child; 989 my $child = $self->{vp}->child;
951 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 990 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
952} 991}
953 992
… …
1000 1039
1001our @ISA = CFClient::UI::Bin::; 1040our @ISA = CFClient::UI::Bin::;
1002 1041
1003use CFClient::OpenGL; 1042use CFClient::OpenGL;
1004 1043
1005my @tex = 1044my $bg =
1045 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1046 mipmap => 1, wrap => 1;
1047
1048my @border =
1006 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1007 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1050 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1008 1051
1009sub new { 1052sub new {
1010 my $class = shift; 1053 my $class = shift;
1011 1054
1012 my $self = $class->SUPER::new ( 1055 my $self = $class->SUPER::new (
1013 bg => [1, 1, 1, 1], 1056 bg => [1, 1, 1, 1],
1014 border_bg => [1, 1, 1, 1], 1057 border_bg => [1, 1, 1, 1],
1015 border => 0.6, 1058 border => 0.6,
1016 is_toplevel => 1,
1017 can_events => 1, 1059 can_events => 1,
1060 min_w => 16,
1061 min_h => 16,
1018 @_ 1062 @_
1019 ); 1063 );
1020 1064
1021 $self->{title} &&= new CFClient::UI::Label 1065 $self->{title} &&= new CFClient::UI::Label
1022 align => 0, 1066 align => 0,
… …
1041 $h + $self->border * 2, 1085 $h + $self->border * 2,
1042 ) 1086 )
1043} 1087}
1044 1088
1045sub size_allocate { 1089sub size_allocate {
1046 my ($self, $w, $h, $changed) = @_; 1090 my ($self, $w, $h) = @_;
1047
1048 return unless $changed;
1049 1091
1050 $h -= List::Util::max 0, $self->border * 2; 1092 $h -= List::Util::max 0, $self->border * 2;
1051 $w -= List::Util::max 0, $self->border * 2; 1093 $w -= List::Util::max 0, $self->border * 2;
1052 1094
1053 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1095 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1077 my ($ev, $x, $y) = @_; 1119 my ($ev, $x, $y) = @_;
1078 1120
1079 my $dx = $ev->{x} - $ox; 1121 my $dx = $ev->{x} - $ox;
1080 my $dy = $ev->{y} - $oy; 1122 my $dy = $ev->{y} - $oy;
1081 1123
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1124 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1125 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1086 $self->move ($self->{user_x}, $self->{user_y}); 1126
1087 $self->realloc; 1127 $self->realloc;
1128 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1088 }; 1129 };
1089 1130
1090 } elsif ($lr ^ $td) { 1131 } elsif ($lr ^ $td) {
1091 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1132 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1092 my ($bx, $by) = ($self->{x}, $self->{y}); 1133 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1094 $self->{motion} = sub { 1135 $self->{motion} = sub {
1095 my ($ev, $x, $y) = @_; 1136 my ($ev, $x, $y) = @_;
1096 1137
1097 ($x, $y) = ($ev->{x}, $ev->{y}); 1138 ($x, $y) = ($ev->{x}, $ev->{y});
1098 1139
1099 $self->{user_x} = $bx + $x - $ox; 1140 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1100 $self->{user_y} = $by + $y - $oy;
1101
1102 $self->move ($self->{user_x}, $self->{user_y});
1103 $self->realloc;
1104 }; 1141 };
1105 } 1142 }
1106} 1143}
1107 1144
1108sub button_up { 1145sub button_up {
… …
1127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1128 1165
1129 my $border = $self->border; 1166 my $border = $self->border;
1130 1167
1131 glColor @{ $self->{border_bg} }; 1168 glColor @{ $self->{border_bg} };
1132 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1169 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1133 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1170 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1134 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1171 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1135 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1172 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1136 1173
1137 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1174 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1138 my $bg = $tex[0]; 1175 glColor @{ $self->{bg} };
1139 1176
1140 # TODO: repeat texture not scale 1177 # TODO: repeat texture not scale
1178 # solve this better(?)
1141 my $rep_x = $cw / $bg->{w}; 1179 $bg->{s} = $cw / $bg->{w};
1142 my $rep_y = $ch / $bg->{h}; 1180 $bg->{t} = $ch / $bg->{h};
1143
1144 glColor @{ $self->{bg} };
1145
1146 $bg->{s} = $rep_x;
1147 $bg->{t} = $rep_y;
1148 $bg->{wrap_mode} = 1;
1149 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1181 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1150 } 1182 }
1151 1183
1152 glDisable GL_TEXTURE_2D; 1184 glDisable GL_TEXTURE_2D;
1153 1185
… …
1235 (sum @$hs), 1267 (sum @$hs),
1236 ) 1268 )
1237} 1269}
1238 1270
1239sub size_allocate { 1271sub size_allocate {
1240 my ($self, $w, $h, $changed) = @_; 1272 my ($self, $w, $h) = @_;
1241 1273
1242 my ($ws, $hs) = $self->get_wh; 1274 my ($ws, $hs) = $self->get_wh;
1243 1275
1244 my $req_w = (sum @$ws) || 1; 1276 my $req_w = (sum @$ws) || 1;
1245 my $req_h = (sum @$hs) || 1; 1277 my $req_h = (sum @$hs) || 1;
… …
1323 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1355 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1324 ) 1356 )
1325} 1357}
1326 1358
1327sub size_allocate { 1359sub size_allocate {
1328 my ($self, $w, $h, $changed) = @_; 1360 my ($self, $w, $h) = @_;
1329 1361
1330 my $space = $self->{vertical} ? $h : $w; 1362 my $space = $self->{vertical} ? $h : $w;
1331 my $children = $self->{children}; 1363 my $children = $self->{children};
1332 1364
1333 my @req; 1365 my @req;
… …
1416 ellipsise => 3, # end 1448 ellipsise => 3, # end
1417 layout => (new CFClient::Layout), 1449 layout => (new CFClient::Layout),
1418 fontsize => 1, 1450 fontsize => 1,
1419 align => -1, 1451 align => -1,
1420 valign => -1, 1452 valign => -1,
1421 padding => 2, 1453 padding_x => 2,
1454 padding_y => 2,
1422 can_events => 0, 1455 can_events => 0,
1423 %arg 1456 %arg
1424 ); 1457 );
1425 1458
1426 if (exists $self->{template}) { 1459 if (exists $self->{template}) {
… …
1502 1535
1503 $w = List::Util::max $w, $w2; 1536 $w = List::Util::max $w, $w2;
1504 $h = List::Util::max $h, $h2; 1537 $h = List::Util::max $h, $h2;
1505 } 1538 }
1506 1539
1507 ( 1540 ($w, $h)
1508 $w + $self->{padding} * 2,
1509 $h + $self->{padding} * 2,
1510 )
1511} 1541}
1512 1542
1513sub size_allocate { 1543sub size_allocate {
1514 my ($self, $w, $h, $changed) = @_; 1544 my ($self, $w, $h) = @_;
1515 1545
1516 delete $self->{texture} 1546 delete $self->{texture}
1517 if $changed; 1547 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1518} 1548}
1519 1549
1520sub set_fontsize { 1550sub set_fontsize {
1521 my ($self, $fontsize) = @_; 1551 my ($self, $fontsize) = @_;
1522 1552
… …
1539 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1569 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1540 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1541 1571
1542 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1572 my $tex = new_from_layout CFClient::Texture $self->{layout};
1543 1573
1544 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1574 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1545 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1575 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1546 : ($self->{w} - $tex->{w}) * 0.5); 1576 : ($self->{w} - $tex->{w}) * 0.5);
1547 1577
1548 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1578 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1549 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1579 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1550 : ($self->{h} - $tex->{h}) * 0.5); 1580 : ($self->{h} - $tex->{h}) * 0.5);
1551 1581
1552 $tex 1582 $tex
1553 }; 1583 };
1554 1584
… …
1793 1823
1794sub new { 1824sub new {
1795 my $class = shift; 1825 my $class = shift;
1796 1826
1797 $class->SUPER::new ( 1827 $class->SUPER::new (
1798 padding => 4, 1828 padding_x => 4,
1829 padding_y => 4,
1799 fg => [1, 1, 1], 1830 fg => [1, 1, 1],
1800 active_fg => [0, 0, 1], 1831 active_fg => [0, 0, 1],
1801 can_hover => 1, 1832 can_hover => 1,
1802 align => 0, 1833 align => 0,
1803 valign => 0, 1834 valign => 0,
… …
1850 1881
1851sub new { 1882sub new {
1852 my $class = shift; 1883 my $class = shift;
1853 1884
1854 $class->SUPER::new ( 1885 $class->SUPER::new (
1855 padding => 2, 1886 padding_x => 2,
1887 padding_y => 2,
1856 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1857 active_fg => [1, 1, 0], 1889 active_fg => [1, 1, 0],
1858 bg => [0, 0, 0, 0.2], 1890 bg => [0, 0, 0, 0.2],
1859 active_bg => [1, 1, 1, 0.5], 1891 active_bg => [1, 1, 1, 0.5],
1860 state => 0, 1892 state => 0,
… …
1864} 1896}
1865 1897
1866sub size_request { 1898sub size_request {
1867 my ($self) = @_; 1899 my ($self) = @_;
1868 1900
1869 ($self->{padding} * 2 + 6) x 2 1901 (6) x 2
1870} 1902}
1871 1903
1872sub button_down { 1904sub button_down {
1873 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1874 1906
1875 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1876 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1877 $self->{state} = !$self->{state}; 1909 $self->{state} = !$self->{state};
1878 $self->_emit (changed => $self->{state}); 1910 $self->_emit (changed => $self->{state});
1879 } 1911 }
1880} 1912}
1881 1913
1882sub _draw { 1914sub _draw {
1883 my ($self) = @_; 1915 my ($self) = @_;
1884 1916
1885 $self->SUPER::_draw; 1917 $self->SUPER::_draw;
1886 1918
1887 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1919 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1888 1920
1889 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1921 my ($w, $h) = @$self{qw(w h)};
1922
1923 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1890 1924
1891 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1925 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1892 1926
1893 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1927 my $tex = $self->{state} ? $tex[1] : $tex[0];
1894 1928
… …
2159 fg => [1, 1, 1], 2193 fg => [1, 1, 1],
2160 active_fg => [0, 0, 0], 2194 active_fg => [0, 0, 0],
2161 bg => [0, 0, 0, 0.2], 2195 bg => [0, 0, 0, 0.2],
2162 active_bg => [1, 1, 1, 0.5], 2196 active_bg => [1, 1, 1, 0.5],
2163 range => [0, 0, 100, 10, 0], 2197 range => [0, 0, 100, 10, 0],
2164 req_w => $::WIDTH / 80, 2198 min_w => $::WIDTH / 80,
2165 req_h => $::WIDTH / 80, 2199 min_h => $::WIDTH / 80,
2166 vertical => 0, 2200 vertical => 0,
2167 can_hover => 1, 2201 can_hover => 1,
2168 inner_pad => 0.02, 2202 inner_pad => 0.02,
2169 @_ 2203 @_
2170 ); 2204 );
… …
2210} 2244}
2211 2245
2212sub size_request { 2246sub size_request {
2213 my ($self) = @_; 2247 my ($self) = @_;
2214 2248
2215 my $w = $self->{req_w}; 2249 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2250}
2220 2251
2221sub button_down { 2252sub button_down {
2222 my ($self, $ev, $x, $y) = @_; 2253 my ($self, $ev, $x, $y) = @_;
2223 2254
… …
2373 $self->{fontsize} = $fontsize; 2404 $self->{fontsize} = $fontsize;
2374 $self->reflow; 2405 $self->reflow;
2375} 2406}
2376 2407
2377sub size_allocate { 2408sub size_allocate {
2378 my ($self, $w, $h, $changed) = @_; 2409 my ($self, $w, $h) = @_;
2379 2410
2380 $self->SUPER::size_allocate ($w, $h, $changed); 2411 $self->SUPER::size_allocate ($w, $h);
2381
2382 return unless $changed;
2383 2412
2384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2413 $self->{layout}->set_font ($self->{font}) if $self->{font};
2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2414 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2386 $self->{layout}->set_width ($self->{children}[0]{w}); 2415 $self->{layout}->set_width ($self->{children}[0]{w});
2387 2416
… …
2610} 2639}
2611 2640
2612sub set_tooltip_from { 2641sub set_tooltip_from {
2613 my ($self, $widget) = @_; 2642 my ($self, $widget) = @_;
2614 2643
2644 my $tooltip = $widget->{tooltip};
2645
2646 if ($ENV{CFPLUS_DEBUG} & 2) {
2647 $tooltip .= "\n\n" . (ref $widget) . "\n"
2648 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2649 . "req $widget->{req_w} $widget->{req_h}\n"
2650 . "visible $widget->{visible}";
2651 }
2652
2615 $self->add (new CFClient::UI::Label 2653 $self->add (new CFClient::UI::Label
2616 markup => $widget->{tooltip}, 2654 markup => $tooltip,
2617 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2655 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2618 fontsize => 0.8, 2656 fontsize => 0.8,
2619 fg => [0, 0, 0, 1], 2657 fg => [0, 0, 0, 1],
2620 ellipsise => 0, 2658 ellipsise => 0,
2621 font => ($widget->{tooltip_font} || $::FONT_PROP), 2659 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2629 2667
2630 ($w + 4, $h + 4) 2668 ($w + 4, $h + 4)
2631} 2669}
2632 2670
2633sub size_allocate { 2671sub size_allocate {
2634 my ($self, $w, $h, $changed) = @_; 2672 my ($self, $w, $h) = @_;
2635 2673
2636 return unless $changed;
2637
2638 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2674 $self->SUPER::size_allocate ($w - 4, $h - 4);
2639} 2675}
2640 2676
2641sub visibility_change { 2677sub visibility_change {
2642 my ($self, $visible) = @_; 2678 my ($self, $visible) = @_;
2643 2679
… …
2650 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2686 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2651 2687
2652 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2688 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2653 if $x + $self->{w} > $::WIDTH; 2689 if $x + $self->{w} > $::WIDTH;
2654 2690
2655 $self->move ($x, $y); 2691 $self->move_abs ($x, $y);
2656 }); 2692 });
2657} 2693}
2658 2694
2659sub _draw { 2695sub _draw {
2660 my ($self) = @_; 2696 my ($self) = @_;
… …
2764 $self->SUPER::DESTROY; 2800 $self->SUPER::DESTROY;
2765} 2801}
2766 2802
2767############################################################################# 2803#############################################################################
2768 2804
2769package CFClient::UI::Inventory;
2770
2771our @ISA = CFClient::UI::ScrolledWindow::;
2772
2773sub new {
2774 my $class = shift;
2775
2776 my $self = $class->SUPER::new (
2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778 @_,
2779 );
2780
2781 $self
2782}
2783
2784sub set_items {
2785 my ($self, $items) = @_;
2786
2787 $self->{scrolled}->clear;
2788 return unless $items;
2789
2790 my @items = sort {
2791 ($a->{type} <=> $b->{type})
2792 or ($a->{name} cmp $b->{name})
2793 } @$items;
2794
2795 $self->{real_items} = \@items;
2796
2797 my $row = 0;
2798 for my $item (@items) {
2799 CFClient::Item::update_widgets $item;
2800
2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805 $row++;
2806 }
2807}
2808
2809#############################################################################
2810
2811package CFClient::UI::Menu; 2805package CFClient::UI::Menu;
2812 2806
2813our @ISA = CFClient::UI::FancyFrame::; 2807our @ISA = CFClient::UI::FancyFrame::;
2814 2808
2815use CFClient::OpenGL; 2809use CFClient::OpenGL;
… …
2853 # maybe save $GRAB? must be careful about events... 2847 # maybe save $GRAB? must be careful about events...
2854 $GRAB = $self; 2848 $GRAB = $self;
2855 $self->{button} = $ev->{button}; 2849 $self->{button} = $ev->{button};
2856 2850
2857 $self->show; 2851 $self->show;
2858 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2852 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2859} 2853}
2860 2854
2861sub mouse_motion { 2855sub mouse_motion {
2862 my ($self, $ev, $x, $y) = @_; 2856 my ($self, $ev, $x, $y) = @_;
2863 2857
… …
2988 $self->SUPER::reconfigure; 2982 $self->SUPER::reconfigure;
2989} 2983}
2990 2984
2991############################################################################# 2985#############################################################################
2992 2986
2987package CFClient::UI::Inventory;
2988
2989our @ISA = CFClient::UI::ScrolledWindow::;
2990
2991sub new {
2992 my $class = shift;
2993
2994 my $self = $class->SUPER::new (
2995 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2996 @_,
2997 );
2998
2999 $self
3000}
3001
3002sub set_items {
3003 my ($self, $items) = @_;
3004
3005 $self->{scrolled}->clear;
3006 return unless $items;
3007
3008 my @items = sort {
3009 ($a->{type} <=> $b->{type})
3010 or ($a->{name} cmp $b->{name})
3011 } @$items;
3012
3013 $self->{real_items} = \@items;
3014
3015 my $row = 0;
3016 for my $item (@items) {
3017 CFClient::Item::update_widgets $item;
3018
3019 $self->{scrolled}->add (0, $row, $item->{face_widget});
3020 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3021 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3022
3023 $row++;
3024 }
3025}
3026
3027#############################################################################
3028
3029package CFClient::UI::BindEditor;
3030
3031our @ISA = CFClient::UI::FancyFrame::;
3032
3033sub new {
3034 my $class = shift;
3035
3036 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3037
3038 $self->add (my $vb = new CFClient::UI::VBox);
3039
3040
3041 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3042 text => "start recording",
3043 tooltip => "Start/Stops recording of actions."
3044 ."All subsequent actions after the recording started will be captured."
3045 ."The actions are displayed after the record was stopped."
3046 ."To bind the action you have to click on the 'Bind' button",
3047 on_activate => sub {
3048 unless ($self->{recording}) {
3049 $self->start;
3050 } else {
3051 $self->stop;
3052 }
3053 });
3054
3055 $vb->add (new CFClient::UI::Label text => "Actions:");
3056 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3057
3058 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3059 $vb->add (my $hb = new CFClient::UI::HBox);
3060 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3061 $hb->add (new CFClient::UI::Button
3062 text => "bind",
3063 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3064 on_activate => sub {
3065 $self->ask_for_bind;
3066 });
3067
3068 $vb->add (my $hb = new CFClient::UI::HBox);
3069 $hb->add (new CFClient::UI::Button
3070 text => "ok",
3071 expand => 1,
3072 tooltip => "This closes the binding editor and saves the binding",
3073 on_activate => sub {
3074 $self->hide;
3075 $self->commit;
3076 });
3077
3078 $hb->add (new CFClient::UI::Button
3079 text => "cancel",
3080 expand => 1,
3081 tooltip => "This closes the binding editor without saving",
3082 on_activate => sub {
3083 $self->hide;
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 });
3087
3088 $self->update_binding_widgets;
3089
3090 $self
3091}
3092
3093sub commit {
3094 my ($self) = @_;
3095 my ($mod, $sym, $cmds) = $self->get_binding;
3096 if ($sym != 0 && @$cmds > 0) {
3097 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3098 ."'. Don't forget 'Save Config'!");
3099 $self->{binding_change}->($mod, $sym, $cmds)
3100 if $self->{binding_change};
3101 } else {
3102 $::STATUSBOX->add ("No action bound, no key or action specified!");
3103 $self->{binding_cancel}->()
3104 if $self->{binding_cancel};
3105 }
3106}
3107
3108sub start {
3109 my ($self) = @_;
3110
3111 $self->{rec_btn}->set_text ("stop recording");
3112 $self->{recording} = 1;
3113 $self->clear_command_list;
3114 $::CONN->start_record if $::CONN;
3115}
3116
3117sub stop {
3118 my ($self) = @_;
3119
3120 $self->{rec_btn}->set_text ("start recording");
3121 $self->{recording} = 0;
3122
3123 my $rec;
3124 $rec = $::CONN->stop_record if $::CONN;
3125 return unless ref $rec eq 'ARRAY';
3126 $self->set_command_list ($rec);
3127}
3128
3129# if $commit is true, the binding will be set after the user entered a key combo
3130sub ask_for_bind {
3131 my ($self, $commit) = @_;
3132
3133 CFClient::Binder::open_binding_dialog (sub {
3134 my ($mod, $sym) = @_;
3135 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3136 $self->update_binding_widgets;
3137 $self->commit if $commit;
3138 });
3139}
3140
3141# $mod and $sym are the modifiers and key symbol
3142# $cmds is a array ref of strings (the commands)
3143# $cb is the callback that is executed on OK
3144# $ccb is the callback that is executed on CANCEL and
3145# when the binding was unsuccessful on OK
3146sub set_binding {
3147 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3148
3149 $self->clear_command_list;
3150 $self->{recording} = 0;
3151 $self->{rec_btn}->set_text ("start recording");
3152
3153 $self->{binding} = [$mod, $sym];
3154 $self->{commands} = $cmds;
3155
3156 $self->{binding_change} = $cb;
3157 $self->{binding_cancel} = $ccb;
3158
3159 $self->update_binding_widgets;
3160}
3161
3162# this is a shortcut method that asks for a binding
3163# and then just binds it.
3164sub do_quick_binding {
3165 my ($self, $cmds) = @_;
3166 $self->set_binding (undef, undef, $cmds, sub {
3167 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3168 });
3169 $self->ask_for_bind (1);
3170}
3171
3172sub update_binding_widgets {
3173 my ($self) = @_;
3174 my ($mod, $sym, $cmds) = $self->get_binding;
3175 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3176 $self->set_command_list ($cmds);
3177}
3178
3179sub get_binding {
3180 my ($self) = @_;
3181 return (
3182 $self->{binding}->[0],
3183 $self->{binding}->[1],
3184 [ grep { defined $_ } @{$self->{commands}} ]
3185 );
3186}
3187
3188sub clear_command_list {
3189 my ($self) = @_;
3190 $self->{cmdbox}->clear ();
3191}
3192
3193sub set_command_list {
3194 my ($self, $cmds) = @_;
3195
3196 $self->{cmdbox}->clear ();
3197 $self->{commands} = $cmds;
3198
3199 my $idx = 0;
3200
3201 for (@$cmds) {
3202 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3203
3204 my $i = $idx;
3205 $hb->add (new CFClient::UI::Label text => $_);
3206 $hb->add (new CFClient::UI::Button
3207 text => "delete",
3208 tooltip => "Deletes the action from the record",
3209 on_activate => sub {
3210 $self->{cmdbox}->remove ($hb);
3211 $cmds->[$i] = undef;
3212 });
3213
3214
3215 $idx++
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::SpellList;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (new CFClient::UI::ScrolledWindow
3231 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3232
3233 $self;
3234}
3235
3236# XXX: Do sorting? Argl...
3237sub add_spell {
3238 my ($self, $spell) = @_;
3239 $self->{spells}->{$spell->{name}} = $spell;
3240
3241 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3242 face => $spell->{face},
3243 can_hover => 1,
3244 can_events => 1,
3245 tooltip => $spell->{message});
3246
3247 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3248 text => $spell->{name},
3249 can_hover => 1,
3250 can_events => 1,
3251 tooltip => $spell->{message},
3252 expand => 1);
3253
3254 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3255 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3256 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3257 expand => 1);
3258
3259 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3260 text => "bind to key",
3261 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3262}
3263
3264sub rebuild_spell_list {
3265 my ($self) = @_;
3266 $self->{tbl_idx} = 0;
3267 $self->add_spell ($_) for values %{$self->{spells}};
3268}
3269
3270sub remove_spell {
3271 my ($self, $spell) = @_;
3272 delete $self->{spells}->{$spell->{name}};
3273 $self->rebuild_spell_list;
3274}
3275
3276#############################################################################
3277
2993package CFClient::UI::Root; 3278package CFClient::UI::Root;
2994 3279
2995our @ISA = CFClient::UI::Container::; 3280our @ISA = CFClient::UI::Container::;
2996 3281
2997use CFClient::OpenGL; 3282use CFClient::OpenGL;
… …
3007 Scalar::Util::weaken ($self->{root} = $self); 3292 Scalar::Util::weaken ($self->{root} = $self);
3008 3293
3009 $self 3294 $self
3010} 3295}
3011 3296
3012sub configure {
3013 my ($self, $x, $y, $w, $h) = @_;
3014
3015 $self->{w} = $w;
3016 $self->{h} = $h;
3017}
3018
3019sub reconfigure {
3020 my ($self) = @_;
3021
3022 $self->SUPER::reconfigure;
3023
3024 $self->size_allocate ($self->{w}, $self->{h}, 1)
3025 if $self->{w};
3026}
3027
3028sub size_request { 3297sub size_request {
3029 my ($self) = @_; 3298 my ($self) = @_;
3030 3299
3031 ($self->{w}, $self->{h}) 3300 ($self->{w}, $self->{h})
3032} 3301}
3033 3302
3303sub _to_pixel {
3304 my ($coord, $size, $max) = @_;
3305
3306 $coord =
3307 $coord eq "center" ? ($max - $size) * 0.5
3308 : $coord eq "max" ? $max
3309 : $coord;
3310
3311 $coord = 0 if $coord < 0;
3312 $coord = $max - $size if $coord > $max - $size;
3313
3314 int $coord + 0.5
3315}
3316
3034sub size_allocate { 3317sub size_allocate {
3035 my ($self, $w, $h, $changed) = @_; 3318 my ($self, $w, $h) = @_;
3036 3319
3037 for my $child ($self->children) { 3320 for my $child ($self->children) {
3038 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3321 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3039 3322
3040 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3323 $X = $child->{force_x} if exists $child->{force_x};
3041 if exists $child->{req_x}; 3324 $Y = $child->{force_y} if exists $child->{force_y};
3042 3325
3043 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3326 $X = _to_pixel $X, $W, $self->{w};
3044 if exists $child->{req_y}; 3327 $Y = _to_pixel $Y, $H, $self->{h};
3045
3046 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3047
3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050 3328
3051 $child->configure ($X, $Y, $W, $H); 3329 $child->configure ($X, $Y, $W, $H);
3052 } 3330 }
3053} 3331}
3054 3332
… …
3071} 3349}
3072 3350
3073sub add { 3351sub add {
3074 my ($self, @children) = @_; 3352 my ($self, @children) = @_;
3075 3353
3076 for my $child (@children) {
3077 $child->{is_toplevel} = 1; 3354 $_->{is_toplevel} = 1
3078 3355 for @children;
3079 # integerise window positions
3080 $child->{x} = int $child->{x};
3081 $child->{y} = int $child->{y};
3082 }
3083 3356
3084 $self->SUPER::add (@children); 3357 $self->SUPER::add (@children);
3085} 3358}
3086 3359
3087sub remove { 3360sub remove {
3088 my ($self, @children) = @_; 3361 my ($self, @children) = @_;
3089 3362
3090 $self->SUPER::remove (@children); 3363 $self->SUPER::remove (@children);
3364
3365 delete $self->{is_toplevel}
3366 for @children;
3091 3367
3092 while (@children) { 3368 while (@children) {
3093 my $w = pop @children; 3369 my $w = pop @children;
3094 push @children, $w->children; 3370 push @children, $w->children;
3095 $w->set_invisible; 3371 $w->set_invisible;
… …
3115 $_->() 3391 $_->()
3116 for values %{delete $self->{refresh_hook}}; 3392 for values %{delete $self->{refresh_hook}};
3117 } 3393 }
3118 3394
3119 if ($self->{realloc}) { 3395 if ($self->{realloc}) {
3396 my %queue;
3120 my @queue; 3397 my @queue;
3398 my $widget;
3121 3399
3400 outer:
3122 while () { 3401 while () {
3123 if ($self->{realloc}) { 3402 if (my $realloc = delete $self->{realloc}) {
3124 #TODO use array-of-depth approach 3403 for $widget (values %$realloc) {
3404 $widget->{visible} or next; # do not resize invisible widgets
3125 3405
3126 @queue = sort { $a->{visible} <=> $b->{visible} } 3406 $queue{$widget+0}++ and next; # duplicates are common
3127 @queue, values %{delete $self->{realloc}}; 3407
3408 push @{ $queue[$widget->{visible}] }, $widget;
3409 }
3128 } 3410 }
3129 3411
3412 while () {
3413 @queue or last outer;
3414
3415 $widget = pop @{ $queue[-1] || [] }
3416 and last;
3417
3418 pop @queue;
3419 }
3420
3421 delete $queue{$widget+0};
3422
3423 my ($w, $h) = $widget->size_request;
3424
3425 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3426 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3427
3428 $w = $widget->{force_w} if exists $widget->{force_w};
3429 $h = $widget->{force_h} if exists $widget->{force_h};
3430
3431 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3432 || delete $widget->{force_realloc}) {
3433 $widget->{req_w} = $w;
3434 $widget->{req_h} = $h;
3435
3436 $self->{size_alloc}{$widget+0} = $widget;
3437
3438 if (my $parent = $widget->{parent}) {
3439 $self->{realloc}{$parent+0} = $parent
3440 unless $queue{$parent+0};
3441
3442 $parent->{force_size_alloc} = 1;
3443 $self->{size_alloc}{$parent+0} = $parent;
3444 }
3445 }
3446
3447 delete $self->{realloc}{$widget+0};
3448 }
3449 }
3450
3451 while (my $size_alloc = delete $self->{size_alloc}) {
3452 my @queue = sort { $b->{visible} <=> $a->{visible} }
3453 values %$size_alloc;
3454
3455 while () {
3130 my $widget = pop @queue || last; 3456 my $widget = pop @queue || last;
3131 3457
3132 $widget->{visible} or last; # do not resize invisible widgets 3458 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3133
3134 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3135 ? @$widget{qw(def_w def_h)}
3136 : $widget->size_request;
3137
3138 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3139
3140 $widget->{req_w} = $w;
3141 $widget->{req_h} = $h;
3142
3143 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3144
3145 push @queue, $widget->{parent}
3146 if $widget->{parent};
3147 }
3148 }
3149
3150 while (my $size_alloc = delete $self->{size_alloc}) {
3151 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3152 values %$size_alloc;
3153
3154 while () {
3155 my ($widget, $w, $h) = @{ pop @queue or last };
3156 3459
3157 $w = 0 if $w < 0; 3460 $w = 0 if $w < 0;
3158 $h = 0 if $h < 0; 3461 $h = 0 if $h < 0;
3159 3462
3160 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3463 $w = int $w + 0.5;
3464 $h = int $h + 0.5;
3161 3465
3466 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3467 $widget->{old_w} = $widget->{w};
3468 $widget->{old_h} = $widget->{h};
3469
3162 $widget->{w} = $w; 3470 $widget->{w} = $w;
3163 $widget->{h} = $h; 3471 $widget->{h} = $h;
3164 3472
3165 $widget->emit (size_allocate => $w, $h, $changed); 3473 $widget->emit (size_allocate => $w, $h);
3474 }
3166 } 3475 }
3167 } 3476 }
3168 3477
3169 while ($self->{post_alloc_hook}) { 3478 while ($self->{post_alloc_hook}) {
3170 $_->() 3479 $_->()
3171 for values %{delete $self->{post_alloc_hook}}; 3480 for values %{delete $self->{post_alloc_hook}};
3172 } 3481 }
3482
3173 3483
3174 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3484 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3175 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3485 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3176 glClear GL_COLOR_BUFFER_BIT; 3486 glClear GL_COLOR_BUFFER_BIT;
3177 3487
… …
3179 glLoadIdentity; 3489 glLoadIdentity;
3180 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3490 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3181 glMatrixMode GL_MODELVIEW; 3491 glMatrixMode GL_MODELVIEW;
3182 glLoadIdentity; 3492 glLoadIdentity;
3183 3493
3494 {
3495 package CFClient::UI::Base;
3496
3497 ($draw_x, $draw_y, $draw_w, $draw_h) =
3498 (0, 0, $self->{w}, $self->{h});
3499 }
3500
3184 $self->_draw; 3501 $self->_draw;
3185} 3502}
3186 3503
3187############################################################################# 3504#############################################################################
3188 3505

Diff Legend

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