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.255 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.270 by elmex, Fri Jun 2 09:02:49 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
… …
1009my @border = 1050my @border =
1010 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1011 qw(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);
1012 1053
1013sub new { 1054sub new {
1014 my $class = shift; 1055 my ($class, %arg) = @_;
1056
1057 my $title = delete $arg{title};
1015 1058
1016 my $self = $class->SUPER::new ( 1059 my $self = $class->SUPER::new (
1017 bg => [1, 1, 1, 1], 1060 bg => [1, 1, 1, 1],
1018 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
1019 border => 0.6, 1062 border => 0.6,
1020 is_toplevel => 1,
1021 can_events => 1, 1063 can_events => 1,
1022 @_ 1064 min_w => 16,
1065 min_h => 16,
1066 %arg,
1023 ); 1067 );
1024 1068
1025 $self->{title} &&= new CFClient::UI::Label 1069 $self->{title} = new CFClient::UI::Label
1026 align => 0, 1070 align => 0,
1027 valign => 1, 1071 valign => 1,
1028 text => $self->{title}, 1072 text => $title,
1029 fontsize => $self->{border}; 1073 fontsize => $self->{border}
1074 if defined $title;
1030 1075
1031 $self 1076 $self
1077}
1078
1079sub add {
1080 my ($self, @widgets) = @_;
1081
1082 $self->SUPER::add (@widgets);
1083 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1032} 1084}
1033 1085
1034sub border { 1086sub border {
1035 int $_[0]{border} * $::FONTSIZE 1087 int $_[0]{border} * $::FONTSIZE
1036} 1088}
1037 1089
1038sub size_request { 1090sub size_request {
1039 my ($self) = @_; 1091 my ($self) = @_;
1092
1093 $self->{title}->size_request
1094 if $self->{title};
1040 1095
1041 my ($w, $h) = $self->SUPER::size_request; 1096 my ($w, $h) = $self->SUPER::size_request;
1042 1097
1043 ( 1098 (
1044 $w + $self->border * 2, 1099 $w + $self->border * 2,
1045 $h + $self->border * 2, 1100 $h + $self->border * 2,
1046 ) 1101 )
1047} 1102}
1048 1103
1049sub size_allocate { 1104sub size_allocate {
1050 my ($self, $w, $h, $changed) = @_; 1105 my ($self, $w, $h) = @_;
1051 1106
1052 return unless $changed; 1107 if ($self->{title}) {
1108 $self->{title}{w} = $w;
1109 $self->{title}{h} = $h;
1110 $self->{title}->size_allocate ($w, $h);
1111 }
1053 1112
1113 my $border = $self->border;
1114
1054 $h -= List::Util::max 0, $self->border * 2; 1115 $h -= List::Util::max 0, $border * 2;
1055 $w -= List::Util::max 0, $self->border * 2; 1116 $w -= List::Util::max 0, $border * 2;
1056 1117
1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1058 if $self->{title};
1059
1060 $self->child->configure ($self->border, $self->border, $w, $h); 1118 $self->child->configure ($border, $border, $w, $h);
1061} 1119}
1062 1120
1063sub button_down { 1121sub button_down {
1064 my ($self, $ev, $x, $y) = @_; 1122 my ($self, $ev, $x, $y) = @_;
1065 1123
… …
1081 my ($ev, $x, $y) = @_; 1139 my ($ev, $x, $y) = @_;
1082 1140
1083 my $dx = $ev->{x} - $ox; 1141 my $dx = $ev->{x} - $ox;
1084 my $dy = $ev->{y} - $oy; 1142 my $dy = $ev->{y} - $oy;
1085 1143
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090 $self->move ($self->{user_x}, $self->{user_y}); 1146
1091 $self->realloc; 1147 $self->realloc;
1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1092 }; 1149 };
1093 1150
1094 } elsif ($lr ^ $td) { 1151 } elsif ($lr ^ $td) {
1095 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1152 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1096 my ($bx, $by) = ($self->{x}, $self->{y}); 1153 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1098 $self->{motion} = sub { 1155 $self->{motion} = sub {
1099 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
1100 1157
1101 ($x, $y) = ($ev->{x}, $ev->{y}); 1158 ($x, $y) = ($ev->{x}, $ev->{y});
1102 1159
1103 $self->{user_x} = $bx + $x - $ox; 1160 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1104 $self->{user_y} = $by + $y - $oy;
1105
1106 $self->move ($self->{user_x}, $self->{user_y});
1107 $self->realloc;
1108 }; 1161 };
1109 } 1162 }
1110} 1163}
1111 1164
1112sub button_up { 1165sub button_up {
… …
1122} 1175}
1123 1176
1124sub _draw { 1177sub _draw {
1125 my ($self) = @_; 1178 my ($self) = @_;
1126 1179
1180 my $child = $self->{children}[0];
1181
1127 my ($w, $h ) = ($self->{w}, $self->{h}); 1182 my ($w, $h ) = ($self->{w}, $self->{h});
1128 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1183 my ($cw, $ch) = ($child->{w}, $child->{h});
1129 1184
1130 glEnable GL_TEXTURE_2D; 1185 glEnable GL_TEXTURE_2D;
1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1186 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1132 1187
1133 my $border = $self->border; 1188 my $border = $self->border;
… …
1148 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1203 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1149 } 1204 }
1150 1205
1151 glDisable GL_TEXTURE_2D; 1206 glDisable GL_TEXTURE_2D;
1152 1207
1153 $self->{title}->draw if $self->{title};
1154
1155 $self->child->draw; 1208 $child->draw;
1209
1210 if ($self->{title}) {
1211 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw;
1213 }
1156} 1214}
1157 1215
1158############################################################################# 1216#############################################################################
1159 1217
1160package CFClient::UI::Table; 1218package CFClient::UI::Table;
… …
1234 (sum @$hs), 1292 (sum @$hs),
1235 ) 1293 )
1236} 1294}
1237 1295
1238sub size_allocate { 1296sub size_allocate {
1239 my ($self, $w, $h, $changed) = @_; 1297 my ($self, $w, $h) = @_;
1240 1298
1241 my ($ws, $hs) = $self->get_wh; 1299 my ($ws, $hs) = $self->get_wh;
1242 1300
1243 my $req_w = (sum @$ws) || 1; 1301 my $req_w = (sum @$ws) || 1;
1244 my $req_h = (sum @$hs) || 1; 1302 my $req_h = (sum @$hs) || 1;
… …
1322 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1380 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1323 ) 1381 )
1324} 1382}
1325 1383
1326sub size_allocate { 1384sub size_allocate {
1327 my ($self, $w, $h, $changed) = @_; 1385 my ($self, $w, $h) = @_;
1328 1386
1329 my $space = $self->{vertical} ? $h : $w; 1387 my $space = $self->{vertical} ? $h : $w;
1330 my $children = $self->{children}; 1388 my $children = $self->{children};
1331 1389
1332 my @req; 1390 my @req;
… …
1415 ellipsise => 3, # end 1473 ellipsise => 3, # end
1416 layout => (new CFClient::Layout), 1474 layout => (new CFClient::Layout),
1417 fontsize => 1, 1475 fontsize => 1,
1418 align => -1, 1476 align => -1,
1419 valign => -1, 1477 valign => -1,
1420 padding => 2, 1478 padding_x => 2,
1479 padding_y => 2,
1421 can_events => 0, 1480 can_events => 0,
1422 %arg 1481 %arg
1423 ); 1482 );
1424 1483
1425 if (exists $self->{template}) { 1484 if (exists $self->{template}) {
… …
1501 1560
1502 $w = List::Util::max $w, $w2; 1561 $w = List::Util::max $w, $w2;
1503 $h = List::Util::max $h, $h2; 1562 $h = List::Util::max $h, $h2;
1504 } 1563 }
1505 1564
1506 ( 1565 ($w, $h)
1507 $w + $self->{padding} * 2,
1508 $h + $self->{padding} * 2,
1509 )
1510} 1566}
1511 1567
1512sub size_allocate { 1568sub size_allocate {
1513 my ($self, $w, $h, $changed) = @_; 1569 my ($self, $w, $h) = @_;
1570
1571 delete $self->{ox};
1514 1572
1515 delete $self->{texture} 1573 delete $self->{texture}
1516 if $changed; 1574 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1517} 1575}
1518 1576
1519sub set_fontsize { 1577sub set_fontsize {
1520 my ($self, $fontsize) = @_; 1578 my ($self, $fontsize) = @_;
1521 1579
… …
1536 $self->{layout}->set_width ($self->{w}); 1594 $self->{layout}->set_width ($self->{w});
1537 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1595 $self->{layout}->set_ellipsise ($self->{ellipsise});
1538 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1596 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1539 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1540 1598
1541 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1599 new_from_layout CFClient::Texture $self->{layout}
1600 };
1542 1601
1602 unless (exists $self->{ox}) {
1543 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1603 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1544 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1604 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1545 : ($self->{w} - $tex->{w}) * 0.5); 1605 : ($self->{w} - $tex->{w}) * 0.5);
1546 1606
1547 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1607 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1548 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1549 : ($self->{h} - $tex->{h}) * 0.5); 1609 : ($self->{h} - $tex->{h}) * 0.5);
1550
1551 $tex
1552 }; 1610 };
1553 1611
1554 glEnable GL_TEXTURE_2D; 1612 glEnable GL_TEXTURE_2D;
1555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1556 1614
… …
1792 1850
1793sub new { 1851sub new {
1794 my $class = shift; 1852 my $class = shift;
1795 1853
1796 $class->SUPER::new ( 1854 $class->SUPER::new (
1797 padding => 4, 1855 padding_x => 4,
1856 padding_y => 4,
1798 fg => [1, 1, 1], 1857 fg => [1, 1, 1],
1799 active_fg => [0, 0, 1], 1858 active_fg => [0, 0, 1],
1800 can_hover => 1, 1859 can_hover => 1,
1801 align => 0, 1860 align => 0,
1802 valign => 0, 1861 valign => 0,
… …
1849 1908
1850sub new { 1909sub new {
1851 my $class = shift; 1910 my $class = shift;
1852 1911
1853 $class->SUPER::new ( 1912 $class->SUPER::new (
1854 padding => 2, 1913 padding_x => 2,
1914 padding_y => 2,
1855 fg => [1, 1, 1], 1915 fg => [1, 1, 1],
1856 active_fg => [1, 1, 0], 1916 active_fg => [1, 1, 0],
1857 bg => [0, 0, 0, 0.2], 1917 bg => [0, 0, 0, 0.2],
1858 active_bg => [1, 1, 1, 0.5], 1918 active_bg => [1, 1, 1, 0.5],
1859 state => 0, 1919 state => 0,
… …
1863} 1923}
1864 1924
1865sub size_request { 1925sub size_request {
1866 my ($self) = @_; 1926 my ($self) = @_;
1867 1927
1868 ($self->{padding} * 2 + 6) x 2 1928 (6) x 2
1869} 1929}
1870 1930
1871sub button_down { 1931sub button_down {
1872 my ($self, $ev, $x, $y) = @_; 1932 my ($self, $ev, $x, $y) = @_;
1873 1933
1874 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1875 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1876 $self->{state} = !$self->{state}; 1936 $self->{state} = !$self->{state};
1877 $self->_emit (changed => $self->{state}); 1937 $self->_emit (changed => $self->{state});
1878 } 1938 }
1879} 1939}
1880 1940
1881sub _draw { 1941sub _draw {
1882 my ($self) = @_; 1942 my ($self) = @_;
1883 1943
1884 $self->SUPER::_draw; 1944 $self->SUPER::_draw;
1885 1945
1886 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1946 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1887 1947
1888 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1948 my ($w, $h) = @$self{qw(w h)};
1949
1950 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1889 1951
1890 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1952 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1891 1953
1892 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1954 my $tex = $self->{state} ? $tex[1] : $tex[0];
1893 1955
… …
2158 fg => [1, 1, 1], 2220 fg => [1, 1, 1],
2159 active_fg => [0, 0, 0], 2221 active_fg => [0, 0, 0],
2160 bg => [0, 0, 0, 0.2], 2222 bg => [0, 0, 0, 0.2],
2161 active_bg => [1, 1, 1, 0.5], 2223 active_bg => [1, 1, 1, 0.5],
2162 range => [0, 0, 100, 10, 0], 2224 range => [0, 0, 100, 10, 0],
2163 req_w => $::WIDTH / 80, 2225 min_w => $::WIDTH / 80,
2164 req_h => $::WIDTH / 80, 2226 min_h => $::WIDTH / 80,
2165 vertical => 0, 2227 vertical => 0,
2166 can_hover => 1, 2228 can_hover => 1,
2167 inner_pad => 0.02, 2229 inner_pad => 0.02,
2168 @_ 2230 @_
2169 ); 2231 );
… …
2209} 2271}
2210 2272
2211sub size_request { 2273sub size_request {
2212 my ($self) = @_; 2274 my ($self) = @_;
2213 2275
2214 my $w = $self->{req_w}; 2276 ($self->{req_w}, $self->{req_h})
2215 my $h = $self->{req_h};
2216
2217 $self->{vertical} ? ($h, $w) : ($w, $h)
2218} 2277}
2219 2278
2220sub button_down { 2279sub button_down {
2221 my ($self, $ev, $x, $y) = @_; 2280 my ($self, $ev, $x, $y) = @_;
2222 2281
… …
2372 $self->{fontsize} = $fontsize; 2431 $self->{fontsize} = $fontsize;
2373 $self->reflow; 2432 $self->reflow;
2374} 2433}
2375 2434
2376sub size_allocate { 2435sub size_allocate {
2377 my ($self, $w, $h, $changed) = @_; 2436 my ($self, $w, $h) = @_;
2378 2437
2379 $self->SUPER::size_allocate ($w, $h, $changed); 2438 $self->SUPER::size_allocate ($w, $h);
2380
2381 return unless $changed;
2382 2439
2383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2440 $self->{layout}->set_font ($self->{font}) if $self->{font};
2384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2441 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2385 $self->{layout}->set_width ($self->{children}[0]{w}); 2442 $self->{layout}->set_width ($self->{children}[0]{w});
2386 2443
… …
2609} 2666}
2610 2667
2611sub set_tooltip_from { 2668sub set_tooltip_from {
2612 my ($self, $widget) = @_; 2669 my ($self, $widget) = @_;
2613 2670
2671 my $tooltip = $widget->{tooltip};
2672
2673 if ($ENV{CFPLUS_DEBUG} & 2) {
2674 $tooltip .= "\n\n" . (ref $widget) . "\n"
2675 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676 . "req $widget->{req_w} $widget->{req_h}\n"
2677 . "visible $widget->{visible}";
2678 }
2679
2614 $self->add (new CFClient::UI::Label 2680 $self->add (new CFClient::UI::Label
2615 markup => $widget->{tooltip}, 2681 markup => $tooltip,
2616 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2617 fontsize => 0.8, 2683 fontsize => 0.8,
2618 fg => [0, 0, 0, 1], 2684 fg => [0, 0, 0, 1],
2619 ellipsise => 0, 2685 ellipsise => 0,
2620 font => ($widget->{tooltip_font} || $::FONT_PROP), 2686 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2628 2694
2629 ($w + 4, $h + 4) 2695 ($w + 4, $h + 4)
2630} 2696}
2631 2697
2632sub size_allocate { 2698sub size_allocate {
2633 my ($self, $w, $h, $changed) = @_; 2699 my ($self, $w, $h) = @_;
2634 2700
2635 return unless $changed;
2636
2637 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2701 $self->SUPER::size_allocate ($w - 4, $h - 4);
2638} 2702}
2639 2703
2640sub visibility_change { 2704sub visibility_change {
2641 my ($self, $visible) = @_; 2705 my ($self, $visible) = @_;
2642 2706
… …
2649 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2713 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2650 2714
2651 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2715 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2652 if $x + $self->{w} > $::WIDTH; 2716 if $x + $self->{w} > $::WIDTH;
2653 2717
2654 $self->move ($x, $y); 2718 $self->move_abs ($x, $y);
2655 }); 2719 });
2656} 2720}
2657 2721
2658sub _draw { 2722sub _draw {
2659 my ($self) = @_; 2723 my ($self) = @_;
… …
2763 $self->SUPER::DESTROY; 2827 $self->SUPER::DESTROY;
2764} 2828}
2765 2829
2766############################################################################# 2830#############################################################################
2767 2831
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; 2832package CFClient::UI::Menu;
2811 2833
2812our @ISA = CFClient::UI::FancyFrame::; 2834our @ISA = CFClient::UI::FancyFrame::;
2813 2835
2814use CFClient::OpenGL; 2836use CFClient::OpenGL;
… …
2852 # maybe save $GRAB? must be careful about events... 2874 # maybe save $GRAB? must be careful about events...
2853 $GRAB = $self; 2875 $GRAB = $self;
2854 $self->{button} = $ev->{button}; 2876 $self->{button} = $ev->{button};
2855 2877
2856 $self->show; 2878 $self->show;
2857 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2879 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2858} 2880}
2859 2881
2860sub mouse_motion { 2882sub mouse_motion {
2861 my ($self, $ev, $x, $y) = @_; 2883 my ($self, $ev, $x, $y) = @_;
2862 2884
… …
2987 $self->SUPER::reconfigure; 3009 $self->SUPER::reconfigure;
2988} 3010}
2989 3011
2990############################################################################# 3012#############################################################################
2991 3013
3014package CFClient::UI::Inventory;
3015
3016our @ISA = CFClient::UI::ScrolledWindow::;
3017
3018sub new {
3019 my $class = shift;
3020
3021 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3023 @_,
3024 );
3025
3026 $self
3027}
3028
3029sub set_items {
3030 my ($self, $items) = @_;
3031
3032 $self->{scrolled}->clear;
3033 return unless $items;
3034
3035 my @items = sort {
3036 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name})
3038 } @$items;
3039
3040 $self->{real_items} = \@items;
3041
3042 my $row = 0;
3043 for my $item (@items) {
3044 CFClient::Item::update_widgets $item;
3045
3046 $self->{scrolled}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3049
3050 $row++;
3051 }
3052}
3053
3054#############################################################################
3055
3056package CFClient::UI::BindEditor;
3057
3058our @ISA = CFClient::UI::FancyFrame::;
3059
3060sub new {
3061 my $class = shift;
3062
3063 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3064
3065 $self->add (my $vb = new CFClient::UI::VBox);
3066
3067
3068 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3069 text => "start recording",
3070 tooltip => "Start/Stops recording of actions."
3071 ."All subsequent actions after the recording started will be captured."
3072 ."The actions are displayed after the record was stopped."
3073 ."To bind the action you have to click on the 'Bind' button",
3074 on_activate => sub {
3075 unless ($self->{recording}) {
3076 $self->start;
3077 } else {
3078 $self->stop;
3079 }
3080 });
3081
3082 $vb->add (new CFClient::UI::Label text => "Actions:");
3083 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3084
3085 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3086 $vb->add (my $hb = new CFClient::UI::HBox);
3087 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3088 $hb->add (new CFClient::UI::Button
3089 text => "bind",
3090 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3091 on_activate => sub {
3092 $self->ask_for_bind;
3093 });
3094
3095 $vb->add (my $hb = new CFClient::UI::HBox);
3096 $hb->add (new CFClient::UI::Button
3097 text => "ok",
3098 expand => 1,
3099 tooltip => "This closes the binding editor and saves the binding",
3100 on_activate => sub {
3101 $self->hide;
3102 $self->commit;
3103 });
3104
3105 $hb->add (new CFClient::UI::Button
3106 text => "cancel",
3107 expand => 1,
3108 tooltip => "This closes the binding editor without saving",
3109 on_activate => sub {
3110 $self->hide;
3111 $self->{binding_cancel}->()
3112 if $self->{binding_cancel};
3113 });
3114
3115 $self->update_binding_widgets;
3116
3117 $self
3118}
3119
3120sub commit {
3121 my ($self) = @_;
3122 my ($mod, $sym, $cmds) = $self->get_binding;
3123 if ($sym != 0 && @$cmds > 0) {
3124 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3125 ."'. Don't forget 'Save Config'!");
3126 $self->{binding_change}->($mod, $sym, $cmds)
3127 if $self->{binding_change};
3128 } else {
3129 $::STATUSBOX->add ("No action bound, no key or action specified!");
3130 $self->{binding_cancel}->()
3131 if $self->{binding_cancel};
3132 }
3133}
3134
3135sub start {
3136 my ($self) = @_;
3137
3138 $self->{rec_btn}->set_text ("stop recording");
3139 $self->{recording} = 1;
3140 $self->clear_command_list;
3141 $::CONN->start_record if $::CONN;
3142}
3143
3144sub stop {
3145 my ($self) = @_;
3146
3147 $self->{rec_btn}->set_text ("start recording");
3148 $self->{recording} = 0;
3149
3150 my $rec;
3151 $rec = $::CONN->stop_record if $::CONN;
3152 return unless ref $rec eq 'ARRAY';
3153 $self->set_command_list ($rec);
3154}
3155
3156
3157sub ask_for_bind_and_commit {
3158 my ($self) = @_;
3159 $self->ask_for_bind (1);
3160}
3161
3162sub ask_for_bind {
3163 my ($self, $commit) = @_;
3164
3165 CFClient::Binder::open_binding_dialog (sub {
3166 my ($mod, $sym) = @_;
3167 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3168 $self->update_binding_widgets;
3169 $self->commit if $commit;
3170 });
3171}
3172
3173# $mod and $sym are the modifiers and key symbol
3174# $cmds is a array ref of strings (the commands)
3175# $cb is the callback that is executed on OK
3176# $ccb is the callback that is executed on CANCEL and
3177# when the binding was unsuccessful on OK
3178sub set_binding {
3179 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3180
3181 $self->clear_command_list;
3182 $self->{recording} = 0;
3183 $self->{rec_btn}->set_text ("start recording");
3184
3185 $self->{binding} = [$mod, $sym];
3186 $self->{commands} = $cmds;
3187
3188 $self->{binding_change} = $cb;
3189 $self->{binding_cancel} = $ccb;
3190
3191 $self->update_binding_widgets;
3192}
3193
3194# this is a shortcut method that asks for a binding
3195# and then just binds it.
3196sub do_quick_binding {
3197 my ($self, $cmds) = @_;
3198 $self->set_binding (undef, undef, $cmds, sub {
3199 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3200 });
3201 $self->ask_for_bind (1);
3202}
3203
3204sub update_binding_widgets {
3205 my ($self) = @_;
3206 my ($mod, $sym, $cmds) = $self->get_binding;
3207 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3208 $self->set_command_list ($cmds);
3209}
3210
3211sub get_binding {
3212 my ($self) = @_;
3213 return (
3214 $self->{binding}->[0],
3215 $self->{binding}->[1],
3216 [ grep { defined $_ } @{$self->{commands}} ]
3217 );
3218}
3219
3220sub clear_command_list {
3221 my ($self) = @_;
3222 $self->{cmdbox}->clear ();
3223}
3224
3225sub set_command_list {
3226 my ($self, $cmds) = @_;
3227
3228 $self->{cmdbox}->clear ();
3229 $self->{commands} = $cmds;
3230
3231 my $idx = 0;
3232
3233 for (@$cmds) {
3234 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3235
3236 my $i = $idx;
3237 $hb->add (new CFClient::UI::Label text => $_);
3238 $hb->add (new CFClient::UI::Button
3239 text => "delete",
3240 tooltip => "Deletes the action from the record",
3241 on_activate => sub {
3242 $self->{cmdbox}->remove ($hb);
3243 $cmds->[$i] = undef;
3244 });
3245
3246
3247 $idx++
3248 }
3249}
3250
3251#############################################################################
3252
3253package CFClient::UI::SpellList;
3254
3255our @ISA = CFClient::UI::FancyFrame::;
3256
3257sub new {
3258 my $class = shift;
3259
3260 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3261
3262 $self->add (new CFClient::UI::ScrolledWindow
3263 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3264
3265 $self;
3266}
3267
3268# XXX: Do sorting? Argl...
3269sub add_spell {
3270 my ($self, $spell) = @_;
3271 $self->{spells}->{$spell->{name}} = $spell;
3272
3273 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3274 face => $spell->{face},
3275 can_hover => 1,
3276 can_events => 1,
3277 tooltip => $spell->{message});
3278
3279 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3280 text => $spell->{name},
3281 can_hover => 1,
3282 can_events => 1,
3283 tooltip => $spell->{message},
3284 expand => 1);
3285
3286 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3287 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3288 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3289 expand => 1);
3290
3291 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3292 text => "bind to key",
3293 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3294}
3295
3296sub rebuild_spell_list {
3297 my ($self) = @_;
3298 $self->{tbl_idx} = 0;
3299 $self->add_spell ($_) for values %{$self->{spells}};
3300}
3301
3302sub remove_spell {
3303 my ($self, $spell) = @_;
3304 delete $self->{spells}->{$spell->{name}};
3305 $self->rebuild_spell_list;
3306}
3307
3308#############################################################################
3309
2992package CFClient::UI::Root; 3310package CFClient::UI::Root;
2993 3311
2994our @ISA = CFClient::UI::Container::; 3312our @ISA = CFClient::UI::Container::;
2995 3313
2996use CFClient::OpenGL; 3314use CFClient::OpenGL;
… …
3006 Scalar::Util::weaken ($self->{root} = $self); 3324 Scalar::Util::weaken ($self->{root} = $self);
3007 3325
3008 $self 3326 $self
3009} 3327}
3010 3328
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 { 3329sub size_request {
3028 my ($self) = @_; 3330 my ($self) = @_;
3029 3331
3030 ($self->{w}, $self->{h}) 3332 ($self->{w}, $self->{h})
3031} 3333}
3032 3334
3335sub _to_pixel {
3336 my ($coord, $size, $max) = @_;
3337
3338 $coord =
3339 $coord eq "center" ? ($max - $size) * 0.5
3340 : $coord eq "max" ? $max
3341 : $coord;
3342
3343 $coord = 0 if $coord < 0;
3344 $coord = $max - $size if $coord > $max - $size;
3345
3346 int $coord + 0.5
3347}
3348
3033sub size_allocate { 3349sub size_allocate {
3034 my ($self, $w, $h, $changed) = @_; 3350 my ($self, $w, $h) = @_;
3035 3351
3036 for my $child ($self->children) { 3352 for my $child ($self->children) {
3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3353 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038 3354
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3355 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3356 $Y = $child->{force_y} if exists $child->{force_y};
3041 3357
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3358 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3359 $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 3360
3050 $child->configure ($X, $Y, $W, $H); 3361 $child->configure ($X, $Y, $W, $H);
3051 } 3362 }
3052} 3363}
3053 3364
… …
3070} 3381}
3071 3382
3072sub add { 3383sub add {
3073 my ($self, @children) = @_; 3384 my ($self, @children) = @_;
3074 3385
3075 for my $child (@children) {
3076 $child->{is_toplevel} = 1; 3386 $_->{is_toplevel} = 1
3077 3387 for @children;
3078 # integerise window positions
3079 $child->{x} = int $child->{x};
3080 $child->{y} = int $child->{y};
3081 }
3082 3388
3083 $self->SUPER::add (@children); 3389 $self->SUPER::add (@children);
3084} 3390}
3085 3391
3086sub remove { 3392sub remove {
3087 my ($self, @children) = @_; 3393 my ($self, @children) = @_;
3088 3394
3089 $self->SUPER::remove (@children); 3395 $self->SUPER::remove (@children);
3396
3397 delete $self->{is_toplevel}
3398 for @children;
3090 3399
3091 while (@children) { 3400 while (@children) {
3092 my $w = pop @children; 3401 my $w = pop @children;
3093 push @children, $w->children; 3402 push @children, $w->children;
3094 $w->set_invisible; 3403 $w->set_invisible;
… …
3114 $_->() 3423 $_->()
3115 for values %{delete $self->{refresh_hook}}; 3424 for values %{delete $self->{refresh_hook}};
3116 } 3425 }
3117 3426
3118 if ($self->{realloc}) { 3427 if ($self->{realloc}) {
3428 my %queue;
3119 my @queue; 3429 my @queue;
3430 my $widget;
3120 3431
3432 outer:
3121 while () { 3433 while () {
3122 if ($self->{realloc}) { 3434 if (my $realloc = delete $self->{realloc}) {
3123 #TODO use array-of-depth approach 3435 for $widget (values %$realloc) {
3436 $widget->{visible} or next; # do not resize invisible widgets
3124 3437
3125 @queue = sort { $a->{visible} <=> $b->{visible} } 3438 $queue{$widget+0}++ and next; # duplicates are common
3126 @queue, values %{delete $self->{realloc}}; 3439
3440 push @{ $queue[$widget->{visible}] }, $widget;
3441 }
3127 } 3442 }
3128 3443
3444 while () {
3445 @queue or last outer;
3446
3447 $widget = pop @{ $queue[-1] || [] }
3448 and last;
3449
3450 pop @queue;
3451 }
3452
3453 delete $queue{$widget+0};
3454
3455 my ($w, $h) = $widget->size_request;
3456
3457 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3458 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3459
3460 $w = $widget->{force_w} if exists $widget->{force_w};
3461 $h = $widget->{force_h} if exists $widget->{force_h};
3462
3463 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3464 || delete $widget->{force_realloc}) {
3465 $widget->{req_w} = $w;
3466 $widget->{req_h} = $h;
3467
3468 $self->{size_alloc}{$widget+0} = $widget;
3469
3470 if (my $parent = $widget->{parent}) {
3471 $self->{realloc}{$parent+0} = $parent
3472 unless $queue{$parent+0};
3473
3474 $parent->{force_size_alloc} = 1;
3475 $self->{size_alloc}{$parent+0} = $parent;
3476 }
3477 }
3478
3479 delete $self->{realloc}{$widget+0};
3480 }
3481 }
3482
3483 while (my $size_alloc = delete $self->{size_alloc}) {
3484 my @queue = sort { $b->{visible} <=> $a->{visible} }
3485 values %$size_alloc;
3486
3487 while () {
3129 my $widget = pop @queue || last; 3488 my $widget = pop @queue || last;
3130 3489
3131 $widget->{visible} or last; # do not resize invisible widgets 3490 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 3491
3156 $w = 0 if $w < 0; 3492 $w = 0 if $w < 0;
3157 $h = 0 if $h < 0; 3493 $h = 0 if $h < 0;
3158 3494
3159 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3495 $w = int $w + 0.5;
3496 $h = int $h + 0.5;
3160 3497
3498 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3499 $widget->{old_w} = $widget->{w};
3500 $widget->{old_h} = $widget->{h};
3501
3161 $widget->{w} = $w; 3502 $widget->{w} = $w;
3162 $widget->{h} = $h; 3503 $widget->{h} = $h;
3163 3504
3164 $widget->emit (size_allocate => $w, $h, $changed); 3505 $widget->emit (size_allocate => $w, $h);
3506 }
3165 } 3507 }
3166 } 3508 }
3167 3509
3168 while ($self->{post_alloc_hook}) { 3510 while ($self->{post_alloc_hook}) {
3169 $_->() 3511 $_->()
3170 for values %{delete $self->{post_alloc_hook}}; 3512 for values %{delete $self->{post_alloc_hook}};
3171 } 3513 }
3514
3172 3515
3173 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3516 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3174 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3517 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3175 glClear GL_COLOR_BUFFER_BIT; 3518 glClear GL_COLOR_BUFFER_BIT;
3176 3519
… …
3178 glLoadIdentity; 3521 glLoadIdentity;
3179 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3522 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3180 glMatrixMode GL_MODELVIEW; 3523 glMatrixMode GL_MODELVIEW;
3181 glLoadIdentity; 3524 glLoadIdentity;
3182 3525
3526 {
3527 package CFClient::UI::Base;
3528
3529 ($draw_x, $draw_y, $draw_w, $draw_h) =
3530 (0, 0, $self->{w}, $self->{h});
3531 }
3532
3183 $self->_draw; 3533 $self->_draw;
3184} 3534}
3185 3535
3186############################################################################# 3536#############################################################################
3187 3537

Diff Legend

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