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.253 by root, Sun May 28 23:28:12 2006 UTC vs.
Revision 1.268 by root, Thu Jun 1 05:04:41 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} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $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} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $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 # update screen rectangle
535 local $draw_x = $draw_x + $self->{x};
536 local $draw_y = $draw_y + $self->{y};
537 local $draw_w = $draw_x + $self->{w};
538 local $draw_h = $draw_y + $self->{h};
539
540 # skip widgets that are entirely outside the drawing area
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
517 543
518 glPushMatrix; 544 glPushMatrix;
519 glTranslate $self->{x}, $self->{y}, 0; 545 glTranslate $self->{x}, $self->{y}, 0;
520 $self->_draw; 546 $self->_draw;
521 glPopMatrix; 547 glPopMatrix;
… …
533 glVertex $x , $y + $self->{h}; 559 glVertex $x , $y + $self->{h};
534 glEnd; 560 glEnd;
535 glDisable GL_BLEND; 561 glDisable GL_BLEND;
536 } 562 }
537 563
538 if ($ENV{PCLIENT_DEBUG}) { 564 if ($ENV{CFPLUS_DEBUG} & 1) {
539 glPushMatrix; 565 glPushMatrix;
540 glColor 1, 1, 0, 1; 566 glColor 1, 1, 0, 1;
541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
542 glBegin GL_LINE_LOOP; 568 glBegin GL_LINE_LOOP;
543 glVertex 0 , 0; 569 glVertex 0 , 0;
… …
619 my ($class, %arg) = @_; 645 my ($class, %arg) = @_;
620 $class->SUPER::new (can_events => 0, %arg); 646 $class->SUPER::new (can_events => 0, %arg);
621} 647}
622 648
623sub size_request { 649sub size_request {
624 (0, 0) 650 my ($self) = @_;
651
652 ($self->{w} + 0, $self->{h} + 0)
625} 653}
626 654
627sub draw { } 655sub draw { }
628 656
629############################################################################# 657#############################################################################
… …
750sub size_request { 778sub size_request {
751 $_[0]{children}[0]->size_request 779 $_[0]{children}[0]->size_request
752} 780}
753 781
754sub size_allocate { 782sub size_allocate {
755 my ($self, $w, $h, $changed) = @_; 783 my ($self, $w, $h) = @_;
756 784
757 $self->{children}[0]->configure (0, 0, $w, $h); 785 $self->{children}[0]->configure (0, 0, $w, $h);
758} 786}
759 787
760############################################################################# 788#############################################################################
… …
777 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 805 $ROOT->on_post_alloc ($self => sub { $self->render_child });
778 $self->SUPER::update; 806 $self->SUPER::update;
779} 807}
780 808
781sub size_allocate { 809sub size_allocate {
782 my ($self, $w, $h, $changed) = @_; 810 my ($self, $w, $h) = @_;
783 811
784 $self->SUPER::size_allocate ($w, $h, $changed); 812 $self->SUPER::size_allocate ($w, $h);
785 $self->update 813 $self->update;
786 if $changed;
787} 814}
788 815
789sub _render { 816sub _render {
817 my ($self) = @_;
818
790 $_[0]{children}[0]->draw; 819 $self->{children}[0]->draw;
791} 820}
792 821
793sub render_child { 822sub render_child {
794 my ($self) = @_; 823 my ($self) = @_;
795 824
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 825 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 826 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 827 glClear GL_COLOR_BUFFER_BIT;
799 828
829 {
830 package CFClient::UI::Base;
831
832 ($draw_x, $draw_y, $draw_w, $draw_h) =
833 (0, 0, $self->{w}, $self->{h});
834 }
835
800 $self->_render; 836 $self->_render;
801 }; 837 };
802} 838}
803 839
804sub _draw { 840sub _draw {
805 my ($self) = @_; 841 my ($self) = @_;
806 842
807 my ($w, $h) = ($self->w, $self->h); 843 my ($w, $h) = @$self{qw(w h)};
808 844
809 my $tex = $self->{texture} 845 my $tex = $self->{texture}
810 or return; 846 or return;
811 847
812 glEnable GL_TEXTURE_2D; 848 glEnable GL_TEXTURE_2D;
… …
835} 871}
836 872
837sub size_request { 873sub size_request {
838 my ($self) = @_; 874 my ($self) = @_;
839 875
840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 876 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 877
842 $w = 10 if $self->{scroll_x}; 878 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y}; 879 $h = 10 if $self->{scroll_y};
844 880
845 ($w, $h) 881 ($w, $h)
846} 882}
847 883
848sub size_allocate { 884sub size_allocate {
849 my ($self, $w, $h, $changed) = @_; 885 my ($self, $w, $h) = @_;
850 886
887 my $child = $self->child;
888
851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853 891
854 $self->child->configure (0, 0, $w, $h); 892 $self->child->configure (0, 0, $w, $h);
855 $self->update; 893 $self->update;
856} 894}
857 895
… …
892 } 930 }
893} 931}
894 932
895sub _render { 933sub _render {
896 my ($self) = @_; 934 my ($self) = @_;
935
936 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
937 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
897 938
898 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 939 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899 940
900 $self->SUPER::_render; 941 $self->SUPER::_render;
901} 942}
… …
941 my $child = $self->{vp}->child; 982 my $child = $self->{vp}->child;
942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 983 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943} 984}
944 985
945sub size_allocate { 986sub size_allocate {
946 my ($self, $w, $h, $changed) = @_; 987 my ($self, $w, $h) = @_;
947 988
948 $self->SUPER::size_allocate ($w, $h, $changed); 989 $self->SUPER::size_allocate ($w, $h);
949 990
950 my $child = $self->{vp}->child; 991 my $child = $self->{vp}->child;
951 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
952} 993}
953 994
… …
1000 1041
1001our @ISA = CFClient::UI::Bin::; 1042our @ISA = CFClient::UI::Bin::;
1002 1043
1003use CFClient::OpenGL; 1044use CFClient::OpenGL;
1004 1045
1005my @tex = 1046my $bg =
1047 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1048 mipmap => 1, wrap => 1;
1049
1050my @border =
1006 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1051 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); 1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1008 1053
1009sub new { 1054sub new {
1010 my $class = shift; 1055 my $class = shift;
1011 1056
1012 my $self = $class->SUPER::new ( 1057 my $self = $class->SUPER::new (
1013 bg => [1, 1, 1, 1], 1058 bg => [1, 1, 1, 1],
1014 border_bg => [1, 1, 1, 1], 1059 border_bg => [1, 1, 1, 1],
1015 border => 0.6, 1060 border => 0.6,
1016 is_toplevel => 1,
1017 can_events => 1, 1061 can_events => 1,
1062 min_w => 16,
1063 min_h => 16,
1018 @_ 1064 @_
1019 ); 1065 );
1020 1066
1021 $self->{title} &&= new CFClient::UI::Label 1067 $self->{title} &&= new CFClient::UI::Label
1022 align => 0, 1068 align => 0,
… …
1041 $h + $self->border * 2, 1087 $h + $self->border * 2,
1042 ) 1088 )
1043} 1089}
1044 1090
1045sub size_allocate { 1091sub size_allocate {
1046 my ($self, $w, $h, $changed) = @_; 1092 my ($self, $w, $h) = @_;
1047
1048 return unless $changed;
1049 1093
1050 $h -= List::Util::max 0, $self->border * 2; 1094 $h -= List::Util::max 0, $self->border * 2;
1051 $w -= List::Util::max 0, $self->border * 2; 1095 $w -= List::Util::max 0, $self->border * 2;
1052 1096
1053 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1097 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1077 my ($ev, $x, $y) = @_; 1121 my ($ev, $x, $y) = @_;
1078 1122
1079 my $dx = $ev->{x} - $ox; 1123 my $dx = $ev->{x} - $ox;
1080 my $dy = $ev->{y} - $oy; 1124 my $dy = $ev->{y} - $oy;
1081 1125
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1126 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1127 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1086 $self->move ($self->{user_x}, $self->{user_y}); 1128
1087 $self->realloc; 1129 $self->realloc;
1130 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1088 }; 1131 };
1089 1132
1090 } elsif ($lr ^ $td) { 1133 } elsif ($lr ^ $td) {
1091 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1134 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1092 my ($bx, $by) = ($self->{x}, $self->{y}); 1135 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1094 $self->{motion} = sub { 1137 $self->{motion} = sub {
1095 my ($ev, $x, $y) = @_; 1138 my ($ev, $x, $y) = @_;
1096 1139
1097 ($x, $y) = ($ev->{x}, $ev->{y}); 1140 ($x, $y) = ($ev->{x}, $ev->{y});
1098 1141
1099 $self->{user_x} = $bx + $x - $ox; 1142 $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 }; 1143 };
1105 } 1144 }
1106} 1145}
1107 1146
1108sub button_up { 1147sub button_up {
… …
1127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1128 1167
1129 my $border = $self->border; 1168 my $border = $self->border;
1130 1169
1131 glColor @{ $self->{border_bg} }; 1170 glColor @{ $self->{border_bg} };
1132 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1171 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1133 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1172 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1134 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1173 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1135 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1174 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1136 1175
1137 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1176 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1138 my $bg = $tex[0]; 1177 glColor @{ $self->{bg} };
1139 1178
1140 # TODO: repeat texture not scale 1179 # TODO: repeat texture not scale
1180 # solve this better(?)
1141 my $rep_x = $cw / $bg->{w}; 1181 $bg->{s} = $cw / $bg->{w};
1142 my $rep_y = $ch / $bg->{h}; 1182 $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); 1183 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1150 } 1184 }
1151 1185
1152 glDisable GL_TEXTURE_2D; 1186 glDisable GL_TEXTURE_2D;
1153 1187
… …
1235 (sum @$hs), 1269 (sum @$hs),
1236 ) 1270 )
1237} 1271}
1238 1272
1239sub size_allocate { 1273sub size_allocate {
1240 my ($self, $w, $h, $changed) = @_; 1274 my ($self, $w, $h) = @_;
1241 1275
1242 my ($ws, $hs) = $self->get_wh; 1276 my ($ws, $hs) = $self->get_wh;
1243 1277
1244 my $req_w = (sum @$ws) || 1; 1278 my $req_w = (sum @$ws) || 1;
1245 my $req_h = (sum @$hs) || 1; 1279 my $req_h = (sum @$hs) || 1;
… …
1323 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1357 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1324 ) 1358 )
1325} 1359}
1326 1360
1327sub size_allocate { 1361sub size_allocate {
1328 my ($self, $w, $h, $changed) = @_; 1362 my ($self, $w, $h) = @_;
1329 1363
1330 my $space = $self->{vertical} ? $h : $w; 1364 my $space = $self->{vertical} ? $h : $w;
1331 my $children = $self->{children}; 1365 my $children = $self->{children};
1332 1366
1333 my @req; 1367 my @req;
… …
1416 ellipsise => 3, # end 1450 ellipsise => 3, # end
1417 layout => (new CFClient::Layout), 1451 layout => (new CFClient::Layout),
1418 fontsize => 1, 1452 fontsize => 1,
1419 align => -1, 1453 align => -1,
1420 valign => -1, 1454 valign => -1,
1421 padding => 2, 1455 padding_x => 2,
1456 padding_y => 2,
1422 can_events => 0, 1457 can_events => 0,
1423 %arg 1458 %arg
1424 ); 1459 );
1425 1460
1426 if (exists $self->{template}) { 1461 if (exists $self->{template}) {
… …
1502 1537
1503 $w = List::Util::max $w, $w2; 1538 $w = List::Util::max $w, $w2;
1504 $h = List::Util::max $h, $h2; 1539 $h = List::Util::max $h, $h2;
1505 } 1540 }
1506 1541
1507 ( 1542 ($w, $h)
1508 $w + $self->{padding} * 2,
1509 $h + $self->{padding} * 2,
1510 )
1511} 1543}
1512 1544
1513sub size_allocate { 1545sub size_allocate {
1514 my ($self, $w, $h, $changed) = @_; 1546 my ($self, $w, $h) = @_;
1515 1547
1516 delete $self->{texture} 1548 delete $self->{texture}
1517 if $changed; 1549 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1518} 1550}
1519 1551
1520sub set_fontsize { 1552sub set_fontsize {
1521 my ($self, $fontsize) = @_; 1553 my ($self, $fontsize) = @_;
1522 1554
… …
1539 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1571 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1540 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1572 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1541 1573
1542 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1574 my $tex = new_from_layout CFClient::Texture $self->{layout};
1543 1575
1544 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1576 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1545 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1577 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1546 : ($self->{w} - $tex->{w}) * 0.5); 1578 : ($self->{w} - $tex->{w}) * 0.5);
1547 1579
1548 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1580 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1549 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1581 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1550 : ($self->{h} - $tex->{h}) * 0.5); 1582 : ($self->{h} - $tex->{h}) * 0.5);
1551 1583
1552 $tex 1584 $tex
1553 }; 1585 };
1554 1586
… …
1793 1825
1794sub new { 1826sub new {
1795 my $class = shift; 1827 my $class = shift;
1796 1828
1797 $class->SUPER::new ( 1829 $class->SUPER::new (
1798 padding => 4, 1830 padding_x => 4,
1831 padding_y => 4,
1799 fg => [1, 1, 1], 1832 fg => [1, 1, 1],
1800 active_fg => [0, 0, 1], 1833 active_fg => [0, 0, 1],
1801 can_hover => 1, 1834 can_hover => 1,
1802 align => 0, 1835 align => 0,
1803 valign => 0, 1836 valign => 0,
… …
1850 1883
1851sub new { 1884sub new {
1852 my $class = shift; 1885 my $class = shift;
1853 1886
1854 $class->SUPER::new ( 1887 $class->SUPER::new (
1855 padding => 2, 1888 padding_x => 2,
1889 padding_y => 2,
1856 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1857 active_fg => [1, 1, 0], 1891 active_fg => [1, 1, 0],
1858 bg => [0, 0, 0, 0.2], 1892 bg => [0, 0, 0, 0.2],
1859 active_bg => [1, 1, 1, 0.5], 1893 active_bg => [1, 1, 1, 0.5],
1860 state => 0, 1894 state => 0,
… …
1864} 1898}
1865 1899
1866sub size_request { 1900sub size_request {
1867 my ($self) = @_; 1901 my ($self) = @_;
1868 1902
1869 ($self->{padding} * 2 + 6) x 2 1903 (6) x 2
1870} 1904}
1871 1905
1872sub button_down { 1906sub button_down {
1873 my ($self, $ev, $x, $y) = @_; 1907 my ($self, $ev, $x, $y) = @_;
1874 1908
1875 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1909 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1876 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1910 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1877 $self->{state} = !$self->{state}; 1911 $self->{state} = !$self->{state};
1878 $self->_emit (changed => $self->{state}); 1912 $self->_emit (changed => $self->{state});
1879 } 1913 }
1880} 1914}
1881 1915
1882sub _draw { 1916sub _draw {
1883 my ($self) = @_; 1917 my ($self) = @_;
1884 1918
1885 $self->SUPER::_draw; 1919 $self->SUPER::_draw;
1886 1920
1887 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1921 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1888 1922
1889 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1923 my ($w, $h) = @$self{qw(w h)};
1924
1925 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1890 1926
1891 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1927 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1892 1928
1893 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1929 my $tex = $self->{state} ? $tex[1] : $tex[0];
1894 1930
… …
2159 fg => [1, 1, 1], 2195 fg => [1, 1, 1],
2160 active_fg => [0, 0, 0], 2196 active_fg => [0, 0, 0],
2161 bg => [0, 0, 0, 0.2], 2197 bg => [0, 0, 0, 0.2],
2162 active_bg => [1, 1, 1, 0.5], 2198 active_bg => [1, 1, 1, 0.5],
2163 range => [0, 0, 100, 10, 0], 2199 range => [0, 0, 100, 10, 0],
2164 req_w => $::WIDTH / 80, 2200 min_w => $::WIDTH / 80,
2165 req_h => $::WIDTH / 80, 2201 min_h => $::WIDTH / 80,
2166 vertical => 0, 2202 vertical => 0,
2167 can_hover => 1, 2203 can_hover => 1,
2168 inner_pad => 0.02, 2204 inner_pad => 0.02,
2169 @_ 2205 @_
2170 ); 2206 );
… …
2210} 2246}
2211 2247
2212sub size_request { 2248sub size_request {
2213 my ($self) = @_; 2249 my ($self) = @_;
2214 2250
2215 my $w = $self->{req_w}; 2251 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2252}
2220 2253
2221sub button_down { 2254sub button_down {
2222 my ($self, $ev, $x, $y) = @_; 2255 my ($self, $ev, $x, $y) = @_;
2223 2256
… …
2373 $self->{fontsize} = $fontsize; 2406 $self->{fontsize} = $fontsize;
2374 $self->reflow; 2407 $self->reflow;
2375} 2408}
2376 2409
2377sub size_allocate { 2410sub size_allocate {
2378 my ($self, $w, $h, $changed) = @_; 2411 my ($self, $w, $h) = @_;
2379 2412
2380 $self->SUPER::size_allocate ($w, $h, $changed); 2413 $self->SUPER::size_allocate ($w, $h);
2381
2382 return unless $changed;
2383 2414
2384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2415 $self->{layout}->set_font ($self->{font}) if $self->{font};
2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2416 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2386 $self->{layout}->set_width ($self->{children}[0]{w}); 2417 $self->{layout}->set_width ($self->{children}[0]{w});
2387 2418
… …
2610} 2641}
2611 2642
2612sub set_tooltip_from { 2643sub set_tooltip_from {
2613 my ($self, $widget) = @_; 2644 my ($self, $widget) = @_;
2614 2645
2646 my $tooltip = $widget->{tooltip};
2647
2648 if ($ENV{CFPLUS_DEBUG} & 2) {
2649 $tooltip .= "\n\n" . (ref $widget) . "\n"
2650 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2651 . "req $widget->{req_w} $widget->{req_h}\n"
2652 . "visible $widget->{visible}";
2653 }
2654
2615 $self->add (new CFClient::UI::Label 2655 $self->add (new CFClient::UI::Label
2616 markup => $widget->{tooltip}, 2656 markup => $tooltip,
2617 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2657 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2618 fontsize => 0.8, 2658 fontsize => 0.8,
2619 fg => [0, 0, 0, 1], 2659 fg => [0, 0, 0, 1],
2620 ellipsise => 0, 2660 ellipsise => 0,
2621 font => ($widget->{tooltip_font} || $::FONT_PROP), 2661 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2629 2669
2630 ($w + 4, $h + 4) 2670 ($w + 4, $h + 4)
2631} 2671}
2632 2672
2633sub size_allocate { 2673sub size_allocate {
2634 my ($self, $w, $h, $changed) = @_; 2674 my ($self, $w, $h) = @_;
2635 2675
2636 return unless $changed;
2637
2638 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2676 $self->SUPER::size_allocate ($w - 4, $h - 4);
2639} 2677}
2640 2678
2641sub visibility_change { 2679sub visibility_change {
2642 my ($self, $visible) = @_; 2680 my ($self, $visible) = @_;
2643 2681
2644 return unless $visible; 2682 return unless $visible;
2645 2683
2646 $self->{root}->on_post_alloc ("move_$self" => sub { 2684 $self->{root}->on_post_alloc ("move_$self" => sub {
2647 my $widget = $self->{owner}; 2685 my $widget = $self->{owner}
2686 or return;
2648 2687
2649 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2688 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2650 2689
2651 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2690 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2652 if $x + $self->{w} > $::WIDTH; 2691 if $x + $self->{w} > $::WIDTH;
2653 2692
2654 $self->move ($x, $y); 2693 $self->move_abs ($x, $y);
2655 }); 2694 });
2656} 2695}
2657 2696
2658sub _draw { 2697sub _draw {
2659 my ($self) = @_; 2698 my ($self) = @_;
… …
2763 $self->SUPER::DESTROY; 2802 $self->SUPER::DESTROY;
2764} 2803}
2765 2804
2766############################################################################# 2805#############################################################################
2767 2806
2768package CFClient::UI::Inventory;
2769
2770our @ISA = CFClient::UI::ScrolledWindow::;
2771
2772sub new {
2773 my $class = shift;
2774
2775 my $self = $class->SUPER::new (
2776 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2777 @_,
2778 );
2779
2780 $self
2781}
2782
2783sub set_items {
2784 my ($self, $items) = @_;
2785
2786 $self->{scrolled}->clear;
2787 return unless $items;
2788
2789 my @items = sort {
2790 ($a->{type} <=> $b->{type})
2791 or ($a->{name} cmp $b->{name})
2792 } @$items;
2793
2794 $self->{real_items} = \@items;
2795
2796 my $row = 0;
2797 for my $item (@items) {
2798 CFClient::Item::update_widgets $item;
2799
2800 $self->{scrolled}->add (0, $row, $item->{face_widget});
2801 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2802 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2803
2804 $row++;
2805 }
2806}
2807
2808#############################################################################
2809
2810package CFClient::UI::Menu; 2807package CFClient::UI::Menu;
2811 2808
2812our @ISA = CFClient::UI::FancyFrame::; 2809our @ISA = CFClient::UI::FancyFrame::;
2813 2810
2814use CFClient::OpenGL; 2811use CFClient::OpenGL;
… …
2852 # maybe save $GRAB? must be careful about events... 2849 # maybe save $GRAB? must be careful about events...
2853 $GRAB = $self; 2850 $GRAB = $self;
2854 $self->{button} = $ev->{button}; 2851 $self->{button} = $ev->{button};
2855 2852
2856 $self->show; 2853 $self->show;
2857 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2854 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2858} 2855}
2859 2856
2860sub mouse_motion { 2857sub mouse_motion {
2861 my ($self, $ev, $x, $y) = @_; 2858 my ($self, $ev, $x, $y) = @_;
2862 2859
… …
2987 $self->SUPER::reconfigure; 2984 $self->SUPER::reconfigure;
2988} 2985}
2989 2986
2990############################################################################# 2987#############################################################################
2991 2988
2989package CFClient::UI::Inventory;
2990
2991our @ISA = CFClient::UI::ScrolledWindow::;
2992
2993sub new {
2994 my $class = shift;
2995
2996 my $self = $class->SUPER::new (
2997 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2998 @_,
2999 );
3000
3001 $self
3002}
3003
3004sub set_items {
3005 my ($self, $items) = @_;
3006
3007 $self->{scrolled}->clear;
3008 return unless $items;
3009
3010 my @items = sort {
3011 ($a->{type} <=> $b->{type})
3012 or ($a->{name} cmp $b->{name})
3013 } @$items;
3014
3015 $self->{real_items} = \@items;
3016
3017 my $row = 0;
3018 for my $item (@items) {
3019 CFClient::Item::update_widgets $item;
3020
3021 $self->{scrolled}->add (0, $row, $item->{face_widget});
3022 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3023 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3024
3025 $row++;
3026 }
3027}
3028
3029#############################################################################
3030
3031package CFClient::UI::BindEditor;
3032
3033our @ISA = CFClient::UI::FancyFrame::;
3034
3035sub new {
3036 my $class = shift;
3037
3038 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3039
3040 $self->add (my $vb = new CFClient::UI::VBox);
3041
3042
3043 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3044 text => "start recording",
3045 tooltip => "Start/Stops recording of actions."
3046 ."All subsequent actions after the recording started will be captured."
3047 ."The actions are displayed after the record was stopped."
3048 ."To bind the action you have to click on the 'Bind' button",
3049 on_activate => sub {
3050 unless ($self->{recording}) {
3051 $self->start;
3052 } else {
3053 $self->stop;
3054 }
3055 });
3056
3057 $vb->add (new CFClient::UI::Label text => "Actions:");
3058 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3059
3060 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3061 $vb->add (my $hb = new CFClient::UI::HBox);
3062 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3063 $hb->add (new CFClient::UI::Button
3064 text => "bind",
3065 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3066 on_activate => sub {
3067 $self->ask_for_bind;
3068 });
3069
3070 $vb->add (my $hb = new CFClient::UI::HBox);
3071 $hb->add (new CFClient::UI::Button
3072 text => "ok",
3073 expand => 1,
3074 tooltip => "This closes the binding editor and saves the binding",
3075 on_activate => sub {
3076 $self->hide;
3077 $self->commit;
3078 });
3079
3080 $hb->add (new CFClient::UI::Button
3081 text => "cancel",
3082 expand => 1,
3083 tooltip => "This closes the binding editor without saving",
3084 on_activate => sub {
3085 $self->hide;
3086 $self->{binding_cancel}->()
3087 if $self->{binding_cancel};
3088 });
3089
3090 $self->update_binding_widgets;
3091
3092 $self
3093}
3094
3095sub commit {
3096 my ($self) = @_;
3097 my ($mod, $sym, $cmds) = $self->get_binding;
3098 if ($sym != 0 && @$cmds > 0) {
3099 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3100 ."'. Don't forget 'Save Config'!");
3101 $self->{binding_change}->($mod, $sym, $cmds)
3102 if $self->{binding_change};
3103 } else {
3104 $::STATUSBOX->add ("No action bound, no key or action specified!");
3105 $self->{binding_cancel}->()
3106 if $self->{binding_cancel};
3107 }
3108}
3109
3110sub start {
3111 my ($self) = @_;
3112
3113 $self->{rec_btn}->set_text ("stop recording");
3114 $self->{recording} = 1;
3115 $self->clear_command_list;
3116 $::CONN->start_record if $::CONN;
3117}
3118
3119sub stop {
3120 my ($self) = @_;
3121
3122 $self->{rec_btn}->set_text ("start recording");
3123 $self->{recording} = 0;
3124
3125 my $rec;
3126 $rec = $::CONN->stop_record if $::CONN;
3127 return unless ref $rec eq 'ARRAY';
3128 $self->set_command_list ($rec);
3129}
3130
3131# if $commit is true, the binding will be set after the user entered a key combo
3132sub ask_for_bind {
3133 my ($self, $commit) = @_;
3134
3135 CFClient::Binder::open_binding_dialog (sub {
3136 my ($mod, $sym) = @_;
3137 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3138 $self->update_binding_widgets;
3139 $self->commit if $commit;
3140 });
3141}
3142
3143# $mod and $sym are the modifiers and key symbol
3144# $cmds is a array ref of strings (the commands)
3145# $cb is the callback that is executed on OK
3146# $ccb is the callback that is executed on CANCEL and
3147# when the binding was unsuccessful on OK
3148sub set_binding {
3149 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3150
3151 $self->clear_command_list;
3152 $self->{recording} = 0;
3153 $self->{rec_btn}->set_text ("start recording");
3154
3155 $self->{binding} = [$mod, $sym];
3156 $self->{commands} = $cmds;
3157
3158 $self->{binding_change} = $cb;
3159 $self->{binding_cancel} = $ccb;
3160
3161 $self->update_binding_widgets;
3162}
3163
3164# this is a shortcut method that asks for a binding
3165# and then just binds it.
3166sub do_quick_binding {
3167 my ($self, $cmds) = @_;
3168 $self->set_binding (undef, undef, $cmds, sub {
3169 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3170 });
3171 $self->ask_for_bind (1);
3172}
3173
3174sub update_binding_widgets {
3175 my ($self) = @_;
3176 my ($mod, $sym, $cmds) = $self->get_binding;
3177 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3178 $self->set_command_list ($cmds);
3179}
3180
3181sub get_binding {
3182 my ($self) = @_;
3183 return (
3184 $self->{binding}->[0],
3185 $self->{binding}->[1],
3186 [ grep { defined $_ } @{$self->{commands}} ]
3187 );
3188}
3189
3190sub clear_command_list {
3191 my ($self) = @_;
3192 $self->{cmdbox}->clear ();
3193}
3194
3195sub set_command_list {
3196 my ($self, $cmds) = @_;
3197
3198 $self->{cmdbox}->clear ();
3199 $self->{commands} = $cmds;
3200
3201 my $idx = 0;
3202
3203 for (@$cmds) {
3204 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3205
3206 my $i = $idx;
3207 $hb->add (new CFClient::UI::Label text => $_);
3208 $hb->add (new CFClient::UI::Button
3209 text => "delete",
3210 tooltip => "Deletes the action from the record",
3211 on_activate => sub {
3212 $self->{cmdbox}->remove ($hb);
3213 $cmds->[$i] = undef;
3214 });
3215
3216
3217 $idx++
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::SpellList;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (new CFClient::UI::ScrolledWindow
3233 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3234
3235 $self;
3236}
3237
3238# XXX: Do sorting? Argl...
3239sub add_spell {
3240 my ($self, $spell) = @_;
3241 $self->{spells}->{$spell->{name}} = $spell;
3242
3243 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3244 face => $spell->{face},
3245 can_hover => 1,
3246 can_events => 1,
3247 tooltip => $spell->{message});
3248
3249 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3250 text => $spell->{name},
3251 can_hover => 1,
3252 can_events => 1,
3253 tooltip => $spell->{message},
3254 expand => 1);
3255
3256 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3257 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3258 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3259 expand => 1);
3260
3261 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3262 text => "bind to key",
3263 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3264}
3265
3266sub rebuild_spell_list {
3267 my ($self) = @_;
3268 $self->{tbl_idx} = 0;
3269 $self->add_spell ($_) for values %{$self->{spells}};
3270}
3271
3272sub remove_spell {
3273 my ($self, $spell) = @_;
3274 delete $self->{spells}->{$spell->{name}};
3275 $self->rebuild_spell_list;
3276}
3277
3278#############################################################################
3279
2992package CFClient::UI::Root; 3280package CFClient::UI::Root;
2993 3281
2994our @ISA = CFClient::UI::Container::; 3282our @ISA = CFClient::UI::Container::;
2995 3283
2996use CFClient::OpenGL; 3284use CFClient::OpenGL;
… …
3006 Scalar::Util::weaken ($self->{root} = $self); 3294 Scalar::Util::weaken ($self->{root} = $self);
3007 3295
3008 $self 3296 $self
3009} 3297}
3010 3298
3011sub configure {
3012 my ($self, $x, $y, $w, $h) = @_;
3013
3014 $self->{w} = $w;
3015 $self->{h} = $h;
3016}
3017
3018sub reconfigure {
3019 my ($self) = @_;
3020
3021 $self->SUPER::reconfigure;
3022
3023 $self->size_allocate ($self->{w}, $self->{h}, 1)
3024 if $self->{w};
3025}
3026
3027sub size_request { 3299sub size_request {
3028 my ($self) = @_; 3300 my ($self) = @_;
3029 3301
3030 ($self->{w}, $self->{h}) 3302 ($self->{w}, $self->{h})
3031} 3303}
3032 3304
3305sub _to_pixel {
3306 my ($coord, $size, $max) = @_;
3307
3308 $coord =
3309 $coord eq "center" ? ($max - $size) * 0.5
3310 : $coord eq "max" ? $max
3311 : $coord;
3312
3313 $coord = 0 if $coord < 0;
3314 $coord = $max - $size if $coord > $max - $size;
3315
3316 int $coord + 0.5
3317}
3318
3033sub size_allocate { 3319sub size_allocate {
3034 my ($self, $w, $h, $changed) = @_; 3320 my ($self, $w, $h) = @_;
3035 3321
3036 for my $child ($self->children) { 3322 for my $child ($self->children) {
3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3323 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038 3324
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3325 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3326 $Y = $child->{force_y} if exists $child->{force_y};
3041 3327
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3328 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3329 $Y = _to_pixel $Y, $H, $self->{h};
3044
3045 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3046
3047 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3048 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3049 3330
3050 $child->configure ($X, $Y, $W, $H); 3331 $child->configure ($X, $Y, $W, $H);
3051 } 3332 }
3052} 3333}
3053 3334
… …
3070} 3351}
3071 3352
3072sub add { 3353sub add {
3073 my ($self, @children) = @_; 3354 my ($self, @children) = @_;
3074 3355
3075 for my $child (@children) {
3076 $child->{is_toplevel} = 1; 3356 $_->{is_toplevel} = 1
3077 3357 for @children;
3078 # integerise window positions
3079 $child->{x} = int $child->{x};
3080 $child->{y} = int $child->{y};
3081 }
3082 3358
3083 $self->SUPER::add (@children); 3359 $self->SUPER::add (@children);
3084} 3360}
3085 3361
3086sub remove { 3362sub remove {
3087 my ($self, @children) = @_; 3363 my ($self, @children) = @_;
3088 3364
3089 $self->SUPER::remove (@children); 3365 $self->SUPER::remove (@children);
3366
3367 delete $self->{is_toplevel}
3368 for @children;
3090 3369
3091 while (@children) { 3370 while (@children) {
3092 my $w = pop @children; 3371 my $w = pop @children;
3093 push @children, $w->children; 3372 push @children, $w->children;
3094 $w->set_invisible; 3373 $w->set_invisible;
… …
3114 $_->() 3393 $_->()
3115 for values %{delete $self->{refresh_hook}}; 3394 for values %{delete $self->{refresh_hook}};
3116 } 3395 }
3117 3396
3118 if ($self->{realloc}) { 3397 if ($self->{realloc}) {
3398 my %queue;
3119 my @queue; 3399 my @queue;
3400 my $widget;
3120 3401
3402 outer:
3121 while () { 3403 while () {
3122 if ($self->{realloc}) { 3404 if (my $realloc = delete $self->{realloc}) {
3123 #TODO use array-of-depth approach 3405 for $widget (values %$realloc) {
3406 $widget->{visible} or next; # do not resize invisible widgets
3124 3407
3125 @queue = sort { $a->{visible} <=> $b->{visible} } 3408 $queue{$widget+0}++ and next; # duplicates are common
3126 @queue, values %{delete $self->{realloc}}; 3409
3410 push @{ $queue[$widget->{visible}] }, $widget;
3411 }
3127 } 3412 }
3128 3413
3414 while () {
3415 @queue or last outer;
3416
3417 $widget = pop @{ $queue[-1] || [] }
3418 and last;
3419
3420 pop @queue;
3421 }
3422
3423 delete $queue{$widget+0};
3424
3425 my ($w, $h) = $widget->size_request;
3426
3427 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3428 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3429
3430 $w = $widget->{force_w} if exists $widget->{force_w};
3431 $h = $widget->{force_h} if exists $widget->{force_h};
3432
3433 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3434 || delete $widget->{force_realloc}) {
3435 $widget->{req_w} = $w;
3436 $widget->{req_h} = $h;
3437
3438 $self->{size_alloc}{$widget+0} = $widget;
3439
3440 if (my $parent = $widget->{parent}) {
3441 $self->{realloc}{$parent+0} = $parent
3442 unless $queue{$parent+0};
3443
3444 $parent->{force_size_alloc} = 1;
3445 $self->{size_alloc}{$parent+0} = $parent;
3446 }
3447 }
3448
3449 delete $self->{realloc}{$widget+0};
3450 }
3451 }
3452
3453 while (my $size_alloc = delete $self->{size_alloc}) {
3454 my @queue = sort { $b->{visible} <=> $a->{visible} }
3455 values %$size_alloc;
3456
3457 while () {
3129 my $widget = pop @queue || last; 3458 my $widget = pop @queue || last;
3130 3459
3131 $widget->{visible} or last; # do not resize invisible widgets 3460 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3132
3133 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3134 ? @$widget{qw(def_w def_h)}
3135 : $widget->size_request;
3136
3137 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3138
3139 $widget->{req_w} = $w;
3140 $widget->{req_h} = $h;
3141
3142 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3143
3144 push @queue, $widget->{parent}
3145 if $widget->{parent};
3146 }
3147 }
3148
3149 while (my $size_alloc = delete $self->{size_alloc}) {
3150 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3151 values %$size_alloc;
3152
3153 while () {
3154 my ($widget, $w, $h) = @{ pop @queue or last };
3155 3461
3156 $w = 0 if $w < 0; 3462 $w = 0 if $w < 0;
3157 $h = 0 if $h < 0; 3463 $h = 0 if $h < 0;
3158 3464
3159 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3465 $w = int $w + 0.5;
3466 $h = int $h + 0.5;
3160 3467
3468 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3469 $widget->{old_w} = $widget->{w};
3470 $widget->{old_h} = $widget->{h};
3471
3161 $widget->{w} = $w; 3472 $widget->{w} = $w;
3162 $widget->{h} = $h; 3473 $widget->{h} = $h;
3163 3474
3164 $widget->emit (size_allocate => $w, $h, $changed); 3475 $widget->emit (size_allocate => $w, $h);
3476 }
3165 } 3477 }
3166 } 3478 }
3167 3479
3168 while ($self->{post_alloc_hook}) { 3480 while ($self->{post_alloc_hook}) {
3169 $_->() 3481 $_->()
3170 for values %{delete $self->{post_alloc_hook}}; 3482 for values %{delete $self->{post_alloc_hook}};
3171 } 3483 }
3484
3172 3485
3173 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3486 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3174 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3487 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3175 glClear GL_COLOR_BUFFER_BIT; 3488 glClear GL_COLOR_BUFFER_BIT;
3176 3489
… …
3178 glLoadIdentity; 3491 glLoadIdentity;
3179 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3492 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3180 glMatrixMode GL_MODELVIEW; 3493 glMatrixMode GL_MODELVIEW;
3181 glLoadIdentity; 3494 glLoadIdentity;
3182 3495
3496 {
3497 package CFClient::UI::Base;
3498
3499 ($draw_x, $draw_y, $draw_w, $draw_h) =
3500 (0, 0, $self->{w}, $self->{h});
3501 }
3502
3183 $self->_draw; 3503 $self->_draw;
3184} 3504}
3185 3505
3186############################################################################# 3506#############################################################################
3187 3507

Diff Legend

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