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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.252 by root, Sun May 28 23:21:28 2006 UTC vs.
Revision 1.267 by root, Thu Jun 1 04:10:29 2006 UTC

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

Diff Legend

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